Skip to content

A
angle
Commit e6ca6709 by shannon.woods%transgaming.com@gtempaccount.com
Options

Add handling of non-square matrix uniform types to utility methods.

TRAC #22845 Signed-off-by: Geoff Lang Signed-off-by: Shanon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2144 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 50ea4ab5
Showing with 15 additions and 0 deletions
src/libGLESv2/utilities.cpp
...@@ -40,8 +40,17 @@ int UniformComponentCount(GLenum type) ...@@ -40,8 +40,17 @@ int UniformComponentCount(GLenum type)
case GL_UNSIGNED_INT_VEC4: case GL_UNSIGNED_INT_VEC4:
case GL_FLOAT_MAT2: case GL_FLOAT_MAT2:
return 4; return 4;
case GL_FLOAT_MAT2x3:
case GL_FLOAT_MAT3x2:
return 6;
case GL_FLOAT_MAT2x4:
case GL_FLOAT_MAT4x2:
return 8;
case GL_FLOAT_MAT3: case GL_FLOAT_MAT3:
return 9; return 9;
case GL_FLOAT_MAT3x4:
case GL_FLOAT_MAT4x3:
return 12;
case GL_FLOAT_MAT4: case GL_FLOAT_MAT4:
return 16; return 16;
default: default:
...@@ -67,6 +76,12 @@ GLenum UniformComponentType(GLenum type) ...@@ -67,6 +76,12 @@ GLenum UniformComponentType(GLenum type)
case GL_FLOAT_MAT2: case GL_FLOAT_MAT2:
case GL_FLOAT_MAT3: case GL_FLOAT_MAT3:
case GL_FLOAT_MAT4: case GL_FLOAT_MAT4:
case GL_FLOAT_MAT2x3:
case GL_FLOAT_MAT3x2:
case GL_FLOAT_MAT2x4:
case GL_FLOAT_MAT4x2:
case GL_FLOAT_MAT3x4:
case GL_FLOAT_MAT4x3:
return GL_FLOAT; return GL_FLOAT;
case GL_INT: case GL_INT:
case GL_SAMPLER_2D: case GL_SAMPLER_2D:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment