Changeset 2879 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.cpp

Timestamp:

08/28/08 21:17:15 (16 years ago)

Author:

mattausch

Message:

improved performance

File:

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

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

@@ -9 +9 @@
 using namespace std;
 
-static GLenum mymrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT};
+static GLenum mymrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_COLOR_ATTACHMENT3_EXT};
 
 namespace CHCDemoEngine
@@ -72 +72 @@
 static CGparameter sNormalsTexAntiAliasingParam;
 
-
-static GLuint noiseTex;
+static GLuint noiseTex = 0;
 
 // ssao random spherical samples
@@ -98 +97 @@
         static PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
         poisson.Generate((Sample2 *)samples);
+}
+
+
+static void CreateNoiseTex2D(int w, int h)
+{
+        // hack: should be able to recalc noise texture
+        //if (noiseTex > 0) return;
+
+        //GLubyte *randomNormals = new GLubyte[mWidth * mHeight * 3];
+        float *randomNormals = new float[w * h * 3];
+
+        for (int i = 0; i < w * h * 3; i += 3)
+        {
+                // create random samples on a circle
+                const float rx = RandomValue(0, 1);
+                const float theta = 2.0f * acos(sqrt(1.0f - rx));
+
+                //randomNormals[i + 0] = (GLubyte)((cos(theta) * 0.5f + 0.5f) * 255.0f);
+                //randomNormals[i + 1] = (GLubyte)((sin(theta) * 0.5f + 0.5f) * 255.0f);
+                randomNormals[i + 0] = cos(theta);
+                randomNormals[i + 1] = sin(theta);
+                randomNormals[i + 2] = 0;
+        }
+
+        glEnable(GL_TEXTURE_2D);
+        glGenTextures(1, &noiseTex);
+        glBindTexture(GL_TEXTURE_2D, noiseTex);
+                
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+        //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, mWidth, mHeight, 0, GL_RGB, GL_UNSIGNED_BYTE, randomNormals);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGB, GL_FLOAT, randomNormals);
+
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glDisable(GL_TEXTURE_2D);
+
+        delete [] randomNormals;
+
+        cout << "created noise texture" << endl;
+
+        PrintGLerror("noisetexture");
 }
 
@@ -108 +151 @@
 mUseGlobIllum(false)
 {
+        // create noise texture for ssao
+        CreateNoiseTex2D(w, h);
+
         ///////////
         //-- the flip-flop fbos
 
         mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
-        // the diffuse color buffer
         mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
         mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
@@ -118 +163 @@
         
         mOldFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
-        // the diffuse color buffer
         mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
         mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
         mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
         
-        mFbo3 = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
-        // the diffuse color buffer
-        mFbo3->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
-                
-
-        // create noise texture for ssao
-        CreateNoiseTex2D();
+        //mFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
+        //mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);*/
 }
 
 
 SsaoShader::~SsaoShader() 
-{
-        if (sCgSsaoProgram)
-                cgDestroyProgram(sCgSsaoProgram);
+
+{
+        if (sCgSsaoProgram)     cgDestroyProgram(sCgSsaoProgram);
+        if (sCgDeferredProgram) cgDestroyProgram(sCgDeferredProgram);
+        if (sCgSsaoProgram)     cgDestroyProgram(sCgSsaoProgram);
+        if (sCgGiProgram) cgDestroyProgram(sCgGiProgram);
+        if (sCgAntiAliasingProgram) cgDestroyProgram(sCgAntiAliasingProgram);
 
         DEL_PTR(mNewFbo);
         DEL_PTR(mOldFbo);
+        //DEL_PTR(mFbo);
 
         glDeleteTextures(1, &noiseTex);
@@ -295 +339 @@
         FrameBufferObject::Release();
 
-        glDrawBuffers(1, mymrt);
-
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
 
@@ -345 +387 @@
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
 
-        GLuint colorsTex = mFbo3->GetColorBuffer(0)->GetTexture();
+//      GLuint colorsTex = mFbo->GetColorBuffer(0)->GetTexture();
+        GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
@@ -462 +505 @@
 
 
-void SsaoShader::CreateNoiseTex2D()
-{
-        //GLubyte *randomNormals = new GLubyte[mWidth * mHeight * 3];
-        float *randomNormals = new float[mWidth * mHeight * 3];
-
-        for (int i = 0; i < mWidth * mHeight * 3; i += 3)
-        {
-                // create random samples on a circle
-                const float rx = RandomValue(0, 1);
-                const float theta = 2.0f * acos(sqrt(1.0f - rx));
-
-                //randomNormals[i + 0] = (GLubyte)((cos(theta) * 0.5f + 0.5f) * 255.0f);
-                //randomNormals[i + 1] = (GLubyte)((sin(theta) * 0.5f + 0.5f) * 255.0f);
-                randomNormals[i + 0] = cos(theta);
-                randomNormals[i + 1] = sin(theta);
-                randomNormals[i + 2] = 0;
-        }
-
-        glEnable(GL_TEXTURE_2D);
-        glGenTextures(1, &noiseTex);
-        glBindTexture(GL_TEXTURE_2D, noiseTex);
-                
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-        //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, mWidth, mHeight, 0, GL_RGB, GL_UNSIGNED_BYTE, randomNormals);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, mWidth, mHeight, 0, GL_RGB, GL_FLOAT, randomNormals);
-
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glDisable(GL_TEXTURE_2D);
-
-        delete [] randomNormals;
-
-        cout << "created noise texture" << endl;
-
-        PrintGLerror("noisetexture");
-}
-
-
 
 static void SetVertex(float x, float y, float x_offs, float y_offs)
@@ -521 +523 @@
 void SsaoShader::AntiAliasing(FrameBufferObject *fbo)
 {
-        //GLuint colorsTex = mFbo4->GetColorBuffer(0)->GetTexture();
         GLuint colorsTex = mNewFbo->GetColorBuffer(1)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
@@ -566 +567 @@
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
 
-        mFbo3->Bind();
-        //mNewFbo->Bind();
+        fbo->Bind();
+
+        glDrawBuffers(1, mymrt + 3);
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         
-        glDrawBuffers(1, mymrt);
-
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
 
@@ -618 +618 @@
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixGiParam, (const float *)oldProjViewMatrix.x);
 
-        GLuint colorsTex = mFbo3->GetColorBuffer(0)->GetTexture();
+        //GLuint colorsTex = mFbo->GetColorBuffer(0)->GetTexture();
+        GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();