Mesa (master): mesa: add more sampler types to is_sampler_type()

Brian Paul brianp at kemper.freedesktop.org
Wed Jun 8 14:14:58 UTC 2011


Module: Mesa
Branch: master
Commit: f9c2feb96b5854ca8030d94a5ea5b168ec818fe8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9c2feb96b5854ca8030d94a5ea5b168ec818fe8

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jun  8 08:05:40 2011 -0600

mesa: add more sampler types to is_sampler_type()

---

 src/mesa/main/uniforms.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index c9b12c8..771e039 100644
--- 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_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;




More information about the mesa-commit mailing list