projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f2deba
)
mesa: add more sampler types to is_sampler_type()
author
Brian Paul
<brianp@vmware.com>
Wed, 8 Jun 2011 14:05:40 +0000
(08:05 -0600)
committer
Brian Paul
<brianp@vmware.com>
Wed, 8 Jun 2011 14:05:40 +0000
(08:05 -0600)
src/mesa/main/uniforms.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/uniforms.c
b/src/mesa/main/uniforms.c
index c9b12c8c2e1d320dfc4a0ba930fc11ed3dc035ac..771e039eb3503301fdac99bb43b4f03509a59321 100644
(file)
--- a/
src/mesa/main/uniforms.c
+++ b/
src/mesa/main/uniforms.c
@@
-109,12
+109,16
@@
is_sampler_type(GLenum type)
case GL_SAMPLER_CUBE:
case GL_SAMPLER_1D_SHADOW:
case GL_SAMPLER_2D_SHADOW:
case GL_SAMPLER_CUBE:
case GL_SAMPLER_1D_SHADOW:
case GL_SAMPLER_2D_SHADOW:
+ case GL_SAMPLER_CUBE_SHADOW:
case GL_SAMPLER_2D_RECT_ARB:
case GL_SAMPLER_2D_RECT_SHADOW_ARB:
case GL_SAMPLER_1D_ARRAY_EXT:
case GL_SAMPLER_2D_ARRAY_EXT:
case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
case GL_SAMPLER_2D_RECT_ARB:
case GL_SAMPLER_2D_RECT_SHADOW_ARB:
case GL_SAMPLER_1D_ARRAY_EXT:
case GL_SAMPLER_2D_ARRAY_EXT:
case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
+ case GL_SAMPLER_CUBE_MAP_ARRAY:
+ case GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW:
+ case GL_SAMPLER_BUFFER:
return GL_TRUE;
default:
return GL_FALSE;
return GL_TRUE;
default:
return GL_FALSE;