Changeset 3007

Timestamp:

10/06/08 15:50:50 (16 years ago)

Author:

mattausch

Message:

improving performance

Location:

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

Files:

• DeferredRenderer.cpp (modified) (21 diffs)
• DeferredRenderer.h (modified) (1 diff)
• FrameBufferObject.cpp (modified) (3 diffs)
• FrameBufferObject.h (modified) (1 diff)
• shaders/tonemap.cg (modified) (4 diffs)

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

@@ -611 +611 @@
         
 
-        FrameBufferObject::Release();
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
 
@@ -617 +616 @@
         glDisable(GL_TEXTURE_2D);
         glDisable(GL_LIGHTING);
+        glDisable(GL_BLEND);
 
         glPushAttrib(GL_VIEWPORT_BIT);
@@ -631 +631 @@
         glPushMatrix();
         glLoadIdentity();
+
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         if (shadowMap)
@@ -663 +665 @@
 
                 ComputeToneParameters(fbo, light, imageKey, whiteLum, middleGrey);
-                ToneMap(fbo, light, imageKey, whiteLum, middleGrey);
+                ToneMap(fbo, imageKey, whiteLum, middleGrey);
         }
 
@@ -679 +681 @@
         glPopAttrib();
 
+        FrameBufferObject::Release();
         cgGLDisableProfile(RenderState::sCgFragmentProfile);
 }
@@ -712 +715 @@
         GLuint positionsTex = mDownSampleFbo->GetColorBuffer(1)->GetTexture();
         GLuint normalsTex = mDownSampleFbo->GetColorBuffer(2)->GetTexture();
+        GLuint oldTex = mFbo->GetColorBuffer(2 - mFboIndex)->GetTexture();
 
         glPushAttrib(GL_VIEWPORT_BIT);
@@ -720 +724 @@
         glDrawBuffers(1, mrt + mFboIndex);
 
-        GLuint oldTex = mFbo->GetColorBuffer(2 - mFboIndex)->GetTexture();
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+        
         cgGLBindProgram(sCgSsaoProgram);
 
@@ -791 +795 @@
 
         glPopAttrib();
-        FrameBufferObject::Release();
 
         PrintGLerror("ssao first pass");
@@ -827 +830 @@
 void DeferredRenderer::AntiAliasing(FrameBufferObject *fbo, DirectionalLight *light)
 {
+        FrameBufferObject::Release();
+
         ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
 
         GLuint colorsTex = colorBuffer->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+        //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         cgGLBindProgram(sCgAntiAliasingProgram);
         
@@ -874 +880 @@
         glDrawBuffers(1, mrt + colorBufferIdx);
         
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         
         cgGLBindProgram(sCgDeferredProgram);
@@ -907 +913 @@
         cgGLDisableTextureParameter(sPositionsTexDeferredParam);
         cgGLDisableTextureParameter(sNormalsTexDeferredParam);
-
-        FrameBufferObject::Release();
 
         PrintGLerror("deferred shading");
@@ -1016 +1020 @@
         cgGLDisableTextureParameter(sOldIllumTexGiParam);
 
-        FrameBufferObject::Release();
-
         glPopAttrib();
 
@@ -1070 +1072 @@
         cgGLDisableTextureParameter(sIllumTexCombinedIllumParam);
 
-        FrameBufferObject::Release();
-
         PrintGLerror("combine");
 }
@@ -1115 +1115 @@
         cgGLDisableTextureParameter(sSsaoTexCombinedSsaoParam);
         
-        FrameBufferObject::Release();
-
         PrintGLerror("combine ssao");
 }
@@ -1189 +1187 @@
         cgGLDisableTextureParameter(sNoiseTexShadowParam);
 
-        FrameBufferObject::Release();
-
         PrintGLerror("deferred shading + shadows");
 }
@@ -1266 +1262 @@
 
         cgGLDisableTextureParameter(sColorsTexLogLumParam);
-        FrameBufferObject::Release();
 
         PrintGLerror("ToneMapParams");
@@ -1275 +1270 @@
         //-- compute avg loglum in scene using mipmapping
 
