rename updateUniformBuffer to loadUniformBuffer
This is to make it more evident that uploading a buffer partially, doesn't keep its content and the back of the buffer becomes undefined.
This commit is contained in:
committed by
Mathias Agopian
parent
b020311c8c
commit
84c08d3abc
@@ -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)
|
||||
|
||||
|
||||
@@ -414,7 +414,7 @@ bool MetalDriver::canGenerateMipmaps() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void MetalDriver::updateUniformBuffer(Handle<HwUniformBuffer> ubh,
|
||||
void MetalDriver::loadUniformBuffer(Handle<HwUniformBuffer> ubh,
|
||||
BufferDescriptor&& data) {
|
||||
if (data.size <= 0) {
|
||||
return;
|
||||
|
||||
@@ -1743,7 +1743,7 @@ void OpenGLDriver::updateIndexBuffer(
|
||||
CHECK_GL_ERROR(utils::slog.e)
|
||||
}
|
||||
|
||||
void OpenGLDriver::updateUniformBuffer(Handle<HwUniformBuffer> ubh, BufferDescriptor&& p) {
|
||||
void OpenGLDriver::loadUniformBuffer(Handle<HwUniformBuffer> ubh, BufferDescriptor&& p) {
|
||||
DEBUG_MARKER()
|
||||
|
||||
GLUniformBuffer* ub = handle_cast<GLUniformBuffer *>(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);
|
||||
}
|
||||
|
||||
|
||||
@@ -621,7 +621,7 @@ bool VulkanDriver::canGenerateMipmaps() {
|
||||
return false;
|
||||
}
|
||||
|
||||
void VulkanDriver::updateUniformBuffer(Handle<HwUniformBuffer> ubh, BufferDescriptor&& data) {
|
||||
void VulkanDriver::loadUniformBuffer(Handle<HwUniformBuffer> ubh, BufferDescriptor&& data) {
|
||||
if (data.size > 0) {
|
||||
auto* buffer = handle_cast<VulkanUniformBuffer>(mHandleMap, ubh);
|
||||
buffer->loadFromCpu(data.buffer, (uint32_t) data.size);
|
||||
@@ -1102,7 +1102,7 @@ void VulkanDriver::draw(PipelineState pipelineState, Handle<HwRenderPrimitive> r
|
||||
#ifndef NDEBUG
|
||||
void VulkanDriver::debugCommand(const char* methodName) {
|
||||
static const std::set<utils::StaticString> OUTSIDE_COMMANDS = {
|
||||
"updateUniformBuffer",
|
||||
"loadUniformBuffer",
|
||||
"updateVertexBuffer",
|
||||
"updateIndexBuffer",
|
||||
"update2DImage",
|
||||
|
||||
@@ -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()));
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -199,7 +199,7 @@ void FScene::updateUBOs(utils::Range<uint32_t> 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
|
||||
|
||||
@@ -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()) {
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user