mesa: glsl: add missing sampler types in sizeof_glsl_type(), bug 17079
authorBrian Paul <brian.paul@tungstengraphics.com>
Mon, 11 Aug 2008 21:10:18 +0000 (15:10 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Mon, 11 Aug 2008 21:21:40 +0000 (15:21 -0600)
src/mesa/shader/shader_api.c

index 2b5d5ec58532fb04e8188e9f65adb5e5abad2af3..d8b210be539fb281f925641e308d9143ef81fc24 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.0
+ * Version:  7.1
  *
- * Copyright (C) 2004-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -720,6 +720,17 @@ sizeof_glsl_type(GLenum type)
    case GL_FLOAT:
    case GL_INT:
    case GL_BOOL:
+   case GL_SAMPLER_1D:
+   case GL_SAMPLER_2D:
+   case GL_SAMPLER_3D:
+   case GL_SAMPLER_CUBE:
+   case GL_SAMPLER_1D_SHADOW:
+   case GL_SAMPLER_2D_SHADOW:
+   case GL_SAMPLER_2D_RECT_ARB:
+   case GL_SAMPLER_2D_RECT_SHADOW_ARB:
+   case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
+   case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
+   case GL_SAMPLER_CUBE_SHADOW_EXT:
       return 1;
    case GL_FLOAT_VEC2:
    case GL_INT_VEC2: