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

Timestamp:

09/23/08 18:02:33 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -35 +35 @@
 static CGprogram sCgCombinedIllumProgram = NULL;
 
+
 ///////////////////////////////////////
 
@@ -98 +99 @@
 
 static CGparameter sImageKeyParam;
-static CGparameter sImageKeyShadowParam;
 
 //#define USE_3D_SSAO
@@ -286 +286 @@
                 sNormalsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "normals");
                 sLightDirParam = cgGetNamedParameter(sCgDeferredProgram, "lightDir");
-
-                sImageKeyParam = cgGetNamedParameter(sCgDeferredProgram, "imageKey");
         }
         else
@@ -408 +406 @@
                 cgGLLoadProgram(sCgAntiAliasingProgram);
 
+                sImageKeyParam = cgGetNamedParameter(sCgAntiAliasingProgram, "imageKey");
+
                 sColorsTexAntiAliasingParam = cgGetNamedParameter(sCgAntiAliasingProgram, "colors");  
                 sNormalsTexAntiAliasingParam = cgGetNamedParameter(sCgAntiAliasingProgram, "normals");
@@ -440 +440 @@
                 sLightDirShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "lightDir");
 
-                sImageKeyShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "imageKey");
 
                 PoissonDiscSampleGenerator2 poisson(NUM_PCF_TABS, 1.0f);
@@ -668 +667 @@
 void DeferredRenderer::AntiAliasing(FrameBufferObject *fbo)
 {
+        const float imageKey = ToneMapper().CalcImageKey(fbo->GetColorBuffer(colorBufferIdx));
+
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
@@ -681 +682 @@
         cgGLSetTextureParameter(sNormalsTexAntiAliasingParam, normalsTex);
         cgGLEnableTextureParameter(sNormalsTexAntiAliasingParam);
+
+        cgGLSetParameter1f(sImageKeyParam, imageKey);
 
         glColor3f(1.0f, 1.0f, 1.0f);
@@ -708 +711 @@
 void DeferredRenderer::FirstPass(FrameBufferObject *fbo, DirectionalLight *light)
 {
-        const float imageKey = ToneMapper().CalcImageKey(fbo->GetColorBuffer(0));
-
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
@@ -737 +738 @@
         cgGLSetParameter3f(sLightDirParam, lightDir.x, lightDir.y, lightDir.z);
 
-        cgGLSetParameter1f(sImageKeyParam, imageKey);
 
         glColor3f(1.0f, 1.0f, 1.0f);
@@ -978 +978 @@
                                                                            ShadowMap *shadowMap)
 {
-        const float imageKey = ToneMapper().CalcImageKey(fbo->GetColorBuffer(0));
-
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
 
@@ -1024 +1022 @@
         cgGLSetParameter3f(sLightDirShadowParam, lightDir.x, lightDir.y, lightDir.z);
 
-        // the average log luminance for tone mapping
-        cgGLSetParameter1f(sImageKeyShadowParam, imageKey);
 
         glColor3f(1.0f, 1.0f, 1.0f);