History

Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.

Sam Gateau committed 11 years ago

Commit 7fc9fd91 parent cac239a15 files · +38 −38Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+1−1
@@ -236,7 +236,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 235 unmodified lines
236 batch.setViewTransform(viewMat);236 batch.setViewTransform(viewMat);
237 237
238 batch.setPipeline(getOpaquePipeline());238 batch.setPipeline(getOpaquePipeline());
239 batch.setUniformTexture(0, args->_whiteTexture);239 batch.setResourceTexture(0, args->_whiteTexture);
240 240
241 if (!inItems.empty()) {241 if (!inItems.empty()) {
242 batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTH, glm::vec4(), 1.f, 0);242 batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTH, glm::vec4(), 1.f, 0);