From ccd2f98a76db96ffd53e02786ad80e181efec0fa Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 17 Jul 2015 15:28:25 -0700 Subject: [PATCH] one more try --- interface/src/ui/ApplicationOverlay.cpp | 13 ++++++------- libraries/gpu/src/gpu/GLBackend.cpp | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 5d0e8cfa05..2cf7c508ec 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -85,6 +85,11 @@ void ApplicationOverlay::renderOverlay(RenderArgs* renderArgs) { gpu::Batch batch; renderArgs->_batch = &batch; + int width = _overlayFramebuffer->getWidth(); + int height = _overlayFramebuffer->getHeight(); + + batch.setViewportTransform(glm::ivec4(0, 0, width, height)); + // 1) bind the framebuffer batch.setFramebuffer(_overlayFramebuffer); @@ -93,13 +98,7 @@ void ApplicationOverlay::renderOverlay(RenderArgs* renderArgs) { glm::vec4 color { 0.0f, 0.0f, 0.0f, 0.0f }; float depth = 1.0f; int stencil = 0; - batch.clearFramebuffer(gpu::Framebuffer::BUFFER_COLORS | gpu::Framebuffer::BUFFER_DEPTH, color, depth, stencil); - //batch.clearColorFramebuffer(_overlayFramebuffer->getBufferMask(), glm::vec4(0.0f, 0.0f, 0.0f, 0.0f)); - - int width = _overlayFramebuffer->getWidth(); - int height = _overlayFramebuffer->getHeight(); - - batch.setViewportTransform(glm::ivec4(0, 0, width, height)); + batch.clearFramebuffer(gpu::Framebuffer::BUFFER_COLOR0 | gpu::Framebuffer::BUFFER_DEPTH, color, depth, stencil); // Now render the overlay components together into a single texture renderOverlays(renderArgs); // renders Scripts Overlay and AudioScope diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp index adbef7cb31..b14f9afc97 100644 --- a/libraries/gpu/src/gpu/GLBackend.cpp +++ b/libraries/gpu/src/gpu/GLBackend.cpp @@ -227,7 +227,7 @@ void GLBackend::do_clearFramebuffer(Batch& batch, uint32 paramOffset) { int stencil = batch._params[paramOffset + 0]._float; GLuint glmask = 0; - if (masks & Framebuffer::BUFFER_DEPTH) { + if (masks & Framebuffer::BUFFER_STENCIL) { glClearStencil(stencil); glmask |= GL_STENCIL_BUFFER_BIT; }