commit 5703d8814d3fde2b74a8ea704b6e12ba4b7b25e7
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:19:38 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:19:38 2013 +0000
tree 47ff872931f5e415a2e2a08cfae3492dd0e0f548
parent b4e07b899053bc100f01162dff09b2a577ff8afb

Add full integer support to the shader language.

TRAC #23080

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2400 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Shader.cpp

diff --git a/src/libGLESv2/Shader.cpp b/src/libGLESv2/Shader.cpp
index 9e479e8..53731b9 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -517,6 +517,22 @@
     {
         return GL_FLOAT_MAT4x3;
     }
+    else if (type == "int")
+    {
+        return GL_INT;
+    }
+    else if (type == "int2")
+    {
+        return GL_INT_VEC2;
+    }
+    else if (type == "int3")
+    {
+        return GL_INT_VEC3;
+    }
+    else if (type == "int4")
+    {
+        return GL_INT_VEC4;
+    }
     else UNREACHABLE();
 
     return GL_NONE;
@@ -534,12 +550,16 @@
     varyingPriorities[GL_FLOAT_MAT4x2]  = 40;
     varyingPriorities[GL_FLOAT_MAT2]    = 50;
     varyingPriorities[GL_FLOAT_VEC4]    = 60;
+    varyingPriorities[GL_INT_VEC4]      = 61;
     varyingPriorities[GL_FLOAT_MAT3]    = 70;
     varyingPriorities[GL_FLOAT_MAT2x3]  = 80;
     varyingPriorities[GL_FLOAT_MAT3x2]  = 90;
     varyingPriorities[GL_FLOAT_VEC3]    = 100;
+    varyingPriorities[GL_INT_VEC3]      = 101;
     varyingPriorities[GL_FLOAT_VEC2]    = 110;
+    varyingPriorities[GL_INT_VEC2]      = 111;
     varyingPriorities[GL_FLOAT]         = 120;
+    varyingPriorities[GL_INT]           = 125;
 }
 
 // true if varying x has a higher priority in packing than y