From a1ed29e6f81eb8aa8f85df24c2148dc1d1a3e54c Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Fri, 5 Feb 2016 10:53:01 -0800 Subject: [PATCH] Rename setupTransparent->setupBatch --- libraries/render-utils/src/DeferredLightingEffect.cpp | 4 ++-- libraries/render-utils/src/DeferredLightingEffect.h | 2 +- libraries/render-utils/src/RenderPipelines.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 11c5031b95..003c309740 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -511,8 +511,8 @@ void DeferredLightingEffect::render(const render::RenderContextPointer& renderCo } } -void DeferredLightingEffect::setupTransparent(gpu::Batch& batch, int lightBufferUnit) { - PerformanceTimer perfTimer("DLE->setupTransparent()"); +void DeferredLightingEffect::setupBatch(gpu::Batch& batch, int lightBufferUnit) { + PerformanceTimer perfTimer("DLE->setupBatch()"); auto globalLight = _allocatedLights[_globalLights.front()]; batch.setUniformBuffer(lightBufferUnit, globalLight->getSchemaBuffer()); } diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h index c3970dfc96..6ef5794d95 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.h +++ b/libraries/render-utils/src/DeferredLightingEffect.h @@ -46,7 +46,7 @@ public: void prepare(RenderArgs* args); void render(const render::RenderContextPointer& renderContext); - void setupTransparent(gpu::Batch& batch, int lightBufferUnit); + void setupBatch(gpu::Batch& batch, int lightBufferUnit); // update global lighting void setAmbientLightMode(int preset); diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp index 48c7ee4f9b..8404854e28 100644 --- a/libraries/render-utils/src/RenderPipelines.cpp +++ b/libraries/render-utils/src/RenderPipelines.cpp @@ -96,7 +96,7 @@ void lightBatchSetter(const ShapePipeline& pipeline, gpu::Batch& batch) { batchSetter(pipeline, batch); // Set the light if (pipeline.locations->lightBufferUnit >= 0) { - DependencyManager::get()->setupTransparent(batch, pipeline.locations->lightBufferUnit); + DependencyManager::get()->setupBatch(batch, pipeline.locations->lightBufferUnit); } }