Changeset 3008

Timestamp:

10/06/08 16:00:35 (16 years ago)

Author:

mattausch

Message:

improved performance by > 20 frames

Location:

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

Files:

• DeferredRenderer.cpp (modified) (13 diffs)
• shaders/tonemap.cg (modified) (3 diffs)

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

@@ -617 +617 @@
         glDisable(GL_LIGHTING);
         glDisable(GL_BLEND);
+        glDisable(GL_DEPTH_TEST);
 
         glPushAttrib(GL_VIEWPORT_BIT);
@@ -631 +632 @@
         glPushMatrix();
         glLoadIdentity();
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         if (shadowMap)
@@ -724 +723 @@
         glDrawBuffers(1, mrt + mFboIndex);
 
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
         
         cgGLBindProgram(sCgSsaoProgram);
@@ -837 +834 @@
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
 
-        //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         cgGLBindProgram(sCgAntiAliasingProgram);
         
@@ -880 +876 @@
         glDrawBuffers(1, mrt + colorBufferIdx);
         
-        //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        
         cgGLBindProgram(sCgDeferredProgram);
 
@@ -943 +937 @@
         GLuint oldIllumTex = mFbo->GetColorBuffer(2 - mFboIndex + 1)->GetTexture();
         
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
         cgGLBindProgram(sCgGiProgram);
 
@@ -1043 +1035 @@
         cgGLBindProgram(sCgCombinedIllumProgram);
 
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        
 
         cgGLSetTextureParameter(sColorsTexCombinedIllumParam, colorsTex);
@@ -1088 +1078 @@
         glDrawBuffers(1, mrt + colorBufferIdx);
 
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        
         cgGLBindProgram(sCgCombinedSsaoProgram);
 
@@ -1138 +1126 @@
 
         
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
         cgGLBindProgram(sCgDeferredShadowProgram);
 
@@ -1243 +1229 @@
         glDrawBuffers(1, mrt + colorBufferIdx);
         
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
         cgGLBindProgram(sCgLogLumProgram);
         
@@ -1270 +1254 @@
         //-- 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);
 }
 
@@ -1322 +1306 @@
         glDrawBuffers(1, mrt + downSampleBufferIdx);
 
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         cgGLBindProgram(sCgDownSampleProgram);
         
@@ -1357 +1340 @@
 
         fbo->Bind();
-#if 0
+#if 1
         colorBufferIdx = 3 - colorBufferIdx;
         glDrawBuffers(1, mrt + colorBufferIdx);
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         cgGLBindProgram(sCgToneProgram);

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

@@ -82 +82 @@
 {
         pixel OUT;
-        return OUT;
+        
         float4 color = tex2D(colors, IN.texCoord);
 
@@ -112 +112 @@
 
         pixel OUT;
-return OUT;/*
+        
         const float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
 
@@ -134 +134 @@
                 OUT.col.w = logLumScaled;
 
-        return OUT;*/
+        return OUT;
 }