Changeset 3301 for GTP

Timestamp:

02/11/09 17:40:23 (15 years ago)

Author:

mattausch

Message:

working on separable filter but not working yet

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• DeferredRenderer.cpp (modified) (8 diffs)
• DeferredRenderer.h (modified) (1 diff)
• shaders/combineSsao.cg (modified) (1 diff)

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

@@ -57 +57 @@
 
 static ShaderProgram *sCgCombineSsaoProgram = NULL;
+static ShaderProgram *sCgFilterSsaoProgram = NULL;
 static ShaderProgram *sCgCombineIllumProgram = NULL;
 static ShaderProgram *sCgLogLumProgram = NULL;
@@ -326 +327 @@
         }
 
+        ///////
+        //-- the illumination fbo is either half size or full size
+
         mIllumFbo = new FrameBufferObject(downSampledWidth, downSampledHeight, FrameBufferObject::DEPTH_NONE);
-        //mIllumFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
 
         mFBOs.push_back(mIllumFbo);
@@ -359 +362 @@
         // for performance reasons we use a smaller texture and repeat it over the screen
         CreateNoiseTex2D(mIllumFbo->GetWidth() / 4, mIllumFbo->GetWidth() / 4);
-        //CreateNoiseTex2D(mIllumFbo->GetWidth(), mIllumFbo->GetWidth());
-        
+                
         mProjViewMatrix = IdentityMatrix();
         mOldProjViewMatrix = IdentityMatrix();
@@ -397 +399 @@
         //sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsao", "CombineSsaoHalfRes", "CombineSsao");
         sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsaoSep", "CombineSsaoFullRes", "CombineSsao");
+        sCgFilterSsaoProgram = sm->CreateFragmentProgram("combineSsaoSep", "FilterSsaoFullRes", "FilterSsao");
         sCgAntiAliasingProgram = sm->CreateFragmentProgram("antialiasing", "main", "AntiAliasing");
         sCgToneProgram = sm->CreateFragmentProgram("tonemap", "ToneMap", "ToneMap");
@@ -454 +457 @@
         sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 7);
 
+        
+        ////////////////
+
+        string filterSsaoParams[] = 
+                {"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "xyStep"};
+
+        sCgFilterSsaoProgram->AddParameters(filterSsaoParams, 0, 7);
+
 
         //////////////
@@ -572 +583 @@
         case SSAO:
                 ComputeSsao(fbo, mTempCohFactor);
+                FilterSsao(fbo);
                 CombineSsao(fbo);
                 break;
@@ -1027 +1039 @@
 
 
-void DeferredRenderer::CombineSsao(FrameBufferObject *fbo)
+void DeferredRenderer::FilterSsao(FrameBufferObject *fbo)
 {
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
         GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
+        
+        mIllumFbo->Bind();
+        glDrawBuffers(1, mrt + mIllumFboIndex + 1);
+        
+
+        int i = 0;
+
+        sCgFilterSsaoProgram->SetTexture(i ++, colorsTex);
+        sCgFilterSsaoProgram->SetTexture(i ++, ssaoTex);
+
+        for (int j = 0; j < 4; ++ j, ++ i)
+        {
+                sCgFilterSsaoProgram->SetValue3f(i, mCornersView[j].x, mCornersView[j].y, mCornersView[j].z);
+        }
+
+        sCgFilterSsaoProgram->SetValue2f(i ++, 1.0f / (float)mWidth, 0);
+
+        DrawQuad(sCgFilterSsaoProgram);
+        
+        PrintGLerror("combine ssao");
+}
+
+
+void DeferredRenderer::CombineSsao(FrameBufferObject *fbo)
+{
+        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
+        GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
+        GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex + 1)->GetTexture();
         
         FlipFbos(fbo);
@@ -1053 +1093 @@
 
         //sCgCombineSsaoProgram->SetValue2f(i ++, 1.0f / (float)mWidth, 1.0f / (float)mHeight);
-        sCgCombineSsaoProgram->SetValue2f(i ++, 1.0f / (float)mWidth, 0);
-
-        DrawQuad(sCgCombineSsaoProgram);
-        
-        PrintGLerror("combine ssao");
-}
-
-
-void DeferredRenderer::CombineSsao2(FrameBufferObject *fbo)
-{
-        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
-        GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-        GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
-        
-        FlipFbos(fbo);
-
-        int i = 0;
-
-        sCgCombineSsaoProgram->SetTexture(i ++, colorsTex);
-        sCgCombineSsaoProgram->SetTexture(i ++, normalsTex);
-        sCgCombineSsaoProgram->SetTexture(i ++, ssaoTex);
-
-        sCgCombineSsaoProgram->SetArray2f(i ++, (float *)ssaoFilterOffsets, NUM_SSAO_FILTER_SAMPLES);
-        sCgCombineSsaoProgram->SetArray1f(i ++, (float *)ssaoFilterWeights, NUM_SSAO_FILTER_SAMPLES);
-        sCgCombineSsaoProgram->SetValue1f(i ++, mSsaoFilterRadius);
-
-        sCgCombineSsaoProgram->SetMatrix(i++, mProjViewMatrix);
-
-        for (int j = 0; j < 4; ++ j, ++ i)
-        {
-                sCgCombineSsaoProgram->SetValue3f(i, mCornersView[j].x, mCornersView[j].y, mCornersView[j].z);
-        }
-
-        sCgCombineSsaoProgram->SetValue1f(i ++, mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetWidth());
-        sCgCombineSsaoProgram->SetValue1f(i ++, mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetHeight());
+        sCgCombineSsaoProgram->SetValue2f(i ++, 0, 1.0f / (float)mHeight);
 
         DrawQuad(sCgCombineSsaoProgram);

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

@@ -168 +168 @@
         void DepthOfField(FrameBufferObject *fbo);
 
-        void CombineSsao2(FrameBufferObject *fbo);
+        void FilterSsao(FrameBufferObject *fbo);
 
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/combineSsao.cg

@@ -184 +184 @@
 
 /** Function combining image and indirect illumination buffer using a 
-        depth and normal aware discontinuity filter. We assume that 
-        we are using half resolution ssao for this version of the combineSsao
+        depth and normal aware discontinuity filter.
 */
 pixel CombineSsaoFullRes(fragment IN,