summaryrefslogtreecommitdiff
path: root/src/glsl/glsl_types.h
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-08-07 02:03:00 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-09-07 17:30:37 -0700
commit76deef138ee25ab57b4716aef41ce0c94081f20a (patch)
tree5335cb9adf19d835376d9f618448127d02f240d6 /src/glsl/glsl_types.h
parentc5e74871d9e4b555f3927fd11944c769d466bd12 (diff)
glsl: Split out types that are in 1.10 but not GLSL ES 1.00.
Diffstat (limited to 'src/glsl/glsl_types.h')
-rw-r--r--src/glsl/glsl_types.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index b4e83c9833..4f7d2f74af 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -430,6 +430,7 @@ private:
static const glsl_type builtin_core_types[];
static const glsl_type builtin_structure_types[];
static const glsl_type builtin_110_deprecated_structure_types[];
+ static const glsl_type builtin_110_types[];
static const glsl_type builtin_120_types[];
static const glsl_type builtin_130_types[];
static const glsl_type builtin_ARB_texture_rectangle_types[];
@@ -446,13 +447,12 @@ private:
* the world in a public header file.
*/
/*@{*/
+ static void generate_100ES_types(glsl_symbol_table *);
static void generate_110_types(glsl_symbol_table *);
static void generate_120_types(glsl_symbol_table *);
static void generate_130_types(glsl_symbol_table *);
- static void generate_ARB_texture_rectangle_types(glsl_symbol_table *,
- bool);
- static void generate_EXT_texture_array_types(glsl_symbol_table *,
- bool);
+ static void generate_ARB_texture_rectangle_types(glsl_symbol_table *, bool);
+ static void generate_EXT_texture_array_types(glsl_symbol_table *, bool);
/*@}*/
/**