Changeset 1265Tweet

Timestamp:

Apr 21, 2012, 9:45:15 PM (11 years ago)

Author:

sam

Message:

gpu: fix Direct3D handling of float3x3 uniforms; they need padding.

File:

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

trunk/src/gpu/shader.cpp

@@ -399 +399 @@
 {
 #if defined USE_D3D9 || defined _XBOX
+    /* FIXME: do we need padding here like for the mat3 version? */
     if (uni.flags & 1)
         g_d3ddevice->SetPixelShaderConstantF((UINT)uni.frag, &m[0][0], 1);
@@ -406 +407 @@
     glUniformMatrix2fv(uni.frag, 1, GL_FALSE, &m[0][0]);
 #else
-    /* Not implemented */
+    /* FIXME: not implemented */
     Abort();
 #endif
@@ -414 +415 @@
 {
 #if defined USE_D3D9 || defined _XBOX
-    /* FIXME: does this work at all? */
+    /* Padding matrix columns is necessary on DirectX. We need to create
+     * a new data structure; a 4×4 matrix will do. */
+    mat4 tmp(m, 1.0f);
     if (uni.flags & 1)
-        g_d3ddevice->SetPixelShaderConstantF((UINT)uni.frag, &m[0][0], 3);
+        g_d3ddevice->SetPixelShaderConstantF((UINT)uni.frag, &tmp[0][0], 3);
     if (uni.flags & 2)
-        g_d3ddevice->SetVertexShaderConstantF((UINT)uni.vert, &m[0][0], 3);
+        g_d3ddevice->SetVertexShaderConstantF((UINT)uni.vert, &tmp[0][0], 3);
 #elif !defined __CELLOS_LV2__
     glUniformMatrix3fv(uni.frag, 1, GL_FALSE, &m[0][0]);