Trying to fix oculus rendering

interface/src/ui/ApplicationCompositor.cpp

@@ -270,8 +270,8 @@ void ApplicationCompositor::displayOverlayTextureHmd(RenderArgs* renderArgs, int
 
     gpu::Batch batch;
     geometryCache->useSimpleDrawPipeline(batch);
-    batch._glDisable(GL_DEPTH_TEST);
-    batch._glDisable(GL_CULL_FACE);
+    //batch._glDisable(GL_DEPTH_TEST);
+    //batch._glDisable(GL_CULL_FACE);
     //batch._glBindTexture(GL_TEXTURE_2D, texture);
     //batch._glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     //batch._glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

interface/src/ui/ApplicationOverlay.h

@@ -49,6 +49,7 @@ private:
     gpu::TexturePointer _overlayDepthTexture;
     gpu::TexturePointer _overlayColorTexture;
     gpu::FramebufferPointer _overlayFramebuffer;
+
 };
 
 #endif // hifi_ApplicationOverlay_h

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -227,6 +227,8 @@ void DeferredLightingEffect::prepare(RenderArgs* args) {
     args->_context->render(batch);
 }
 
+gpu::FramebufferPointer _copyFBO;
+
 void DeferredLightingEffect::render(RenderArgs* args) {
     gpu::Batch batch;
 
@@ -236,18 +238,20 @@ void DeferredLightingEffect::render(RenderArgs* args) {
     QSize framebufferSize = framebufferCache->getFrameBufferSize();
     
     // binding the first framebuffer
-    auto freeFBO = framebufferCache->getSecondaryFramebuffer();
-    batch.setFramebuffer(freeFBO);
+    _copyFBO = framebufferCache->getFramebuffer();
+    batch.setFramebuffer(_copyFBO);
 
     batch.setViewportTransform(args->_viewport);
  
-    batch.clearColorFramebuffer(freeFBO->getBufferMask(), glm::vec4(0.0f, 0.0f, 0.0f, 0.0f));
+    batch.clearColorFramebuffer(_copyFBO->getBufferMask(), glm::vec4(0.0f, 0.0f, 0.0f, 0.0f));
     
-    auto primaryFramebuffer = framebufferCache->getPrimaryFramebuffer();
-    for (int i = 0; i < 3; ++i) {
-        batch.setResourceTexture(i, primaryFramebuffer->getRenderBuffer(i));
-    }
-    batch.setResourceTexture(3, primaryFramebuffer->getDepthStencilBuffer());
+    batch.setResourceTexture(0, framebufferCache->getPrimaryColorTexture());
+
+    batch.setResourceTexture(1, framebufferCache->getPrimaryNormalTexture());
+    
+    batch.setResourceTexture(2, framebufferCache->getPrimarySpecularTexture());
+    
+    batch.setResourceTexture(3, framebufferCache->getPrimaryDepthTexture());
         
     float sMin = args->_viewport.x / (float)framebufferSize.width();
     float sWidth = args->_viewport.z / (float)framebufferSize.width();
@@ -532,17 +536,16 @@ void DeferredLightingEffect::render(RenderArgs* args) {
     // End of the Lighting pass
 }
 
+
 void DeferredLightingEffect::copyBack(RenderArgs* args) {
     gpu::Batch batch;
     auto framebufferCache = DependencyManager::get<FramebufferCache>();
     QSize framebufferSize = framebufferCache->getFrameBufferSize();
 
-    auto freeFBO = framebufferCache->getSecondaryFramebuffer();
-
     batch.setFramebuffer(framebufferCache->getPrimaryFramebuffer());
     batch.setPipeline(_blitLightBuffer);
     
-    batch.setResourceTexture(0, freeFBO->getRenderBuffer(0));
+    batch.setResourceTexture(0, _copyFBO->getRenderBuffer(0));
 
     batch.setProjectionTransform(glm::mat4());
     batch.setViewTransform(Transform());
@@ -561,8 +564,10 @@ void DeferredLightingEffect::copyBack(RenderArgs* args) {
 
     batch.draw(gpu::TRIANGLE_STRIP, 4);
 
+
     args->_context->syncCache();
     args->_context->render(batch);
+    framebufferCache->releaseFramebuffer(_copyFBO);
 }
 
 void DeferredLightingEffect::setupTransparent(RenderArgs* args, int lightBufferUnit) {

libraries/render-utils/src/FramebufferCache.cpp

@@ -35,30 +35,34 @@ void FramebufferCache::setFrameBufferSize(QSize frameBufferSize) {
     if (_frameBufferSize != frameBufferSize) {
         _frameBufferSize = frameBufferSize;
         _primaryFramebuffer.reset();
+        _primaryDepthTexture.reset();
+        _primaryColorTexture.reset();
+        _primaryNormalTexture.reset();
+        _primarySpecularTexture.reset();
     }
 }
 
 void FramebufferCache::createPrimaryFramebuffer() {
     _primaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());
 
-    static auto colorFormat = gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA);
-    static auto depthFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::DEPTH);
-
+    auto colorFormat = gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA);
     auto width = _frameBufferSize.width();
     auto height = _frameBufferSize.height();
 
     auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_POINT);
