Changeset 3031

Timestamp:

10/15/08 01:51:10 (16 years ago)

Author:

mattausch

Message:

shader working but slow

Location:

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

Files:

• Material.cpp (modified) (1 diff)
• RenderState.cpp (modified) (6 diffs)
• RenderState.h (modified) (2 diffs)
• RenderTraverser.cpp (modified) (3 diffs)
• ShaderProgram.cpp (modified) (2 diffs)
• Transform3.cpp (modified) (3 diffs)
• chcdemo.cpp (modified) (9 diffs)
• shaders/mrt.cg (modified) (3 diffs)

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

@@ -57 +57 @@
 void Material::Render(RenderState *state)
 {
-        state->SetState(mTexture != NULL, mAlphaTestEnabled, mCullFaceEnabled);
-
-        state->SetTexture(mTexture);
+        state->SetState(mTexture, mAlphaTestEnabled, mCullFaceEnabled);
 
         glMaterialfv(GL_FRONT, GL_AMBIENT, (float *)&mAmbientColor.r);

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

@@ -15 +15 @@
 ShaderProgram *RenderState::sCgMrtFragmentProgram = NULL;
 ShaderProgram *RenderState::sCgMrtFragmentTexProgram = NULL;
+ShaderProgram *RenderState::sCgMrtVertexProgram = NULL;
+
+
 int RenderState::sTexParam;
 
@@ -34 +37 @@
 
         
-bool RenderState::SetState(Mode mode)
+bool RenderState::SetMode(Mode mode)
 {
         ///////////
@@ -85 +88 @@
 
         
-void RenderState::SetState(bool texturing, bool alphaTest, bool cullFace)
-{
+void RenderState::SetState(Texture *tex, bool alphaTest, bool cullFace)
+{
+        const bool texturing = (tex != NULL);
+
         if (!mLockCullFaceEnabled)
         {
@@ -146 +151 @@
                 }
         }
+
+        SetTexture(tex);
 }
 
@@ -166 +173 @@
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
-        SetState(RENDER);
+        SetMode(RENDER);
 }
 
@@ -196 +203 @@
 void RenderState::SetTexture(Texture *tex)
 {
-        if (tex)
-        {
-                if (GetRenderPassType() == RenderState::DEFERRED)
-                {
-                        RenderState::sCgMrtFragmentProgram->SetTexture("tex", tex->GetId());
-                }
-                else
-                {
+        if (GetRenderPassType() == RenderState::DEFERRED)
+        {
+                if (tex)
+                        RenderState::sCgMrtFragmentTexProgram->SetTexture("tex", tex->GetId());
+        }
+        else
+        {
+                if (tex)
                         tex->Bind();
-                }
-        }
-        else
-        {
-                if (!GetRenderPassType() == RenderState::DEFERRED)
+                else
                         glBindTexture(GL_TEXTURE_2D, 0);                
         }

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

@@ -44 +44 @@
                 change was issued.
         */
-        bool SetState(Mode mode);
+        bool SetMode(Mode mode);
         /** Sets the current render state.
         */
-        void SetState(bool texturing, bool alphaTest, bool cullFace);
+        void SetState(Texture *tex, bool alphaTest, bool cullFace);
         /** Returns either query or render mode
         */
@@ -86 +86 @@
         static ShaderProgram *sCgMrtFragmentProgram;
         static ShaderProgram *sCgMrtFragmentTexProgram;
+        static ShaderProgram *sCgMrtVertexProgram;
 
         static int sTexParam;

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

@@ -97 +97 @@
         if (node->GetLastRenderedFrame() != mFrameId)
         {
-                if (mRenderState->SetState(RenderState::RENDER))
+                if (mRenderState->SetMode(RenderState::RENDER))
                         ++ mStats.mNumStateChanges;
                 
@@ -254 +254 @@
 
         // change to query mode and render box
-        if (mRenderState->SetState(RenderState::QUERY))
+        if (mRenderState->SetMode(RenderState::QUERY))
                 ++ mStats.mNumStateChanges;
 
@@ -265 +265 @@
 void RenderTraverser::ApplyRenderQueue()
 {
-        if (mRenderState->SetState(RenderState::RENDER))
+        if (mRenderState->SetMode(RenderState::RENDER))
                 ++ mStats.mNumStateChanges;
                  

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

@@ -92 +92 @@
 
         cgGLSetTextureParameter(p, tex);
+        cgGLEnableTextureParameter(p);
+
         mTextureParams.push_back(p);
 }
@@ -101 +103 @@
 
         // enable all texture parameters
-        /*CGParameterArray::const_iterator it, it_end = mTextureParams.end();
+        CGParameterArray::const_iterator it, it_end = mTextureParams.end();
+
         for (it = mTextureParams.begin(); it != it_end; ++ it) 
                 cgGLEnableTextureParameter(*it);
-        */
 }
 

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

@@ -1 +1 @@
 #include "Transform3.h"
 #include "RenderState.h"
+#include "ShaderProgram.h"
 
 
@@ -33 +34 @@
         if (state->GetRenderPassType() == RenderState::DEFERRED)
         {
-                cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)mMatrix.x);
+                //cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)mMatrix.x);
+                RenderState::sCgMrtVertexProgram->SetMatrix("modelView", mMatrix);
         }
 
@@ -49 +51 @@
         {
                 static Matrix4x4 identity = IdentityMatrix();
-                cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)identity.x);
+                RenderState::sCgMrtVertexProgram->SetMatrix("modelView", identity);
         }
 

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

