Changeset 3028 for GTP

Timestamp:

10/13/08 10:13:27 (16 years ago)

Author:

mattausch

Message:

debug version: what to do with shader programs??

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• Material.cpp (modified) (1 diff)
• RenderState.cpp (modified) (5 diffs)
• RenderState.h (modified) (3 diffs)
• ShaderProgram.h (modified) (1 diff)
• Transform3.h (modified) (1 diff)
• chcdemo.cpp (modified) (4 diffs)
• shaders/ssao.cg (modified) (3 diffs)

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

@@ -142 +142 @@
 
         glEnd();
-
-        p->Release();
 }
 
@@ -550 +548 @@
         glEnd();
 
-        sCgAntiAliasingProgram->Release();
-
         PrintGLerror("antialiasing");
 }

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

@@ -59 +59 @@
         state->SetState(mTexture != NULL, mAlphaTestEnabled, mCullFaceEnabled);
 
-        if (state->GetRenderPassType() == RenderState::DEFERRED)
-        {
-                if (mTexture)
-                {
-                        cgGLSetTextureParameter(RenderState::sTexParam, mTexture->GetId());
-                        cgGLEnableTextureParameter(RenderState::sTexParam);
-                }
-                else
-                {
-                        cgGLDisableTextureParameter(RenderState::sTexParam);
-                }
-        }
-        else
-        {
-                if (mTexture)
-                        mTexture->Bind();
-                else
-                        glBindTexture(GL_TEXTURE_2D, 0);
-        }
+        state->SetTexture(mTexture);
 
         glMaterialfv(GL_FRONT, GL_AMBIENT, (float *)&mAmbientColor.r);

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

@@ -2 +2 @@
 #include "Geometry.h"
 #include "Material.h"
+#include "ShaderProgram.h"
+#include "Texture.h"
 
 using namespace std;
@@ -11 +13 @@
 CGprofile RenderState::sCgVertexProfile; 
 
-CGprogram RenderState::sCgMrtFragmentProgram = NULL;
-CGprogram RenderState::sCgMrtFragmentTexProgram = NULL;
-CGparameter RenderState::sTexParam;
+ShaderProgram *RenderState::sCgMrtFragmentProgram = NULL;
+ShaderProgram *RenderState::sCgMrtFragmentTexProgram = NULL;
+int RenderState::sTexParam;
 
 
@@ -123 +125 @@
 
                 if (mRenderType == DEFERRED)
-                        cgGLBindProgram(sCgMrtFragmentProgram);
-
-                glDisable(GL_TEXTURE_2D);
+                        sCgMrtFragmentProgram->Bind();
+                else
+                        glDisable(GL_TEXTURE_2D);
+
                 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
         }
@@ -136 +139 @@
 
                         if (mRenderType == DEFERRED)
-                                cgGLBindProgram(sCgMrtFragmentTexProgram);
-
-                        glEnable(GL_TEXTURE_2D);
+                                sCgMrtFragmentTexProgram->Bind();
+                        else
+                                glEnable(GL_TEXTURE_2D);
+
                         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
                 }
@@ -190 +194 @@
 
 
-}
+void RenderState::SetTexture(Texture *tex)
+{
+        if (tex)
+        {
+                if (GetRenderPassType() == RenderState::DEFERRED)
+                {
+                        RenderState::sCgMrtFragmentProgram->SetTexture("tex", tex->GetId());
+                }
+                else
+                {
+                        tex->Bind();
+                }
+        }
+        else
+        {
+                if (!GetRenderPassType() == RenderState::DEFERRED)
+                        glBindTexture(GL_TEXTURE_2D, 0);                
+        }
+}
+
+
+}

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

@@ -11 +11 @@
 namespace CHCDemoEngine 
 {
+
+class ShaderProgram;
+class Texture;
 
 /** The current render state.
@@ -70 +73 @@
         */
         void LockCullFaceEnabled(bool lockCull);
+        /** Set a new texture.
+        */
+        void SetTexture(Texture *tex);
 
 
@@ -78 +84 @@
         static CGprofile sCgVertexProfile; 
 
-        static CGprogram sCgMrtFragmentProgram;
-        static CGprogram sCgMrtFragmentTexProgram;
+        static ShaderProgram *sCgMrtFragmentProgram;
+        static ShaderProgram *sCgMrtFragmentTexProgram;
 
-        static CGparameter sTexParam;
+        static int sTexParam;
+
 
 protected:

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

@@ -45 +45 @@
         void SetArray2f(const std::string &name, float *vals, int numElements);
         void SetArray3f(const std::string &name, float *vals, int numElements);
+        /** Sets the matrix parameter.
+        */
+        void SetMatrix(const std::string &name, const Matrix4x4 &mat);
+        /** Sets the texture parameter.
+        */
+        void SetTexture(const std::string &name, unsigned int tex);
+        /** Enable / disable a texture parameter.
+        */
+        void EnableTexture(const std::string &name);
 
-        void SetMatrix(const std::string &name, const Matrix4x4 &mat);
-
-        void SetTexture(const std::string &name,  unsigned int tex);
-
-        void Release();
-
+        void DisableTexture(const std::string &name);
+        /** Binds the program.
+        */
         void Bind();
-
+        /** Returns true if this program is valid.
+        */
         inline bool IsValid() { return mProgram != NULL; }
 

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

@@ -51 +51 @@
         static CGparameter sModelMatrixParam;
 
+
 protected:
 

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

@@ -281 +281 @@
 
 static CGcontext sCgContext = NULL;
-static CGprogram sCgMrtVertexProgram = NULL;
+
+ShaderProgram *sCgMrtVertexProgram = NULL;
 
 static CGparameter sEyePosParamTex;
@@ -554 +555 @@
         cgGLSetOptimalOptions(RenderState::sCgVertexProfile);
 
+        cgGLSetManageTextureParameters(sCgContext, true);
+
         sCgMrtVertexProgram = 
-                cgCreateProgramFromFile(sCgContext, 
-                                                                CG_SOURCE,
-                                                                "src/shaders/mrt.cg", 
-                                                                RenderState::sCgVertexProfile,
-                                                                "vtx",
-                                                                NULL);
-
-        if (sCgMrtVertexProgram != NULL)
-        {
-                cgGLLoadProgram(sCgMrtVertexProgram);
-
-                //sInvViewProjParam = cgGetNamedParameter(sCgMrtVertexProgram, "InvViewProj");
-                Transform3::sModelMatrixParam = cgGetNamedParameter(sCgMrtVertexProgram, "ModelView");
-        }
+                new ShaderProgram(sCgContext, "src/shaders/mrt.cg", RenderState::sCgFragmentProfile, "vtx");
+
+        if (!sCgMrtVertexProgram->IsValid())
+                cerr << "fragment program failed to load" << endl;
 
         RenderState::sCgMrtFragmentTexProgram = 
-                cgCreateProgramFromFile(sCgContext, 
-                                                                CG_SOURCE,
-                                                                "src/shaders/mrt.cg", 
-                                                                RenderState::sCgFragmentProfile,
-                                                                "fragtex",
-                                                                NULL);
-
-        if (RenderState::sCgMrtFragmentTexProgram != NULL)
-        {
-                cgGLLoadProgram(RenderState::sCgMrtFragmentTexProgram);
-
-                sEyePosParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "eyePos");
-                RenderState::sTexParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tex");
-        }
-        else
-                cerr << "fragment tex program failed to load" << endl;
+                new ShaderProgram(sCgContext, "src/shaders/mrt.cg", RenderState::sCgFragmentProfile, "fragtex");
+
+        if (!RenderState::sCgMrtFragmentTexProgram->IsValid())
+                cerr << "fragment program failed to load" << endl;
 
         RenderState::sCgMrtFragmentProgram = 
-                cgCreateProgramFromFile(sCgContext, 
-                                                                CG_SOURCE,
-                                                                "src/shaders/mrt.cg", 
-                                                                RenderState::sCgFragmentProfile,
-                                                                "frag",
-                                                                NULL);
-
-        if (RenderState::sCgMrtFragmentProgram != NULL)
-        {
-                cgGLLoadProgram(RenderState::sCgMrtFragmentProgram);
-
-                sEyePosParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "eyePos");
-        }
-        else
+                new ShaderProgram(sCgContext, "src/shaders/mrt.cg", RenderState::sCgFragmentProfile, "frag");
+
+        if (!RenderState::sCgMrtFragmentProgram->IsValid())
                 cerr << "fragment program failed to load" << endl;
         
@@ -938 +908 @@
 
         cgGLEnableProfile(RenderState::sCgVertexProfile);
-        cgGLBindProgram(sCgMrtVertexProgram);
+        sCgMrtVertexProgram->Bind();
 
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
-        cgGLBindProgram(RenderState::sCgMrtFragmentProgram);
+        RenderState::sCgMrtFragmentProgram->Bind();
 
         const Vector3 pos = camera->GetPosition();
@@ -1779 +1749 @@
         DEL_PTR(shadowMap);
         DEL_PTR(shadowTraverser);
-
-        if (sCgMrtVertexProgram) 
-                cgDestroyProgram(sCgMrtVertexProgram);
-
-        if (RenderState::sCgMrtFragmentProgram)
-                cgDestroyProgram(RenderState::sCgMrtFragmentProgram);
-
-        if (RenderState::sCgMrtFragmentTexProgram)
-                cgDestroyProgram(RenderState::sCgMrtFragmentTexProgram);
+        DEL_PTR(RenderState::sCgMrtFragmentProgram);
+        DEL_PTR(RenderState::sCgMrtFragmentTexProgram);
+        DEL_PTR(sCgMrtVertexProgram);
         
         DeferredRenderer::ReleaseCG();

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

@@ -172 +172 @@
         currentPos /= currentPos.w;
         
-        const float currentDepth = currentPos.z * 1e-3f;
+        const float precisionScale = 1e-3f;
+        const float currentDepth = currentPos.z * precisionScale;
 
         const float2 ao = ssao(IN, colors, noise, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(viewDir));
@@ -188 +189 @@
 
         // the current depth projected into the old frame
-        const float projDepth = projPos.z * 1e-3f;
+        const float projDepth = projPos.z * precisionScale;
 
         // fit from unit cube into 0 .. 1
@@ -202 +203 @@
 
         //const float oldNumSamples = oldCol.y;
-        const float oldWeight = 50;//clamp(oldCol.y, 0, temporalCoherence);
+        const float oldWeight = clamp(oldCol.y, 0, temporalCoherence);
 
         float newWeight;