Changeset 2977

Timestamp:

09/26/08 18:41:22 (16 years ago)

Author:

mattausch

Message:

tonemapping working but suddenly slow!

Location:

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

Files:

• DeferredRenderer.cpp (modified) (5 diffs)
• FrameBufferObject.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (2 diffs)
• shaders/deferred.cg (modified) (1 diff)

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

@@ -113 +113 @@
 static CGparameter sIntensityTexDownSampleParam;
 
-static unsigned int pbo[] = {0, 0};
-
-static unsigned int sCurrentPBOIdx = 0;
 //#define USE_3D_SSAO
 
@@ -273 +270 @@
         mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
-
-        glGenBuffersARB(2, pbo);
-
-        int dataSize = 1024 * 1768 * 4 * sizeof(float);
-
-        glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pbo[0]);
-        glBufferDataARB(GL_PIXEL_PACK_BUFFER_ARB, dataSize, 0, GL_STREAM_READ_ARB);
-        glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pbo[1]);
-        glBufferDataARB(GL_PIXEL_PACK_BUFFER_ARB, dataSize, 0, GL_STREAM_READ_ARB);
-
-        glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
 }
 
@@ -795 +781 @@
 {
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
-        GLuint oldColorsTex = fbo->GetColorBuffer(3 - colorBufferIdx)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
+
+        GLuint oldColorsTex = fbo->GetColorBuffer(3 - colorBufferIdx)->GetTexture();
 
         fbo->Bind();
@@ -864 +851 @@
 
         // generate mip map levels for position texture
-        glBindTexture(GL_TEXTURE_2D, positionsTex);
-        glGenerateMipmapEXT(GL_TEXTURE_2D);
+        //glBindTexture(GL_TEXTURE_2D, positionsTex);
+        //glGenerateMipmapEXT(GL_TEXTURE_2D);
 
         // read the second buffer, write to the first buffer
@@ -1159 +1146 @@
                                                                                          float &middleGrey)
 {
-        // read pixels from framebuffer to PBO
-/*      glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pbo[sCurrentPBOIdx]);
-        
-        glBindTexture(GL_TEXTURE_2D, fbo->GetColorBuffer(colorBufferIdx)->GetTexture());
-        glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_FLOAT, NULL);
-
-        /////////////
-        //-- map the PBO to process its data by CPU
-
-        sCurrentPBOIdx = 1 - sCurrentPBOIdx;
-
-        glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pbo[sCurrentPBOIdx]);
-        GLfloat *ptr = (GLfloat *)glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY_ARB);
-
-        if (ptr)
-        {
-                float lumScaled = ptr[4 * 2 - 1];
-                float logLum = lumScaled * LOGLUM_RANGE + MINLOGLUM;
-                imageKey = exp(logLum);
-
-                cout << "key: " << imageKey << " " << lumScaled << endl;
-                glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB);
-        }
-*/
-        float *pixels = (float *)fbo->GetColorBuffer(colorBufferIdx)->ReadTexture();
-
-        float lumScaled = pixels[3];//4 * 2 - 1];
-        
-        float logLum = lumScaled * LOGLUM_RANGE + MINLOGLUM;
-        imageKey = exp(logLum);
-        
-        delete [] pixels;
-        cout << "key: " << imageKey << " " << lumScaled << endl;
-
-        // back to conventional pixel operation
-        glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
-
-
         // hack: estimate value where sky burns out
         whiteLum = log(1e4f);

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

@@ -164 +164 @@
         if (useMipMap) 
         {
-                //glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE);
                 glGenerateMipmapEXT(GL_TEXTURE_2D);
         }

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

@@ -617 +617 @@
 
         // the diffuse color buffer
-        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, ColorBufferObject::FILTER_LINEAR);
+        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
 
         // the positions buffer
@@ -626 +626 @@
 
         // another color buffer
-        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, ColorBufferObject::FILTER_LINEAR);
+        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
 
         PrintGLerror("fbo");

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

@@ -97 +97 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        const static float factor = 0.2f;
-        
-        OUT.color.w = lerp(oldColor.w, logLumScaled, factor);
+        if (oldColor.w > 0)
+                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.2f);
+        else
+                OUT.color.w = logLumScaled;
 
         return OUT;