Changeset 1289Tweet

Timestamp:

Apr 24, 2012, 8:17:43 PM (11 years ago)

Author:

sam

Message:

gpu: implement a few CG calls.

File:

• trunk/src/gpu/shader.cpp (modified) (6 diffs)

trunk/src/gpu/shader.cpp

@@ -295 +295 @@
     glUniform1i(uni.frag, i);
 #else
-    /* FIXME: does this exist at all? */
-    //cgGLSetParameter1i((CGparameter)uni.frag, i);
+    /* FIXME: does this exist at all? cgGLSetParameter1i doesn't. */
 #endif
 }
@@ -355 +354 @@
     SetUniform(uni, vec4(v, 0, 0));
 #elif !defined __CELLOS_LV2__
-    glUniform2f(uni.frag, v.x, v.y);
+    glUniform2fv(uni.frag, 1, &v[0]);
 #else
     if (uni.frag)
-        cgGLSetParameter2f((CGparameter)uni.frag, v.x, v.y);
+        cgGLSetParameter2fv((CGparameter)uni.frag, &v[0]);
     if (uni.vert)
-        cgGLSetParameter2f((CGparameter)uni.vert, v.x, v.y);
+        cgGLSetParameter2fv((CGparameter)uni.vert, &v[0]);
 #endif
 }
@@ -369 +368 @@
     SetUniform(uni, vec4(v, 0));
 #elif !defined __CELLOS_LV2__
-    glUniform3f(uni.frag, v.x, v.y, v.z);
+    glUniform3fv(uni.frag, 1, &v[0]);
 #else
     if (uni.frag)
-        cgGLSetParameter3f((CGparameter)uni.frag, v.x, v.y, v.z);
+        cgGLSetParameter3fv((CGparameter)uni.frag, &v[0]);
     if (uni.vert)
-        cgGLSetParameter3f((CGparameter)uni.vert, v.x, v.y, v.z);
+        cgGLSetParameter3fv((CGparameter)uni.vert, &v[0]);
 #endif
 }
@@ -386 +385 @@
         g_d3ddevice->SetVertexShaderConstantF((UINT)uni.vert, &v[0], 1);
 #elif !defined __CELLOS_LV2__
-    glUniform4f(uni.frag, v.x, v.y, v.z, v.w);
-#else
-    /* FIXME: use the array versions of these functions */
+    glUniform4fv(uni.frag, 1, &v[0]);
+#else
     if (uni.frag)
-        cgGLSetParameter4f((CGparameter)uni.frag, v.x, v.y, v.z, v.w);
+        cgGLSetParameter4fv((CGparameter)uni.frag, &v[0]);
     if (uni.vert)
-        cgGLSetParameter4f((CGparameter)uni.vert, v.x, v.y, v.z, v.w);
+        cgGLSetParameter4fv((CGparameter)uni.vert, &v[0]);
 #endif
 }
@@ -407 +405 @@
     glUniformMatrix2fv(uni.frag, 1, GL_FALSE, &m[0][0]);
 #else
-    /* FIXME: not implemented */
-    Abort();
+    mat4 tmp(m, 1.0f, 1.0f);
+    if (uni.frag)
+        cgGLSetMatrixParameterfc((CGparameter)uni.frag, &m[0][0]);
+    if (uni.vert)
+        cgGLSetMatrixParameterfc((CGparameter)uni.vert, &m[0][0]);
 #endif
 }
@@ -425 +426 @@
     glUniformMatrix3fv(uni.frag, 1, GL_FALSE, &m[0][0]);
 #else
-    /* FIXME: not implemented */
-    Abort();
+    /* FIXME: check it's the proper way to do this */
+    mat4 tmp(m, 1.0f);
+    if (uni.frag)
+        cgGLSetMatrixParameterfc((CGparameter)uni.frag, &m[0][0]);
+    if (uni.vert)
+        cgGLSetMatrixParameterfc((CGparameter)uni.vert, &m[0][0]);
 #endif
 }