summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-08-11 15:09:47 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-08-11 15:12:42 -0600
commit8c51e0002a3b1fd047b34d31629a15b560618cd9 (patch)
tree93787ffac9800f8760b0996cbc4f134d47c39217 /src/mesa
parent7536f39622d5582a80e34ee4890a36a712e7e8b9 (diff)
mesa: glsl: add missing sampler types in sizeof_glsl_type(), bug 17079
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/shader/shader_api.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 92bf3ecb5c..64b023119b 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -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"),
@@ -715,6 +715,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: