Changeset 3117 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

11/11/08 12:18:07 (16 years ago)

Author:

mattausch

Message:

strange errors

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (9 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -234 +234 @@
 
 
-static void InitBuffer(FrameBufferObject *fbo, int index)
-{
-        // read the second buffer, write to the first buffer
-        fbo->Bind();
-        glDrawBuffers(1, mrt + index);
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-        FrameBufferObject::Release();
-}
-
-
 DeferredRenderer::DeferredRenderer(int w, int h, PerspectiveCamera *cam):
 mWidth(w), mHeight(h), 
@@ -270 +258 @@
         {
                 mIllumFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
-                InitBuffer(mIllumFbo, i);
-        }
+                FrameBufferObject::InitBuffer(mIllumFbo, i);
+        }
+
+
+        ///////////////
+        //-- the downsampled ssao + color bleeding textures: as gi is inherently low frequency, we can use these to improve performance
 
         mDownSampleFbo = new FrameBufferObject(dsw, dsh, FrameBufferObject::DEPTH_NONE);
@@ -278 +270 @@
         // downsample buffer for the normal texture
         mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        // downsample buffer for the offset texture
+        mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+
+        for (int i = 0; i < 3; ++ i)
+        {
+                FrameBufferObject::InitBuffer(mDownSampleFbo, i);
+        }
 
         mFBOs.push_back(mDownSampleFbo);
@@ -453 +452 @@
                 // normals
                 DownSample(fbo, 1, mDownSampleFbo, 1);
+                // offsets
+                DownSample(fbo, 2, mDownSampleFbo, 2);
         }
 
@@ -458 +459 @@
         {
         case SSAO:
-
                 ComputeSsao(fbo, tempCohFactor);
                 CombineSsao(fbo);
@@ -501 +501 @@
                                                                    float tempCohFactor)
 {
+        GLuint colorsTex, normalsTex, attribsTex;
+
+        if (0)
+        {
+                colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
+                normalsTex = fbo->GetColorBuffer(1)->GetTexture();
+                attribsTex = fbo->GetColorBuffer(2)->GetTexture();
+        }
+        else
+        {
+                colorsTex = mDownSampleFbo->GetColorBuffer(0)->GetTexture();
+                normalsTex = mDownSampleFbo->GetColorBuffer(1)->GetTexture();
+                attribsTex = mDownSampleFbo->GetColorBuffer(2)->GetTexture();
+        }
+
+        // flip flop between illumination buffers
+        GLuint oldTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
+
+        cout << colorBufferIdx;
+
+        glPushAttrib(GL_VIEWPORT_BIT);
+        glViewport(0, 0, mIllumFbo->GetWidth(), mIllumFbo->GetHeight());
+
+        // read the second buffer, write to the first buffer
+        mIllumFbo->Bind();
+        glDrawBuffers(1, mrt + mIllumFboIndex);
+
+        int i = 0;
+
+        sCgSsaoProgram->SetTexture(i ++, colorsTex);
+        sCgSsaoProgram->SetTexture(i ++, normalsTex);
+        sCgSsaoProgram->SetTexture(i ++, oldTex);
+        sCgSsaoProgram->SetTexture(i ++, noiseTex);
+
+        sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
+        
+        if (mUseTemporalCoherence || mRegenerateSamples)
+        {
+                mRegenerateSamples = false;
+
+                // q: should we generate new samples or only rotate the old ones?
+                // in the first case, the sample patterns look nicer, but the kernel
+                // needs longer to converge
+                GenerateSamples(mSamplingMethod); 
+                sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
+        }
+        
+        ++ i;
+
+        for (int j = 0; j < 4; ++ j, ++ i)
+                sCgSsaoProgram->SetValue3f(i, mCornersView[j].x, mCornersView[j].y, mCornersView[j].z);
+
+        sCgSsaoProgram->SetMatrix(i ++, mProjViewMatrix);
+        sCgSsaoProgram->SetMatrix(i ++, mOldProjViewMatrix);
+
+        Vector3 de;
+        de.x = mOldEyePos.x - mEyePos.x;
+        de.y = mOldEyePos.y - mEyePos.y; 
+        de.z = mOldEyePos.z - mEyePos.z;
+
+        sCgSsaoProgram->SetValue3f(i ++, de.x, de.y, de.z);
+
+        for (int j = 0; j < 4; ++ j, ++ i)
+                sCgSsaoProgram->SetValue3f(i, mOldCornersView[j].x, mOldCornersView[j].y, mOldCornersView[j].z);
+
+        sCgSsaoProgram->SetTexture(i ++, attribsTex);
+
+        DrawQuad(sCgSsaoProgram);
+
+        glPopAttrib();
+
+        PrintGLerror("ssao first pass");
+}
+
+
+static void SetVertex(float x, float y, float x_offs, float y_offs)
+{
+        glMultiTexCoord2fARB(GL_TEXTURE0_ARB, x, y); // center
+        glMultiTexCoord2fARB(GL_TEXTURE1_ARB, x - x_offs, y + y_offs); // left top
+        glMultiTexCoord2fARB(GL_TEXTURE2_ARB, x + x_offs, y - y_offs); // right bottom
+        glMultiTexCoord2fARB(GL_TEXTURE3_ARB, x + x_offs, y + y_offs); // right top
+        glMultiTexCoord2fARB(GL_TEXTURE4_ARB, x - x_offs, y - y_offs); // left bottom
+
+        glMultiTexCoord4fARB(GL_TEXTURE5_ARB, x - x_offs, y, x + x_offs, y); // left right
+        glMultiTexCoord4fARB(GL_TEXTURE6_ARB, x, y + y_offs, x, y - y_offs); // top bottom
+
+        //glVertex3f(x - 0.5f, y - 0.5f, -0.5f);
+        glVertex2f(x, y);
+}
+
+
+void DeferredRenderer::AntiAliasing(FrameBufferObject *fbo, DirectionalLight *light)
+{
+        FrameBufferObject::Release();
+
+        ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
+
+        GLuint colorsTex = colorBuffer->GetTexture();
+        GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
+
+        sCgAntiAliasingProgram->SetTexture(0, colorsTex);
+        sCgAntiAliasingProgram->SetTexture(1, normalsTex);
+
+        sCgAntiAliasingProgram->Bind();
+
+        glBegin(GL_QUADS);
+
+        // the neighbouring texels
+        float x_offs = 1.0f / mWidth;
+        float y_offs = 1.0f / mHeight;
+
+        SetVertex(0, 0, x_offs, y_offs);
+        SetVertex(1, 0, x_offs, y_offs);
+        SetVertex(1, 1, x_offs, y_offs);
+        SetVertex(0, 1, x_offs, y_offs);
+
+        glEnd();
+
+        PrintGLerror("antialiasing");
+}
+
+
+void DeferredRenderer::FirstPass(FrameBufferObject *fbo, DirectionalLight *light)
+{
+        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
+        GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
+
+        fbo->Bind();
+
+        colorBufferIdx = 3 - colorBufferIdx;
+        glDrawBuffers(1, mrt + colorBufferIdx);
+
+        const Vector3 lightDir = -light->GetDirection();
+
+        sCgDeferredProgram->SetTexture(0, colorsTex);
+        sCgDeferredProgram->SetTexture(1, normalsTex);
+        sCgDeferredProgram->SetValue3f(2, lightDir.x, lightDir.y, lightDir.z);
+        
+        DrawQuad(sCgDeferredProgram);
+
+        PrintGLerror("deferred shading");
+}
+
+
+void DeferredRenderer::ComputeGlobIllum(FrameBufferObject *fbo, 
+                                                                                float tempCohFactor)
+{
 #if 0
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
@@ -509 +656 @@
 #endif
 
-        // flip flop between illumination buffers
-        GLuint oldTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
-
         glPushAttrib(GL_VIEWPORT_BIT);
         glViewport(0, 0, mIllumFbo->GetWidth(), mIllumFbo->GetHeight());
@@ -517 +661 @@
         // read the second buffer, write to the first buffer
         mIllumFbo->Bind();
-        glDrawBuffers(1, mrt + mIllumFboIndex);
-
-        int i = 0;
-
-        sCgSsaoProgram->SetTexture(i ++, colorsTex);
-        sCgSsaoProgram->SetTexture(i ++, normalsTex);
-        sCgSsaoProgram->SetTexture(i ++, oldTex);
-        sCgSsaoProgram->SetTexture(i ++, noiseTex);
-
-        sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
-        
-        if (mUseTemporalCoherence || mRegenerateSamples)
-        {
-                mRegenerateSamples = false;
-
-                // q: should we generate new samples or only rotate the old ones?
-                // in the first case, the sample patterns look nicer, but the kernel
-                // needs longer to converge
-                GenerateSamples(mSamplingMethod); 
-                sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
-        }
-        
-        ++ i;
-
-        for (int j = 0; j < 4; ++ j, ++ i)
-                sCgSsaoProgram->SetValue3f(i, mCornersView[j].x, mCornersView[j].y, mCornersView[j].z);
-
-        sCgSsaoProgram->SetMatrix(i ++, mProjViewMatrix);
-        sCgSsaoProgram->SetMatrix(i ++, mOldProjViewMatrix);
-
-        //Vector3 de = mOldEyePos - mEyePos;
-        Vector3 de;
-        de.x = mOldEyePos.x - mEyePos.x;
-        de.y = mOldEyePos.y - mEyePos.y; 
-        de.z = mOldEyePos.z - mEyePos.z;
-        //Vector3 de = mEyePos - mOldEyePos;
-
-        sCgSsaoProgram->SetValue3f(i ++, de.x, de.y, de.z);
-
-        for (int j = 0; j < 4; ++ j, ++ i)
-                sCgSsaoProgram->SetValue3f(i, mOldCornersView[j].x, mOldCornersView[j].y, mOldCornersView[j].z);
-
-        GLuint attribsTex = fbo->GetColorBuffer(2)->GetTexture();
-        sCgSsaoProgram->SetTexture(i ++, attribsTex);
-
-        float trafos[32];
-        for (int i = 0; i < 16; ++ i)
-                trafos[i] = ((const float *)invTrafo.x)[i];
-
-        static Matrix4x4 identity = IdentityMatrix();
-
-        for (int i = 0; i < 16; ++ i)
-                trafos[i+16] = ((const float *)identity.x)[i];
-
-        //sCgSsaoProgram->SetMatrixArray(i ++, trafos, 2);
-        //sCgSsaoProgram->SetMatrix(i ++, IdentityMatrix());
-
-        DrawQuad(sCgSsaoProgram);
-
-        glPopAttrib();
-
-        PrintGLerror("ssao first pass");
-}
-
-
-static void SetVertex(float x, float y, float x_offs, float y_offs)
-{
-        glMultiTexCoord2fARB(GL_TEXTURE0_ARB, x, y); // center
-        glMultiTexCoord2fARB(GL_TEXTURE1_ARB, x - x_offs, y + y_offs); // left top
-        glMultiTexCoord2fARB(GL_TEXTURE2_ARB, x + x_offs, y - y_offs); // right bottom
-        glMultiTexCoord2fARB(GL_TEXTURE3_ARB, x + x_offs, y + y_offs); // right top
-        glMultiTexCoord2fARB(GL_TEXTURE4_ARB, x - x_offs, y - y_offs); // left bottom
-
-        glMultiTexCoord4fARB(GL_TEXTURE5_ARB, x - x_offs, y, x + x_offs, y); // left right
-        glMultiTexCoord4fARB(GL_TEXTURE6_ARB, x, y + y_offs, x, y - y_offs); // top bottom
-
-        //glVertex3f(x - 0.5f, y - 0.5f, -0.5f);
-        glVertex2f(x, y);
-}
-
-
-void DeferredRenderer::AntiAliasing(FrameBufferObject *fbo, DirectionalLight *light)
-{
-        FrameBufferObject::Release();
-
-        ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
-
-        GLuint colorsTex = colorBuffer->GetTexture();
-        GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
-
-        sCgAntiAliasingProgram->SetTexture(0, colorsTex);
-        sCgAntiAliasingProgram->SetTexture(1, normalsTex);
-
-        sCgAntiAliasingProgram->Bind();
-
-        glBegin(GL_QUADS);
-
-        // the neighbouring texels
-        float x_offs = 1.0f / mWidth;
-        float y_offs = 1.0f / mHeight;
-
-        SetVertex(0, 0, x_offs, y_offs);
-        SetVertex(1, 0, x_offs, y_offs);
-        SetVertex(1, 1, x_offs, y_offs);
-        SetVertex(0, 1, x_offs, y_offs);
-
-        glEnd();
-
-        PrintGLerror("antialiasing");
-}
-
-
-void DeferredRenderer::FirstPass(FrameBufferObject *fbo, DirectionalLight *light)
-{
-        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
-        GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-
-        fbo->Bind();
-
-        colorBufferIdx = 3 - colorBufferIdx;
-        glDrawBuffers(1, mrt + colorBufferIdx);
-
-        const Vector3 lightDir = -light->GetDirection();
-
-        sCgDeferredProgram->SetTexture(0, colorsTex);
-        sCgDeferredProgram->SetTexture(1, normalsTex);
-        sCgDeferredProgram->SetValue3f(2, lightDir.x, lightDir.y, lightDir.z);
-        
-        DrawQuad(sCgDeferredProgram);
-
-        PrintGLerror("deferred shading");
-}
-
-
-void DeferredRenderer::ComputeGlobIllum(FrameBufferObject *fbo, 
-                                                                                float tempCohFactor)
-{
-#if 0
-        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
-        GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-#else
-        GLuint colorsTex = mDownSampleFbo->GetColorBuffer(0)->GetTexture();
-        GLuint normalsTex = mDownSampleFbo->GetColorBuffer(1)->GetTexture();
-#endif
-
-        glPushAttrib(GL_VIEWPORT_BIT);
-        glViewport(0, 0, mIllumFbo->GetWidth(), mIllumFbo->GetHeight());
-
-        // read the second buffer, write to the first buffer
-        mIllumFbo->Bind();
 
         glDrawBuffers(2, mrt + mIllumFboIndex);
@@ -672 +666 @@
         GLuint oldSsaoTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
         GLuint oldIllumTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex + 1)->GetTexture();
-        
 
         sCgGiProgram->SetTexture(0, colorsTex);