summaryrefslogtreecommitdiff
path: root/builtin_types.h
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-06-03 15:07:34 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-06-09 11:14:57 -0700
commit56d3f6ad782e9819b40544494826954d3fcf978b (patch)
tree8a20d5ca82e423d6d775aa358288c1655610f2ef /builtin_types.h
parentdd5b4a544bd53f192cc86441f4e7e95d93707382 (diff)
Set the type of ir_texture properly; infer it from the sampler type.
Diffstat (limited to 'builtin_types.h')
-rw-r--r--builtin_types.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin_types.h b/builtin_types.h
index 148917e0dc..41ce5d2189 100644
--- a/builtin_types.h
+++ b/builtin_types.h
@@ -65,6 +65,7 @@ static const struct glsl_type builtin_core_types[] = {
const glsl_type *const glsl_type::bool_type = & builtin_core_types[0];
const glsl_type *const glsl_type::int_type = & builtin_core_types[4];
+const glsl_type *const glsl_type::ivec4_type = & builtin_core_types[7];
const glsl_type *const glsl_type::float_type = & builtin_core_types[8];
const glsl_type *const glsl_type::vec2_type = & builtin_core_types[9];
const glsl_type *const glsl_type::vec3_type = & builtin_core_types[10];
@@ -230,6 +231,7 @@ static const struct glsl_type builtin_130_types[] = {
};
const glsl_type *const glsl_type::uint_type = & builtin_130_types[0];
+const glsl_type *const glsl_type::uvec4_type = & builtin_130_types[3];
/*@}*/
/** \name Sampler types added by GL_ARB_texture_rectangle