| commit | da8d38015a6b80501f6f4b8912105e626e88086f | [log] [tgz] |
|---|---|---|
| author | daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> | Thu Dec 20 21:12:55 2012 +0000 |
| committer | daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> | Thu Dec 20 21:12:55 2012 +0000 |
| tree | c5ab3d3fad7e0e6db39ca51c0af853b2213a1e0e | |
| parent | e6d12e9d68141460f9adfe135a5741673a41eae5 [diff] [blame] |
Implemented support for DX11 sampler uniforms. TRAC #22242 Signed-off-by: Daniel Koch Signed-off-by: Shannon Woods Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1630 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/utilities.cpp b/src/libGLESv2/utilities.cpp index 0b03d2c..2a3ea73 100644 --- a/src/libGLESv2/utilities.cpp +++ b/src/libGLESv2/utilities.cpp
@@ -163,6 +163,8 @@ case GL_BOOL_VEC4: case GL_FLOAT_VEC4: case GL_INT_VEC4: + case GL_SAMPLER_2D: + case GL_SAMPLER_CUBE: return 1; case GL_FLOAT_MAT2: return 2;