Changeset 3034 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

10/16/08 19:51:16 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (9 diffs)

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

@@ -319 +319 @@
         InitProgram(&sCgLogLumProgram, context, "tonemap", "CalcAvgLogLum");
 
+        int i;
+
+        i = 0;
+
+        sCgSsaoProgram->AddParameter("colors", i ++);
+        sCgSsaoProgram->AddParameter("colors", i ++);
+        sCgSsaoProgram->AddParameter("oldTex", i ++);
+        sCgSsaoProgram->AddParameter("noise", i ++);
+        sCgSsaoProgram->AddParameter("eyePos", i ++);
+        sCgSsaoProgram->AddParameter("temporalCoherence", i ++);
+        sCgSsaoProgram->AddParameter("modelViewProj", i ++);
+        sCgSsaoProgram->AddParameter("oldModelViewProj", i ++);
+        sCgSsaoProgram->AddParameter("samples", i ++);
+        sCgSsaoProgram->AddParameter("bl", i ++);
+        sCgSsaoProgram->AddParameter("br", i ++);
+        sCgSsaoProgram->AddParameter("tl", i ++);
+        sCgSsaoProgram->AddParameter("tr", i ++);
+
+        i = 0;
+
+        sCgGiProgram->AddParameter("colors", i ++);
+        sCgGiProgram->AddParameter("colors", i ++);
+        sCgGiProgram->AddParameter("noise", i ++);
+        sCgGiProgram->AddParameter("oldSsaoTex", i ++);
+        sCgGiProgram->AddParameter("oldIllumTex", i ++);
+        sCgGiProgram->AddParameter("eyePos", i ++);
+        sCgGiProgram->AddParameter("temporalCoherence", i ++);
+        sCgGiProgram->AddParameter("samples", i ++);
+        sCgGiProgram->AddParameter("bl", i ++);
+        sCgGiProgram->AddParameter("br", i ++);
+        sCgGiProgram->AddParameter("tl", i ++);
+        sCgGiProgram->AddParameter("tr", i ++);
+
+        sCgAntiAliasingProgram->AddParameter("colors", 0);
+        sCgAntiAliasingProgram->AddParameter("normals", 1);
+
+        sCgDeferredProgram->AddParameter("colors", 0);
+        sCgDeferredProgram->AddParameter("normals", 1);
+        sCgDeferredProgram->AddParameter("lightDir", 2);
+
+
         float filterWeights[NUM_PCF_TABS];
         PoissonDiscSampleGenerator2 poisson(NUM_PCF_TABS, 1.0f);
@@ -451 +492 @@
         glDrawBuffers(1, mrt + mIllumFboIndex);
 
+        sCgSsaoProgram->SetTexture(0, colorsTex);
+        sCgSsaoProgram->SetTexture(1, normalsTex);
+        sCgSsaoProgram->SetTexture(2, oldTex);
+        sCgSsaoProgram->SetTexture(3, noiseTex);
+
         const Vector3 pos = mCamera->GetPosition();
