Changeset 2992

Timestamp:

10/02/08 17:34:10 (16 years ago)

Author:

mattausch

Message:

tone mapping working with using reconstructed depth

Location:

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

Files:

• DeferredRenderer.cpp (modified) (20 diffs)
• chcdemo.cpp (modified) (1 diff)
• shaders/deferred.cg (modified) (2 diffs)
• shaders/ssao.cg (modified) (3 diffs)
• shaders/tonemap.cg (modified) (2 diffs)

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

@@ -34 +34 @@
 static CGprogram sCgCombinedIllumProgram = NULL;
 
+static CGparameter sColorsTexLogLumParam;
+
+
 
 static CGprogram sCgInitialIntensityProgram;
 static CGprogram sCgDownSampleProgram;
 static CGprogram sCgToneProgram;
+static CGprogram sCgLogLumProgram;
+
 
 
@@ -143 +148 @@
 int DeferredRenderer::colorBufferIdx = 0;
 
+
 static void PrintGLerror(char *msg)
 {
@@ -153 +159 @@
                 fprintf(stderr,"OpenGL ERROR: %s: %s\n", errStr, msg);
         }
-}
-
-static int computeSize(int level)
-{
-        // Compute total image size.
-        float w = 1024;
-        float h = 768;
-
-        int mipmapSize = max(1, w / (1 << level) ) * 
-                             max(1, h / (1 << level) ) * sizeof(float) * 4;
-
-        return mipmapSize;
 }
 
@@ -323 +317 @@
                 sPositionsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "positions");  
                 sColorsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "colors");  
-                //sOldColorsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "oldColors");
                 sNormalsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "normals");
                 
@@ -492 +485 @@
                 sSamplesShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "samples");
                 sLightDirShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "lightDir");
-                //sOldColorsTexShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "oldColors");
-
 
                 PoissonDiscSampleGenerator2 poisson(NUM_PCF_TABS, 1.0f);
@@ -502 +493 @@
         else
                 cerr << "deferred program failed to load" << endl;
+
+        sCgLogLumProgram = 
+                cgCreateProgramFromFile(context, 
+                                                                CG_SOURCE,
+                                                                "src/shaders/tonemap.cg", 
+                                                                RenderState::sCgFragmentProfile,
+                                                                "CalcAvgLogLum",
+                                                                NULL);
+
+        if (sCgLogLumProgram != NULL)
+        {
+                cgGLLoadProgram(sCgLogLumProgram);
+                sColorsTexLogLumParam = cgGetNamedParameter(sCgLogLumProgram, "colors");  
+        }
+        else
+                cerr << "avg loglum program failed to load" << endl;
+
 
         sCgToneProgram = 
@@ -524 +532 @@
                 cerr << "tone program failed to load" << endl;
 
+/*
         sCgInitialIntensityProgram = 
                 cgCreateProgramFromFile(context, 
@@ -542 +551 @@
                 cerr << "intensity program failed to load" << endl;
 
-
+*/
 
         PrintGLerror("init");
@@ -655 +664 @@
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
 
-        // generate mip map levels of position texture
-        glBindTexture(GL_TEXTURE_2D, positionsTex);
-        glGenerateMipmapEXT(GL_TEXTURE_2D);
-        
-
+        // generate mip map levels of position in order to improve texture lookup performance
+        //glBindTexture(GL_TEXTURE_2D, positionsTex); glGenerateMipmapEXT(GL_TEXTURE_2D);
+        
         // read the second buffer, write to the first buffer
         mFbo->Bind();
