RTSS: GLSL/ES fix intN data typemap

OGRECave · Aug 13, 2016 · b89066b · b89066b
1 parent 43311e9
commit b89066b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Components/RTShaderSystem/src/OgreShaderGLSLESProgramWriter.cpp b/Components/RTShaderSystem/src/OgreShaderGLSLESProgramWriter.cpp
@@ -225,13 +225,13 @@ namespace Ogre {
             mGpuConstTypeMap[GCT_MATRIX_4X3] = "mat4x3";
             mGpuConstTypeMap[GCT_MATRIX_4X4] = "mat4";
             mGpuConstTypeMap[GCT_INT1] = "int";
-            mGpuConstTypeMap[GCT_INT2] = "int2";
-            mGpuConstTypeMap[GCT_INT3] = "int3";
-            mGpuConstTypeMap[GCT_INT4] = "int4";
+            mGpuConstTypeMap[GCT_INT2] = "ivec2";
+            mGpuConstTypeMap[GCT_INT3] = "ivec3";
+            mGpuConstTypeMap[GCT_INT4] = "ivec4";
             mGpuConstTypeMap[GCT_UINT1] = "uint";
-            mGpuConstTypeMap[GCT_UINT2] = "uint2";
-            mGpuConstTypeMap[GCT_UINT3] = "uint3";
-            mGpuConstTypeMap[GCT_UINT4] = "uint4";
+            mGpuConstTypeMap[GCT_UINT2] = "uvec2";
+            mGpuConstTypeMap[GCT_UINT3] = "uvec3";
+            mGpuConstTypeMap[GCT_UINT4] = "uvec4";
 
             // Custom vertex attributes defined http://www.ogre3d.org/docs/manual/manual_21.html
             mContentToPerVertexAttributes[Parameter::SPC_POSITION_OBJECT_SPACE] = "vertex";

diff --git a/Components/RTShaderSystem/src/OgreShaderGLSLProgramWriter.cpp b/Components/RTShaderSystem/src/OgreShaderGLSLProgramWriter.cpp
@@ -73,13 +73,13 @@ void GLSLProgramWriter::initializeStringMaps()
     mGpuConstTypeMap[GCT_MATRIX_4X3] = "mat4x3";
     mGpuConstTypeMap[GCT_MATRIX_4X4] = "mat4";
     mGpuConstTypeMap[GCT_INT1] = "int";
-    mGpuConstTypeMap[GCT_INT2] = "int2";
-    mGpuConstTypeMap[GCT_INT3] = "int3";
-    mGpuConstTypeMap[GCT_INT4] = "int4";
+    mGpuConstTypeMap[GCT_INT2] = "ivec2";
+    mGpuConstTypeMap[GCT_INT3] = "ivec3";
+    mGpuConstTypeMap[GCT_INT4] = "ivec4";
     mGpuConstTypeMap[GCT_UINT1] = "uint";
-    mGpuConstTypeMap[GCT_UINT2] = "uint2";
-    mGpuConstTypeMap[GCT_UINT3] = "uint3";
-    mGpuConstTypeMap[GCT_UINT4] = "uint4";
+    mGpuConstTypeMap[GCT_UINT2] = "uvec2";
+    mGpuConstTypeMap[GCT_UINT3] = "uvec3";
+    mGpuConstTypeMap[GCT_UINT4] = "uvec4";
 
     // Custom vertex attributes defined http://www.ogre3d.org/docs/manual/manual_21.html
     mContentToPerVertexAttributes[Parameter::SPC_POSITION_OBJECT_SPACE] = "vertex";