RTSS: merge FFPLib_Transform.{cg, hlsl}

bansomin · Jan 18, 2022 · 5f20436 · 5f20436
1 parent badd666
commit 5f20436
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 89 deletions.
diff --git a/Media/RTShaderLib/GLSL/FFPLib_Transform.glsl b/Media/RTShaderLib/GLSL/FFPLib_Transform.glsl
@@ -41,26 +41,41 @@ void FFP_Transform(in mat3 m,
              in vec3 v, 
              out vec3 vOut)
 {
-    vOut = m * v;
+    vOut = mul(m, v);
 }
 
 //-----------------------------------------------------------------------------
 void FFP_Transform(in mat4 m, 
 			 in vec4 v, 
 			 out vec4 vOut)
 {
-	vOut = m * v;
+	vOut = mul(m, v);
 }
 
 //-----------------------------------------------------------------------------
 void FFP_Transform(in mat4 m, 
 				   in vec4 v, 
 				   out vec3 vOut)
 {
-	vOut = (m * v).xyz;
+	vOut = mul(m, v).xyz;
+}
+
+#ifdef OGRE_HLSL
+void FFP_Transform(in float3x4 m,
+				   in float4 v,
+				   out float3 vOut)
+{
+	vOut = mul(m, v);
 }
 
-#if !defined(OGRE_GLSLES) || OGRE_GLSLES > 100
+//-----------------------------------------------------------------------------
+void FFP_Transform(in float3x4 m,
+				   in float3 v,
+				   out float3 vOut)
+{
+	vOut = mul((float3x3)m, v);
+}
+#elif !defined(OGRE_GLSLES) || OGRE_GLSLES > 100
 //-----------------------------------------------------------------------------
 void FFP_Transform(in mat3x4 m,
 				   in vec4 v,
@@ -86,7 +101,11 @@ void FFP_Transform(in mat4 m,
 				   in vec3 v, 
 				   out vec3 vOut)
 {
+#ifdef OGRE_HLSL
+	vOut = mul((float3x3)m, v);
+#else
 	vOut = mat3(m) * v;
+#endif
 }
 
 //-----------------------------------------------------------------------------

diff --git a/Media/RTShaderLib/HLSL_Cg/FFPLib_Transform.cg b/Media/RTShaderLib/HLSL_Cg/FFPLib_Transform.cg