-        sCgSsaoProgram->SetValue3f("eyePos", pos.x, pos.y, pos.z);
-
-        sCgSsaoProgram->SetTexture("colors", colorsTex);
-        sCgSsaoProgram->SetTexture("normals", normalsTex);
-        sCgSsaoProgram->SetTexture("oldTex", oldTex);
-        sCgSsaoProgram->SetTexture("noise", noiseTex);
-
-        sCgSsaoProgram->SetValue1f("temporalCoherence", (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
-
-        sCgSsaoProgram->SetMatrix("modelViewProj", projViewMatrix);
-        sCgSsaoProgram->SetMatrix("oldModelViewProj", oldProjViewMatrix);
+        sCgSsaoProgram->SetValue3f(4, pos.x, pos.y, pos.z);
+
+        sCgSsaoProgram->SetValue1f(5, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
+        sCgSsaoProgram->SetMatrix(6, projViewMatrix);
+        sCgSsaoProgram->SetMatrix(7, oldProjViewMatrix);
 
         if (mUseTemporalCoherence || mRegenerateSamples)
@@ -472 +512 @@
                 // needs longer to converge
                 GenerateSamples(mSamplingMethod); 
-                sCgSsaoProgram->SetArray2f("samples", (float *)samples2, NUM_SAMPLES);
+                sCgSsaoProgram->SetArray2f(8, (float *)samples2, NUM_SAMPLES);
         }
 
@@ -478 +518 @@
         ComputeViewVectors(tl, tr, bl, br);
 
-        sCgSsaoProgram->SetValue3f("bl", bl.x, bl.y, bl.z);
-        sCgSsaoProgram->SetValue3f("br", br.x, br.y, br.z);
-        sCgSsaoProgram->SetValue3f("tl", tl.x, tl.y, tl.z);
-        sCgSsaoProgram->SetValue3f("tr", tr.x, tr.y, tr.z);
+        sCgSsaoProgram->SetValue3f(9, bl.x, bl.y, bl.z);
+        sCgSsaoProgram->SetValue3f(10, br.x, br.y, br.z);
+        sCgSsaoProgram->SetValue3f(11, tl.x, tl.y, tl.z);
+        sCgSsaoProgram->SetValue3f(12, tr.x, tr.y, tr.z);
 
         DrawQuad(sCgSsaoProgram);
@@ -528 +568 @@
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
 
-        sCgAntiAliasingProgram->SetTexture("colors", colorsTex);
-        sCgAntiAliasingProgram->SetTexture("normals", normalsTex);
+        sCgAntiAliasingProgram->SetTexture(0, colorsTex);
+        sCgAntiAliasingProgram->SetTexture(1, normalsTex);
 
         sCgAntiAliasingProgram->Bind();
@@ -565 +605 @@
         const Vector3 lightDir = -light->GetDirection();
 
-        sCgDeferredProgram->SetTexture("colors", colorsTex);
-        sCgDeferredProgram->SetTexture("normals", normalsTex);
-        sCgDeferredProgram->SetValue3f("lightDir", lightDir.x, lightDir.y, lightDir.z);
+        sCgDeferredProgram->SetTexture(0, colorsTex);
+        sCgDeferredProgram->SetTexture(1, normalsTex);
+        sCgDeferredProgram->SetValue3f(2, lightDir.x, lightDir.y, lightDir.z);
         
         DrawQuad(sCgDeferredProgram);
@@ -603 +643 @@
         
 
-        sCgGiProgram->SetTexture("colors", colorsTex);
-        sCgGiProgram->SetTexture("normals", normalsTex);
-        sCgGiProgram->SetTexture("noise", noiseTex);
-        sCgGiProgram->SetTexture("oldSsaoTex", oldSsaoTex);
-        sCgGiProgram->SetTexture("oldIllumTex", oldIllumTex);
-
-        sCgGiProgram->SetValue1f("temporalCoherence", 
+        sCgGiProgram->SetTexture(0, colorsTex);
+        sCgGiProgram->SetTexture(1, normalsTex);
+        sCgGiProgram->SetTexture(2, noiseTex);
+        sCgGiProgram->SetTexture(3, oldSsaoTex);
+        sCgGiProgram->SetTexture(4, oldIllumTex);
+
+        const Vector3 pos = mCamera->GetPosition();
+        sCgGiProgram->SetValue3f(5, pos.x, pos.y, pos.z);
+
+
+        sCgGiProgram->SetValue1f(6, 
                 (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
 
@@ -621 +665 @@
                 GenerateSamples(mSamplingMethod); 
 
-                sCgGiProgram->SetArray2f("samples", (float *)samples2, NUM_SAMPLES);
+                sCgGiProgram->SetArray2f(7, (float *)samples2, NUM_SAMPLES);
         }
 
@@ -628 +672 @@
         ComputeViewVectors(tl, tr, bl, br);
         
-        const Vector3 pos = mCamera->GetPosition();
-        sCgGiProgram->SetValue3f("eyePos", pos.x, pos.y, pos.z);
-
-        sCgGiProgram->SetValue3f("bl", bl.x, bl.y, bl.z);
-        sCgGiProgram->SetValue3f("br", br.x, br.y, br.z);
-        sCgGiProgram->SetValue3f("tl", tl.x, tl.y, tl.z);
-        sCgGiProgram->SetValue3f("tr", tr.x, tr.y, tr.z);
+        sCgGiProgram->SetValue3f(8, bl.x, bl.y, bl.z);
+        sCgGiProgram->SetValue3f(9, br.x, br.y, br.z);
+        sCgGiProgram->SetValue3f(10, tl.x, tl.y, tl.z);
+        sCgGiProgram->SetValue3f(11, tr.x, tr.y, tr.z);
 
         DrawQuad(sCgGiProgram);