summaryrefslogtreecommitdiff
path: root/src/glsl/glsl_types.cpp
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-08-05 17:29:15 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-08-05 17:29:15 -0700
commit0a09d679ca97dcb634a939df2110a90c9504e2ec (patch)
treee9533edc3c924c806c5c764463a8ab2fa4db41c8 /src/glsl/glsl_types.cpp
parent1e0f0459e0ca8b9f0c67f8178e5189b8cfd6078c (diff)
glsl_type: Don't have two versions of a type with the same name
Previously some sampler types were duplicated in GLSL 1.30 and GL_EXT_texture_array. This resulted in not being able to find the built-in sampler functions when the extension was used. When the built-in functions were compiled, they bound to the 1.30 version. This caused a type mismatch when trying to find the function. It also resulted in a confusing error message: 0:0(0): error: no matching function for call to `texture2DArray(sampler2DArray, vec3)' 0:0(0): error: candidates are: vec4 texture2DArray(sampler2DArray, vec3) 0:0(0): error: vec4 texture2DArray(sampler2DArray, vec3, float)
Diffstat (limited to 'src/glsl/glsl_types.cpp')
-rw-r--r--src/glsl/glsl_types.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 88f305ac25..03f84603b5 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -144,6 +144,7 @@ glsl_type::generate_130_types(glsl_symbol_table *symtab)
add_types_to_symbol_table(symtab, builtin_130_types,
Elements(builtin_130_types), false);
+ generate_EXT_texture_array_types(symtab, false);
}