diff --git a/filament/backend/include/private/backend/DriverAPI.inc b/filament/backend/include/private/backend/DriverAPI.inc index 5570a9cdd9..9a1814044f 100644 --- a/filament/backend/include/private/backend/DriverAPI.inc +++ b/filament/backend/include/private/backend/DriverAPI.inc @@ -334,7 +334,7 @@ DECL_DRIVER_API_3(updateIndexBuffer, backend::BufferDescriptor&&, data, uint32_t, byteOffset) -DECL_DRIVER_API_2(updateUniformBuffer, +DECL_DRIVER_API_2(loadUniformBuffer, backend::UniformBufferHandle, ubh, backend::BufferDescriptor&&, buffer) diff --git a/filament/backend/src/metal/MetalDriver.mm b/filament/backend/src/metal/MetalDriver.mm index 966d406508..0b61d0d417 100644 --- a/filament/backend/src/metal/MetalDriver.mm +++ b/filament/backend/src/metal/MetalDriver.mm @@ -414,7 +414,7 @@ bool MetalDriver::canGenerateMipmaps() { return true; } -void MetalDriver::updateUniformBuffer(Handle ubh, +void MetalDriver::loadUniformBuffer(Handle ubh, BufferDescriptor&& data) { if (data.size <= 0) { return; diff --git a/filament/backend/src/opengl/OpenGLDriver.cpp b/filament/backend/src/opengl/OpenGLDriver.cpp index 24519cfd23..5894338526 100644 --- a/filament/backend/src/opengl/OpenGLDriver.cpp +++ b/filament/backend/src/opengl/OpenGLDriver.cpp @@ -1743,7 +1743,7 @@ void OpenGLDriver::updateIndexBuffer( CHECK_GL_ERROR(utils::slog.e) } -void OpenGLDriver::updateUniformBuffer(Handle ubh, BufferDescriptor&& p) { +void OpenGLDriver::loadUniformBuffer(Handle ubh, BufferDescriptor&& p) { DEBUG_MARKER() GLUniformBuffer* ub = handle_cast(ubh); @@ -1808,8 +1808,11 @@ void OpenGLDriver::updateBuffer(GLenum target, // it looks like it's generally faster (or not worse) to use glBufferData() glBufferData(target, buffer->capacity, p.buffer, getBufferUsage(buffer->usage)); } else { + // when loading less that the buffer size, it's okay to assume the back of the buffer + // is undefined. // glBufferSubData() could be catastrophically inefficient if several are issued // during the same frame. Currently, we're not doing that though. + // TODO: investigate if it'll be faster to use glBufferData(). glBufferSubData(target, 0, p.size, p.buffer); } diff --git a/filament/backend/src/vulkan/VulkanDriver.cpp b/filament/backend/src/vulkan/VulkanDriver.cpp index 373b28e313..a0c7657ab3 100644 --- a/filament/backend/src/vulkan/VulkanDriver.cpp +++ b/filament/backend/src/vulkan/VulkanDriver.cpp @@ -621,7 +621,7 @@ bool VulkanDriver::canGenerateMipmaps() { return false; } -void VulkanDriver::updateUniformBuffer(Handle ubh, BufferDescriptor&& data) { +void VulkanDriver::loadUniformBuffer(Handle ubh, BufferDescriptor&& data) { if (data.size > 0) { auto* buffer = handle_cast(mHandleMap, ubh); buffer->loadFromCpu(data.buffer, (uint32_t) data.size); @@ -1102,7 +1102,7 @@ void VulkanDriver::draw(PipelineState pipelineState, Handle r #ifndef NDEBUG void VulkanDriver::debugCommand(const char* methodName) { static const std::set OUTSIDE_COMMANDS = { - "updateUniformBuffer", + "loadUniformBuffer", "updateVertexBuffer", "updateIndexBuffer", "update2DImage", diff --git a/filament/src/MaterialInstance.cpp b/filament/src/MaterialInstance.cpp index ebae7d9f3f..34c29a63e7 100644 --- a/filament/src/MaterialInstance.cpp +++ b/filament/src/MaterialInstance.cpp @@ -95,7 +95,7 @@ void FMaterialInstance::commitSlow(FEngine& engine) const { // update uniforms if needed FEngine::DriverApi& driver = engine.getDriverApi(); if (mUniforms.isDirty()) { - driver.updateUniformBuffer(mUbHandle, mUniforms.toBufferDescriptor(driver)); + driver.loadUniformBuffer(mUbHandle, mUniforms.toBufferDescriptor(driver)); } if (mSamplers.isDirty()) { driver.updateSamplerGroup(mSbHandle, std::move(mSamplers.toCommandStream())); diff --git a/filament/src/PostProcessManager.cpp b/filament/src/PostProcessManager.cpp index 422ff96490..1ae26757f0 100644 --- a/filament/src/PostProcessManager.cpp +++ b/filament/src/PostProcessManager.cpp @@ -79,7 +79,7 @@ void PostProcessManager::setSource(uint32_t viewportWidth, uint32_t viewportHeig ub.setUniform(offsetof(PostProcessingUib, yOffset), yOffset); driver.updateSamplerGroup(mPostProcessSbh, std::move(group)); - driver.updateUniformBuffer(mPostProcessUbh, ub.toBufferDescriptor(driver)); + driver.loadUniformBuffer(mPostProcessUbh, ub.toBufferDescriptor(driver)); } // ------------------------------------------------------------------------------------------------ diff --git a/filament/src/Scene.cpp b/filament/src/Scene.cpp index 81ba41c5fd..3da5d067eb 100644 --- a/filament/src/Scene.cpp +++ b/filament/src/Scene.cpp @@ -199,7 +199,7 @@ void FScene::updateUBOs(utils::Range visibleRenderables, backend::Hand // TODO: handle static objects separately mRenderableViewUbh = renderableUbh; - driver.updateUniformBuffer(renderableUbh, { buffer, size }); + driver.loadUniformBuffer(renderableUbh, { buffer, size }); } void FScene::terminate(FEngine& engine) { @@ -258,7 +258,7 @@ void FScene::prepareDynamicLights(const CameraInfo& camera, ArenaScope& rootAren lp[gpuIndex].spotScaleOffset.xy = { lcm.getSpotParams(li).scaleOffset }; } - driver.updateUniformBuffer(lightUbh, { lp, positionalLightCount * sizeof(LightsUib) }); + driver.loadUniformBuffer(lightUbh, { lp, positionalLightCount * sizeof(LightsUib) }); } // These methods need to exist so clang honors the __restrict__ keyword, which in turn diff --git a/filament/src/View.cpp b/filament/src/View.cpp index 39fdb7dfc5..0f1601d8c1 100644 --- a/filament/src/View.cpp +++ b/filament/src/View.cpp @@ -641,7 +641,7 @@ void FView::froxelize(FEngine& engine) const noexcept { void FView::commitUniforms(backend::DriverApi& driver) const noexcept { if (mPerViewUb.isDirty()) { - driver.updateUniformBuffer(mPerViewUbh, mPerViewUb.toBufferDescriptor(driver)); + driver.loadUniformBuffer(mPerViewUbh, mPerViewUb.toBufferDescriptor(driver)); } if (mPerViewSb.isDirty()) { diff --git a/filament/src/components/RenderableManager.cpp b/filament/src/components/RenderableManager.cpp index bfea47b184..2a6aab3433 100644 --- a/filament/src/components/RenderableManager.cpp +++ b/filament/src/components/RenderableManager.cpp @@ -378,7 +378,7 @@ void FRenderableManager::prepare( assert(i); // we should never get the null instance here if (UTILS_UNLIKELY(bones[i])) { if (bones[i]->bones.isDirty()) { - driver.updateUniformBuffer(bones[i]->handle, bones[i]->bones.toBufferDescriptor(driver)); + driver.loadUniformBuffer(bones[i]->handle, bones[i]->bones.toBufferDescriptor(driver)); } } }