Changeset 3332

Timestamp:

03/05/09 18:40:34 (16 years ago)

Author:

mattausch

Message:

debug / performance stuff

Location:

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

Files:

• DeferredRenderer.cpp (modified) (11 diffs)
• FrameBufferObject.cpp (modified) (1 diff)
• FrameBufferObject.h (modified) (1 diff)
• shaders/deferred.cg (modified) (2 diffs)
• shaders/globillum.cg (modified) (1 diff)

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

@@ -285 +285 @@
 static void UpdateSampleTex(Sample2 *samples, int numSamples)
 {
+        PrintGLerror("here4");
         glEnable(GL_TEXTURE_2D);
         glBindTexture(GL_TEXTURE_2D, sampleTex2D);
@@ -297 +298 @@
                 tempBuffer[i * 3 + 1] = samples[i].y;
                 tempBuffer[i * 3 + 2] = 0;
-                
         }
 
         glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGB, GL_FLOAT, (float *)tempBuffer);
 
-        glBindTexture(GL_TEXTURE_2D, 0);
+        //glBindTexture(GL_TEXTURE_2D, 0);
         glDisable(GL_TEXTURE_2D);
 
@@ -309 +309 @@
         delete [] tempBuffer;
 
-        PrintGLerror("noisetexture");
+        PrintGLerror("update sample tex");
 }
 
@@ -333 +333 @@
                 tempBuffer[i * 3 + 1] = samples[i].y;
                 tempBuffer[i * 3 + 2] = 0;
-                
         }
 
@@ -345 +344 @@
         delete [] tempBuffer;
 
-        PrintGLerror("noisetexture");
+        PrintGLerror("create sample tex");
 }
 
@@ -420 +419 @@
         for (int i = 0; i < 4; ++ i)
         {
-                mIllumFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+                mIllumFbo->AddColorBuffer(ColorBufferObject::R_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
                 FrameBufferObject::InitBuffer(mIllumFbo, i);
         }
@@ -662 +661 @@
         if (mShadingMethod != 0)
         {
-                //PrepareSsao(fbo); // downsample fbo buffers
+                PrepareSsao(fbo); // downsample fbo buffers
         }
 
@@ -798 +797 @@
 void DeferredRenderer::ComputeSsao(FrameBufferObject *fbo, float tempCohFactor)
 {
+        PrintGLerror("here5");
+
         GLuint colorsTex, normalsTex, attribsTex;
 
@@ -813 +814 @@
         attribsTex = fbo->GetColorBuffer(2)->GetTexture();
 
+        PrintGLerror("here6");
 
         /////////
@@ -819 +821 @@
         GLuint oldSsaoTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
 
+        PrintGLerror("here809");
+
         glPushAttrib(GL_VIEWPORT_BIT);
         glViewport(0, 0, mIllumFbo->GetWidth(), mIllumFbo->GetHeight());
+
+        PrintGLerror("here45");
 
         // read the second buffer, write to the first buffer
         mIllumFbo->Bind();
         glDrawBuffers(2, mrt + mIllumFboIndex);
+
+        PrintGLerror("here8");
 
         int i = 0;
@@ -861 +869 @@
 
         sCgSsaoProgram->SetTexture(i, sampleTex2D);
-
-        static int dummycount = 0;
-
-        if (0)//dummycount ++ % 1000 == 0)
-        {
-                float *data = GrabTexture(sampleTex2D, NUM_PRECOMPUTED_SAMPLES, 1);
-                cout << "********************************" << endl;
-                for (int i = 0; i < NUM_PRECOMPUTED_SAMPLES; ++ i)
-                        cout << data[i] << " ";
-                cout << endl;
-                delete [] data;
-        }
 
         ++ i;

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

@@ -116 +116 @@
         case RGBA_FLOAT_32: 
                 mGlFormat = GL_FLOAT; mInternalFormat = GL_RGBA32F_ARB; break;
+        case R_FLOAT_32: 
+                //mGlFormat = GL_FLOAT; mInternalFormat = GL_R32F_ARB; break;
         default:
                 mGlFormat = GL_UNSIGNED_BYTE; mInternalFormat = GL_RGBA8;

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

@@ -15 +15 @@
 public:
 
-        enum FORMAT {RGB_UBYTE, RGBA_UBYTE, RGB_FLOAT_16, RGBA_FLOAT_16, RGB_FLOAT_32, RGBA_FLOAT_32};
+        enum FORMAT {RGB_UBYTE, RGBA_UBYTE, RGB_FLOAT_16, RGBA_FLOAT_16, RGB_FLOAT_32, RGBA_FLOAT_32, R_FLOAT_32};
         enum WRAP_TYPE {WRAP_REPEAT, WRAP_CLAMP_TO_EDGE, WRAP_CLAMP_TO_BORDER};
         enum FILTER_TYPE {FILTER_NEAREST, FILTER_LINEAR};

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

@@ -338 +338 @@
         const float3 normal = normalize(tex2Dlod(normalsTex, float4(IN.texCoord, 0, 0)).xyz);
 
+//#ifdef PERFORMANCE_TEST
+#if 1
         // do reprojection and filter out the pixels that are not save
         const float2 pValid = PixelValid(oldTex,
@@ -350 +352 @@
                                                                          myTex
                                                                          );
+#else
+        const float2 pValid = float2(0,0);
+#endif
 
         pix.color = color;

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

@@ -34 +34 @@
         return rpt;
 }
+
 
 struct GiStruct