-        glBindTexture(GL_TEXTURE_2D, fbo->GetColorBuffer(colorBufferIdx)->GetTexture());
-        glGenerateMipmapEXT(GL_TEXTURE_2D);
+        //glBindTexture(GL_TEXTURE_2D, fbo->GetColorBuffer(colorBufferIdx)->GetTexture());
+        //glGenerateMipmapEXT(GL_TEXTURE_2D);
 }
 
@@ -1342 +1337 @@
 
         cgGLDisableTextureParameter(sColorsTexDownSampleParam);
-        FrameBufferObject::Release();
 
         /*float *data = (float *)mDownSampleFbo->GetColorBuffer(0)->ReadTexture();
@@ -1355 +1349 @@
 
 void DeferredRenderer::ToneMap(FrameBufferObject *fbo,
-                                                           DirectionalLight *light,
                                                            float imageKey, 
                                                            float whiteLum,
@@ -1364 +1357 @@
 
         fbo->Bind();
-
+#if 0
         colorBufferIdx = 3 - colorBufferIdx;
         glDrawBuffers(1, mrt + colorBufferIdx);
+
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         cgGLBindProgram(sCgToneProgram);
-        
+
         cgGLSetTextureParameter(sColorsTexToneParam, colorsTex);
         cgGLEnableTextureParameter(sColorsTexToneParam);
@@ -1380 +1374 @@
         glColor3f(1.0f, 1.0f, 1.0f);
 
+
         glBegin(GL_QUADS);
 
-        // the neighbouring texels
-        const float x_offs = 1.0f / mWidth;
-        const 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);
+        const float offs = 0.5f;
+
+
+        glTexCoord2f(0, 0); glVertex3f(-offs, -offs, -0.5f);
+        glTexCoord2f(1, 0); glVertex3f( offs, -offs, -0.5f);
+        glTexCoord2f(1, 1); glVertex3f( offs,  offs, -0.5f);
+        glTexCoord2f(0, 1); glVertex3f(-offs,  offs, -0.5f);
 
         glEnd();
+#endif
 
         cgGLDisableTextureParameter(sColorsTexToneParam);
-        FrameBufferObject::Release();
 
         PrintGLerror("ToneMap");

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

@@ -80 +80 @@
         void ComputeToneParameters(FrameBufferObject *fbo, DirectionalLight *light, float &imageKey, float &whiteLum, float &middleGrey);
 
-        void ToneMap(FrameBufferObject *fbo, DirectionalLight *light, float imageKey, float whiteLum, float middleGrey);
+        void ToneMap(FrameBufferObject *fbo, float imageKey, float whiteLum, float middleGrey);
 
 

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

@@ -8 +8 @@
 namespace CHCDemoEngine
 {
+
+int FrameBufferObject::sCurrentFbo = -1;
 
 
@@ -337 +339 @@
 void FrameBufferObject::Bind() const
 {
-        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mId);
+        if (sCurrentFbo != mId)
+        {
+                sCurrentFbo = mId;
+                glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mId);
+        }
 }
 
@@ -344 +350 @@
 {
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+        sCurrentFbo = -1;
 }
 

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

@@ -132 +132 @@
 
         unsigned int mDepthTexId;
+
+        static int sCurrentFbo;
 };
 

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

@@ -67 +67 @@
         average = exp(average * 0.25f);
 
-        float4 hcols = cols[0] + cols[1] + cols[2] + cols[3];
+        float4 c = cols[0] + cols[1] + cols[2] + cols[3];
 
-        return hcols * 0.25f;
-        //return float4(average, maximum, 0.0f, cols[0].w);
-
+        return c * 0.25f;
         // Output the luminance to the render target
         //return float4(average, maximum, 0.0f, 1.0f);
@@ -84 +82 @@
 {
         pixel OUT;
+        return OUT;
         float4 color = tex2D(colors, IN.texCoord);
 
@@ -113 +112 @@
 
         pixel OUT;
-
-        float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
+return OUT;/*
+        const float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
 
         OUT.col = color;
@@ -135 +134 @@
                 OUT.col.w = logLumScaled;
 
-        return OUT;
+        return OUT;*/
 }