@@ -282 +282 @@
 static CGcontext sCgContext = NULL;
 
-ShaderProgram *sCgMrtVertexProgram = NULL;
-
 static CGparameter sEyePosParamTex;
 static CGparameter sEyePosParam;
@@ -490 +488 @@
         InitCg();
 
-        DeferredRenderer::InitCG(sCgContext);
-        SkyPreetham::InitCG(sCgContext);
-
         Vector3 cubeCenter(470.398f, 240.364f, 182.5f);
         
@@ -557 +552 @@
         cgGLSetManageTextureParameters(sCgContext, true);
 
-        sCgMrtVertexProgram = 
-                new ShaderProgram(sCgContext, "src/shaders/mrt.cg", RenderState::sCgFragmentProfile, "vtx");
-
-        if (!sCgMrtVertexProgram->IsValid())
+        RenderState::sCgMrtVertexProgram = 
+                new ShaderProgram(sCgContext, "src/shaders/mrt.cg", RenderState::sCgVertexProfile, "vtx");
+
+        if (!RenderState::sCgMrtVertexProgram->IsValid())
                 cerr << "fragment program failed to load" << endl;
 
@@ -567 +562 @@
 
         if (!RenderState::sCgMrtFragmentTexProgram->IsValid())
-                cerr << "fragment program failed to load" << endl;
+                cerr << "fragment tex program failed to load" << endl;
 
         RenderState::sCgMrtFragmentProgram = 
@@ -577 +572 @@
 
         PrintGLerror("init");
+
+        DeferredRenderer::InitCG(sCgContext);
+        SkyPreetham::InitCG(sCgContext);
 
         cout << "cg initialization successful" << endl;
@@ -856 +854 @@
         if ((renderMethod == RENDER_DEFERRED) || (renderMethod == RENDER_DEPTH_PASS_DEFERRED))
         {
-                cgGLSetMatrixParameterfc(Transform3::sModelMatrixParam, (const float *)IdentityMatrix().x);
+                RenderState::sCgMrtVertexProgram->SetMatrix("modelView", IdentityMatrix());
         }
 }
@@ -908 +906 @@
 
         cgGLEnableProfile(RenderState::sCgVertexProfile);
-        sCgMrtVertexProgram->Bind();
+        RenderState::sCgMrtVertexProgram->Bind();
 
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
@@ -915 +913 @@
         const Vector3 pos = camera->GetPosition();
 
-        cgGLSetParameter3f(sEyePosParam, pos.x, pos.y, pos.z);
-        cgGLSetParameter3f(sEyePosParamTex, pos.x, pos.y, pos.z);
+        RenderState::sCgMrtFragmentProgram->SetValue3f("eyePos", pos.x, pos.y, pos.z);
+        RenderState::sCgMrtFragmentTexProgram->SetValue3f("eyePos", pos.x, pos.y, pos.z);
 
 
@@ -1751 +1749 @@
         DEL_PTR(RenderState::sCgMrtFragmentProgram);
         DEL_PTR(RenderState::sCgMrtFragmentTexProgram);
-        DEL_PTR(sCgMrtVertexProgram);
+        DEL_PTR(RenderState::sCgMrtVertexProgram);
         
         DeferredRenderer::ReleaseCG();

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

@@ -43 +43 @@
 
 vtxout vtx(vtxin IN, 
-                   const uniform float4x4 ModelViewProj,
-                   uniform float4x4 ModelView)
+                   uniform float4x4 modelView)
 {
         vtxout OUT;
@@ -52 +51 @@
 
         //OUT.worldPos = mul(glstate.matrix.inverse.projection, OUT.position);
-        OUT.worldPos = mul(ModelView, IN.position);
+        OUT.worldPos = mul(modelView, IN.position);
         // transform the vertex position into eye space
         OUT.position = mul(glstate.matrix.mvp, IN.position);
@@ -75 +74 @@
 
 pixel fragtex(fragin IN, 
-                          uniform sampler2D dirtTex,
                           uniform sampler2D tex,
                           uniform float3 eyePos,