History

Merge pull request #5301 from samcake/yellow

Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture

Seth Alves committed 11 years ago

Commit fb23eb02 parents 87152a4 98f10e716 files · +39 −39Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 16 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+1−1
@@ -243,7 +243,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 242 unmodified lines
243 batch.setViewTransform(viewMat);243 batch.setViewTransform(viewMat);
244 244
245 batch.setPipeline(getOpaquePipeline());245 batch.setPipeline(getOpaquePipeline());
246 batch.setUniformTexture(0, args->_whiteTexture);246 batch.setResourceTexture(0, args->_whiteTexture);
247 247
248 if (!inItems.empty()) {248 if (!inItems.empty()) {
249 batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTH, glm::vec4(), 1.f, 0);249 batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTH, glm::vec4(), 1.f, 0);