-    auto colorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
-    auto normalTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
-    auto specularTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
+    _primaryColorTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
+    _primaryNormalTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
+    _primarySpecularTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
 
-    _primaryFramebuffer->setRenderBuffer(0, colorTexture);
-    _primaryFramebuffer->setRenderBuffer(1, normalTexture);
-    _primaryFramebuffer->setRenderBuffer(2, specularTexture);
+    _primaryFramebuffer->setRenderBuffer(0, _primaryColorTexture);
+    _primaryFramebuffer->setRenderBuffer(1, _primaryNormalTexture);
+    _primaryFramebuffer->setRenderBuffer(2, _primarySpecularTexture);
 
 
-    auto depthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, width, height, defaultSampler));
-    _primaryFramebuffer->setDepthStencilBuffer(depthTexture, depthFormat);
+    auto depthFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::DEPTH);
+    _primaryDepthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, width, height, defaultSampler));
+
+    _primaryFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
 }
 
 gpu::FramebufferPointer FramebufferCache::getPrimaryFramebuffer() {
@@ -68,6 +72,36 @@ gpu::FramebufferPointer FramebufferCache::getPrimaryFramebuffer() {
     return _primaryFramebuffer;
 }
 
+
+
+gpu::TexturePointer FramebufferCache::getPrimaryDepthTexture() {
+    if (!_primaryDepthTexture) {
+        createPrimaryFramebuffer();
+    }
+    return _primaryDepthTexture;
+}
+
+gpu::TexturePointer FramebufferCache::getPrimaryColorTexture() {
+    if (!_primaryColorTexture) {
+        createPrimaryFramebuffer();
+    }
+    return _primaryColorTexture;
+}
+
+gpu::TexturePointer FramebufferCache::getPrimaryNormalTexture() {
+    if (!_primaryNormalTexture) {
+        createPrimaryFramebuffer();
+    }
+    return _primaryNormalTexture;
+}
+
+gpu::TexturePointer FramebufferCache::getPrimarySpecularTexture() {
+    if (!_primarySpecularTexture) {
+        createPrimaryFramebuffer();
+    }
+    return _primarySpecularTexture;
+}
+
 void FramebufferCache::setPrimaryDrawBuffers(gpu::Batch& batch, bool color, bool normal, bool specular) {
     GLenum buffers[3];
     int bufferCount = 0;
@@ -98,11 +132,6 @@ void FramebufferCache::releaseFramebuffer(const gpu::FramebufferPointer& framebu
     _cachedFramebuffers.push_back(framebuffer);
 }
 
-gpu::FramebufferPointer FramebufferCache::getSecondaryFramebuffer() {
-    static auto _secondaryFramebuffer = getFramebuffer();
-    return _secondaryFramebuffer;
-}
-
 gpu::FramebufferPointer FramebufferCache::getShadowFramebuffer() {
     if (!_shadowFramebuffer) {
         const int SHADOW_MAP_SIZE = 2048;

libraries/render-utils/src/FramebufferCache.h

@@ -31,7 +31,10 @@ public:
     /// used for scene rendering.
     gpu::FramebufferPointer getPrimaryFramebuffer();
 
-    gpu::FramebufferPointer getSecondaryFramebuffer();
+    gpu::TexturePointer getPrimaryDepthTexture();
+    gpu::TexturePointer getPrimaryColorTexture();
+    gpu::TexturePointer getPrimaryNormalTexture();
+    gpu::TexturePointer getPrimarySpecularTexture();
 
     /// Returns the framebuffer object used to render shadow maps;
     gpu::FramebufferPointer getShadowFramebuffer();
@@ -52,6 +55,11 @@ private:
     void createPrimaryFramebuffer();
 
     gpu::FramebufferPointer _primaryFramebuffer;
+    gpu::TexturePointer _primaryDepthTexture;
+    gpu::TexturePointer _primaryColorTexture;
+    gpu::TexturePointer _primaryNormalTexture;
+    gpu::TexturePointer _primarySpecularTexture;
+    
     gpu::FramebufferPointer _shadowFramebuffer;
     QSize _frameBufferSize{ 100, 100 };
 };