diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-09 09:24:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-09 09:24:20 +0200 |
| commit | 0a9d2abef2e6fac5d52556969655a62711df6418 (patch) | |
| tree | 86d46767bedf8271ec0f67442259c5b3e7a8bb87 /mesalib/src/mesa/main/uniforms.c | |
| parent | adeb8256da9b636648178f729d7b3316a0a8e990 (diff) | |
| download | vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.gz vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.bz2 vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.zip | |
mesa xkbcomp xkeyboard-config git update 9 Jun 2011
Diffstat (limited to 'mesalib/src/mesa/main/uniforms.c')
| -rw-r--r-- | mesalib/src/mesa/main/uniforms.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c index c9b12c8c2..1c4fd82ba 100644 --- a/mesalib/src/mesa/main/uniforms.c +++ b/mesalib/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_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_CUBE_MAP_ARRAY: + case GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW: + case GL_SAMPLER_BUFFER: return GL_TRUE; default: return GL_FALSE; @@ -1457,7 +1461,6 @@ _mesa_init_shader_uniform_dispatch(struct _glapi_table *exec) SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv); /* OpenGL 3.0 */ - /* XXX finish dispatch */ SET_Uniform1uiEXT(exec, _mesa_Uniform1ui); SET_Uniform2uiEXT(exec, _mesa_Uniform2ui); SET_Uniform3uiEXT(exec, _mesa_Uniform3ui); |