@@ -743 +750 @@
 
 
-Vector3 Interpol(float wx, float wy, Vector3 bl, Vector3 br, Vector3 tl, Vector3 tr)
-{
-        //float3 x1 = lerp(oldColor.w, logLumScaled, 0.1f);
-        Vector3 x1 = bl * (1.0f - wx) + br * wx;
-        Vector3 x2 = tl * (1.0f - wx) + tr * wx;
-
-        Vector3 v = x1 * (1.0f - wy) + x2 * wy;
-
-        return v;
-}
-
-
 void DeferredRenderer::ComputeViewVectors(Vector3 &tl, Vector3 &tr, Vector3 &bl, Vector3 &br)
 {
@@ -830 +825 @@
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
 
-        //GLuint oldColorsTex = fbo->GetColorBuffer(3 - colorBufferIdx)->GetTexture();
-
         fbo->Bind();
 
@@ -845 +838 @@
         cgGLSetTextureParameter(sColorsTexDeferredParam, colorsTex);
         cgGLEnableTextureParameter(sColorsTexDeferredParam);
-
-        //cgGLSetTextureParameter(sOldColorsTexDeferredParam, oldColorsTex);
-        //cgGLEnableTextureParameter(sOldColorsTexDeferredParam);
 
         cgGLSetTextureParameter(sPositionsTexDeferredParam, positionsTex);
@@ -873 +863 @@
 
         cgGLDisableTextureParameter(sColorsTexDeferredParam);
-        //cgGLDisableTextureParameter(sOldColorsTexDeferredParam);
         cgGLDisableTextureParameter(sPositionsTexDeferredParam);
         cgGLDisableTextureParameter(sNormalsTexDeferredParam);
@@ -1111 +1100 @@
         GLuint shadowTex = shadowMap->GetDepthTexture();
 
-        //GLuint oldColorsTex = fbo->GetColorBuffer(3 - colorBufferIdx)->GetTexture();
-
         Matrix4x4 shadowMatrix;
         shadowMap->GetTextureMatrix(shadowMatrix);
@@ -1136 +1123 @@
         cgGLEnableTextureParameter(sShadowMapParam);
 
-        //cgGLSetTextureParameter(sOldColorsTexShadowParam, oldColorsTex);
-        //cgGLEnableTextureParameter(sOldColorsTexShadowParam);
-
         cgGLSetParameter1f(sMaxDepthShadowParam, mScaleFactor);
 
-        //cgGLSetParameter1f(sSampleWidthParam, 10.0f / shadowMap->GetSize());
         cgGLSetParameter1f(sSampleWidthParam, 2.0f / shadowMap->GetSize());
         
@@ -1172 +1155 @@
         cgGLDisableTextureParameter(sShadowMapParam);
         cgGLDisableTextureParameter(sNoiseTexShadowParam);
-        //cgGLDisableTextureParameter(sOldColorsTexShadowParam);
 
         FrameBufferObject::Release();
@@ -1218 +1200 @@
         middleGrey = lightIntensity * maxKey + (1.0f - lightIntensity) * minKey;
 
+#if 1
 
         //////////
@@ -1223 +1206 @@
 
         ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
+        GLuint colorsTex = colorBuffer->GetTexture();
 
         fbo->Bind();
@@ -1228 +1212 @@
         colorBufferIdx = 3 - colorBufferIdx;
         glDrawBuffers(1, mrt + colorBufferIdx);
-
-        GLuint colorsTex = colorBuffer->GetTexture();
-        
+        
+
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
-        cgGLBindProgram(sCgToneProgram);
+        cgGLBindProgram(sCgLogLumProgram);
         
         cgGLSetTextureParameter(sColorsTexLogLumParam, colorsTex);
-        
-        glColor3f(1.0f, 1.0f, 1.0f);
-
-        glBegin(GL_QUADS);
-
-        glColor3f(1.0f, 1.0f, 1.0f);
-
+        cgGLEnableTextureParameter(sColorsTexLogLumParam);
+        
         const float offs = 0.5f;
 
@@ -1261 +1239 @@
         PrintGLerror("ToneMapParams");
 
+#endif
 
         ///////////////////

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

@@ -215 +215 @@
 bool altKeyPressed = false;
 
-#define USE_TONE_MAPPING 1
+#define USE_TONE_MAPPING 0
 
 

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

@@ -76 +76 @@
         // an ambient color term
         float amb = color.w;
-
         float3 normal = normalize(norm.xyz);
-
         float4 col = shade(IN, color, position, normal, amb, lightDir);
         
         OUT.color = col;
         
-#if 0
+#if 1
 
         OUT.color.w = color.w;
@@ -217 +215 @@
         //-- write out logaritmic luminance for tone mapping
 
-#if 0
-
+#if 1
         OUT.color.w = color.w;
-
 #else
 

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

@@ -42 +42 @@
 
 
+// reconstruct world space position
 inline float3 ReconstructSamplePosition(float3 eyePos, 
                                                                                 uniform sampler2D colors,
@@ -47 +48 @@
                                                                                 float3 bl, float3 br, float3 tl, float3 tr)
 {
-        /*float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
-                
-        // reconstruct world space position
+        float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
         float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
-        float3 sample_position = eyePos - rotView * eyeSpaceDepth;*/
-        float3 sample_position = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
+        
+        float3 sample_position = eyePos - rotView * eyeSpaceDepth;
+        //float3 sample_position = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
 
         return sample_position;
@@ -174 +174 @@
 
         //const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos);
-        const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
                 
 

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

@@ -114 +114 @@
         pixel OUT;
 
+        float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
+
+        OUT.col = color;
+
         // the old loglum is stored in the hightest mipmap-level
-        float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
         float oldLogLum = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL)).w;
 
@@ -127 +130 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        OUT.color = color;
+        if (oldLogLum > 0)
+                OUT.col.w = lerp(oldLogLum, logLumScaled, 0.1f);
+        else
+                OUT.col.w = logLumScaled;
 
-        if (oldLogLum > 0)
-                OUT.color.w = lerp(oldLogLum, logLumScaled, 0.1f);
-        else
-                OUT.color.w = logLumScaled;
+        return OUT;
 }