diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-08 19:40:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-08 19:40:59 +0000 |
| commit | 432768f75da13ee5343957df6ce5cd316a62929f (patch) | |
| tree | b02a3961540984c3d2caf783a6f0854b9b00f92a /mesalib/src | |
| parent | 43b6c9073b8aad1170536ae5c6a5a019617659f1 (diff) | |
| download | vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.tar.gz vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.tar.bz2 vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.zip | |
xserver mesa libX11 xkbcomp pixman git update 8/1/2011
Diffstat (limited to 'mesalib/src')
110 files changed, 4265 insertions, 3784 deletions
diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h index 5e9c045bf..e414ac8b5 100644 --- a/mesalib/src/glsl/ast.h +++ b/mesalib/src/glsl/ast.h @@ -349,7 +349,11 @@ struct ast_type_qualifier { * qualifier is used.
*/
unsigned explicit_location:1;
- } q;
+ }
+ /** \brief Set of flags, accessed by name. */
+ q;
+
+ /** \brief Set of flags, accessed as a bitmask. */
unsigned i;
} flags;
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index 282bc3ff5..e6ec81ed9 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -60,7 +60,7 @@ void _mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)
{
_mesa_glsl_initialize_variables(instructions, state);
- _mesa_glsl_initialize_functions(instructions, state);
+ _mesa_glsl_initialize_functions(state);
state->symbols->language_version = state->language_version;
@@ -1564,18 +1564,38 @@ ast_expression::hir(exec_list *instructions, }
}
- /* From section 4.1.7 of the GLSL 1.30 spec:
+ /* From page 23 (29 of the PDF) of the GLSL 1.30 spec:
+ *
* "Samplers aggregated into arrays within a shader (using square
* brackets [ ]) can only be indexed with integral constant
* expressions [...]."
+ *
+ * This restriction was added in GLSL 1.30. Shaders using earlier version
+ * of the language should not be rejected by the compiler front-end for
+ * using this construct. This allows useful things such as using a loop
+ * counter as the index to an array of samplers. If the loop in unrolled,
+ * the code should compile correctly. Instead, emit a warning.
*/
if (array->type->is_array() &&
array->type->element_type()->is_sampler() &&
const_index == NULL) {
- _mesa_glsl_error(&loc, state, "sampler arrays can only be indexed "
- "with constant expressions");
- error_emitted = true;
+ if (state->language_version == 100) {
+ _mesa_glsl_warning(&loc, state,
+ "sampler arrays indexed with non-constant "
+ "expressions is optional in GLSL ES 1.00");
+ } else if (state->language_version < 130) {
+ _mesa_glsl_warning(&loc, state,
+ "sampler arrays indexed with non-constant "
+ "expressions is forbidden in GLSL 1.30 and "
+ "later");
+ } else {
+ _mesa_glsl_error(&loc, state,
+ "sampler arrays indexed with non-constant "
+ "expressions is forbidden in GLSL 1.30 and "
+ "later");
+ error_emitted = true;
+ }
}
if (error_emitted)
@@ -1832,6 +1852,23 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual, else if (qual->flags.q.uniform)
var->mode = ir_var_uniform;
+ if (state->all_invariant && (state->current_function == NULL)) {
+ switch (state->target) {
+ case vertex_shader:
+ if (var->mode == ir_var_out)
+ var->invariant = true;
+ break;
+ case geometry_shader:
+ if ((var->mode == ir_var_in) || (var->mode == ir_var_out))
+ var->invariant = true;
+ break;
+ case fragment_shader:
+ if (var->mode == ir_var_in)
+ var->invariant = true;
+ break;
+ }
+ }
+
if (qual->flags.q.flat)
var->interpolation = ir_var_flat;
else if (qual->flags.q.noperspective)
@@ -2158,6 +2195,25 @@ ast_declarator_list::hir(exec_list *instructions, }
}
+ /* Integer vertex outputs must be qualified with 'flat'.
+ *
+ * From section 4.3.6 of the GLSL 1.30 spec:
+ * "If a vertex output is a signed or unsigned integer or integer
+ * vector, then it must be qualified with the interpolation qualifier
+ * flat."
+ */
+ if (state->language_version >= 130
+ && state->target == vertex_shader
+ && state->current_function == NULL
+ && var->type->is_integer()
+ && var->mode == ir_var_out
+ && var->interpolation != ir_var_flat) {
+
+ _mesa_glsl_error(&loc, state, "If a vertex output is an integer, "
+ "then it must be qualified with 'flat'");
+ }
+
+
/* Process the initializer and add its instructions to a temporary
* list. This list will be added to the instruction stream (below) after
* the declaration is added. This is done because in some cases (such as
@@ -2344,6 +2400,27 @@ ast_declarator_list::hir(exec_list *instructions, */
earlier->origin_upper_left = var->origin_upper_left;
earlier->pixel_center_integer = var->pixel_center_integer;
+
+ /* According to section 4.3.7 of the GLSL 1.30 spec,
+ * the following built-in varaibles can be redeclared with an
+ * interpolation qualifier:
+ * * gl_FrontColor
+ * * gl_BackColor
+ * * gl_FrontSecondaryColor
+ * * gl_BackSecondaryColor
+ * * gl_Color
+ * * gl_SecondaryColor
+ */
+ } else if (state->language_version >= 130
+ && (strcmp(var->name, "gl_FrontColor") == 0
+ || strcmp(var->name, "gl_BackColor") == 0
+ || strcmp(var->name, "gl_FrontSecondaryColor") == 0
+ || strcmp(var->name, "gl_BackSecondaryColor") == 0
+ || strcmp(var->name, "gl_Color") == 0
+ || strcmp(var->name, "gl_SecondaryColor") == 0)
+ && earlier->type == var->type
+ && earlier->mode == var->mode) {
+ earlier->interpolation = var->interpolation;
} else {
YYLTYPE loc = this->get_location();
_mesa_glsl_error(&loc, state, "`%s' redeclared", decl->identifier);
diff --git a/mesalib/src/glsl/autogen.sh b/mesalib/src/glsl/autogen.sh new file mode 100644 index 000000000..6fcae015c --- /dev/null +++ b/mesalib/src/glsl/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/mesalib/src/glsl/builtin_function.cpp b/mesalib/src/glsl/builtin_function.cpp index f3effe074..6a0ddbcb8 100644 --- a/mesalib/src/glsl/builtin_function.cpp +++ b/mesalib/src/glsl/builtin_function.cpp @@ -13523,7 +13523,6 @@ _mesa_glsl_release_functions(void) static void
_mesa_read_profile(struct _mesa_glsl_parse_state *state,
- exec_list *instructions,
int profile_index,
const char *prototypes,
const char **functions,
@@ -13542,8 +13541,7 @@ _mesa_read_profile(struct _mesa_glsl_parse_state *state, }
void
-_mesa_glsl_initialize_functions(exec_list *instructions,
- struct _mesa_glsl_parse_state *state)
+_mesa_glsl_initialize_functions(struct _mesa_glsl_parse_state *state)
{
if (builtin_mem_ctx == NULL) {
builtin_mem_ctx = talloc_init("GLSL built-in functions");
@@ -13553,84 +13551,84 @@ _mesa_glsl_initialize_functions(exec_list *instructions, state->num_builtins_to_link = 0;
if (state->target == fragment_shader && state->language_version == 100) {
- _mesa_read_profile(state, instructions, 0,
+ _mesa_read_profile(state, 0,
prototypes_for_100_frag,
functions_for_100_frag,
Elements(functions_for_100_frag));
}
if (state->target == vertex_shader && state->language_version == 100) {
- _mesa_read_profile(state, instructions, 1,
+ _mesa_read_profile(state, 1,
prototypes_for_100_vert,
functions_for_100_vert,
Elements(functions_for_100_vert));
}
if (state->target == fragment_shader && state->language_version == 110) {
- _mesa_read_profile(state, instructions, 2,
+ _mesa_read_profile(state, 2,
prototypes_for_110_frag,
functions_for_110_frag,
Elements(functions_for_110_frag));
}
if (state->target == vertex_shader && state->language_version == 110) {
- _mesa_read_profile(state, instructions, 3,
+ _mesa_read_profile(state, 3,
prototypes_for_110_vert,
functions_for_110_vert,
Elements(functions_for_110_vert));
}
if (state->target == fragment_shader && state->language_version == 120) {
- _mesa_read_profile(state, instructions, 4,
+ _mesa_read_profile(state, 4,
prototypes_for_120_frag,
functions_for_120_frag,
Elements(functions_for_120_frag));
}
if (state->target == vertex_shader && state->language_version == 120) {
- _mesa_read_profile(state, instructions, 5,
+ _mesa_read_profile(state, 5,
prototypes_for_120_vert,
functions_for_120_vert,
Elements(functions_for_120_vert));
}
if (state->target == fragment_shader && state->language_version == 130) {
- _mesa_read_profile(state, instructions, 6,
+ _mesa_read_profile(state, 6,
prototypes_for_130_frag,
functions_for_130_frag,
Elements(functions_for_130_frag));
}
if (state->target == vertex_shader && state->language_version == 130) {
- _mesa_read_profile(state, instructions, 7,
+ _mesa_read_profile(state, 7,
prototypes_for_130_vert,
functions_for_130_vert,
Elements(functions_for_130_vert));
}
if (state->target == fragment_shader && state->ARB_texture_rectangle_enable) {
- _mesa_read_profile(state, instructions, 8,
+ _mesa_read_profile(state, 8,
prototypes_for_ARB_texture_rectangle_frag,
functions_for_ARB_texture_rectangle_frag,
Elements(functions_for_ARB_texture_rectangle_frag));
}
if (state->target == vertex_shader && state->ARB_texture_rectangle_enable) {
- _mesa_read_profile(state, instructions, 9,
+ _mesa_read_profile(state, 9,
prototypes_for_ARB_texture_rectangle_vert,
functions_for_ARB_texture_rectangle_vert,
Elements(functions_for_ARB_texture_rectangle_vert));
}
if (state->target == fragment_shader && state->EXT_texture_array_enable) {
- _mesa_read_profile(state, instructions, 10,
+ _mesa_read_profile(state, 10,
prototypes_for_EXT_texture_array_frag,
functions_for_EXT_texture_array_frag,
Elements(functions_for_EXT_texture_array_frag));
}
if (state->target == vertex_shader && state->EXT_texture_array_enable) {
- _mesa_read_profile(state, instructions, 11,
+ _mesa_read_profile(state, 11,
prototypes_for_EXT_texture_array_vert,
functions_for_EXT_texture_array_vert,
Elements(functions_for_EXT_texture_array_vert));
diff --git a/mesalib/src/glsl/configure.ac b/mesalib/src/glsl/configure.ac new file mode 100644 index 000000000..cd75fc8c1 --- /dev/null +++ b/mesalib/src/glsl/configure.ac @@ -0,0 +1,69 @@ +# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.61)
+AC_INIT(glsl, XXXXX, idr@freedesktop.org, glsl)
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_FILES([glcpp/Makefile])
+
+AM_INIT_AUTOMAKE
+LT_INIT
+
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_MAKE_SET
+AC_PROG_YACC
+AC_PROG_LEX
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+# Checks for libraries.
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_HEADER_STDC
+
+AH_TOP([#ifndef GLSL_CONFIG_H
+#define GLSL_CONFIG_H])
+AH_BOTTOM([#endif /* GLSL_CONFIG_H */])
+
+PKG_CHECK_MODULES([talloc], [talloc >= 2.0])
+
+AC_ARG_ENABLE([debug],
+ [AS_HELP_STRING([--enable-debug],
+ [use debug compiler flags and macros @<:@default=disabled@:>@])],
+ [enable_debug="$enableval"],
+ [enable_debug=no]
+)
+if test "x$enable_debug" = xyes; then
+ DEFINES="$DEFINES -DDEBUG"
+ if test "x$GCC" = xyes; then
+ # Remove any -g or -O flags from the command line
+ CFLAGS=[`echo $CFLAGS | sed 's/-g[^ \t]*[ \t]*//g;s/-O[^ \t]*[ \t]*//g'`]
+ CFLAGS="$CFLAGS -O0 -ggdb3 -fstack-protector -D_FORTIFY_SOURCE=2"
+ fi
+ if test "x$GXX" = xyes; then
+ # Remove any -g flags from the command line
+ CXXFLAGS=[`echo $CXXFLAGS | sed 's/-g[^ \t]*[ \t]*//g;s/-O[^ \t]*[ \t]*//g'`]
+ CXXFLAGS="$CXXFLAGS -O0 -ggdb3 -fstack-protector -D_FORTIFY_SOURCE=2"
+ fi
+fi
+
+if test "x$GXX" = xyes ; then
+ WARN="-Wall -Wextra -Wunsafe-loop-optimizations -Wstack-protector"
+else
+ WARN=""
+fi
+
+CFLAGS="$CFLAGS $WARN"
+CXXFLAGS="$CXXFLAGS $WARN"
+YFLAGS="-d -v"
+
+AC_OUTPUT([Makefile])
diff --git a/mesalib/src/glsl/glsl_lexer.cpp b/mesalib/src/glsl/glsl_lexer.cpp index 79956e076..b923af2e5 100644 --- a/mesalib/src/glsl/glsl_lexer.cpp +++ b/mesalib/src/glsl/glsl_lexer.cpp @@ -54,7 +54,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U)
#endif
+#endif /* ! C99 */
+
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -158,7 +159,15 @@ typedef void* yyscan_t; /* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -349,8 +358,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); *yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 209
-#define YY_END_OF_BUFFER 210
+#define YY_NUM_RULES 210
+#define YY_END_OF_BUFFER 211
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -358,98 +367,100 @@ struct yy_trans_info flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[813] =
+static yyconst flex_int16_t yy_accept[836] =
{ 0,
- 0, 0, 15, 15, 0, 0, 210, 208, 1, 20,
- 208, 208, 208, 208, 208, 208, 208, 208, 119, 117,
- 208, 208, 208, 207, 208, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 208, 1, 208, 209, 15,
- 19, 209, 18, 16, 17, 13, 12, 1, 101, 110,
- 102, 113, 107, 96, 109, 97, 116, 121, 108, 122,
- 119, 0, 0, 124, 119, 0, 117, 117, 105, 98,
- 100, 99, 106, 207, 114, 104, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 29, 207,
-
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 33, 207, 207, 60, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 115,
- 103, 1, 0, 0, 2, 0, 0, 0, 0, 15,
- 14, 18, 17, 0, 121, 120, 0, 122, 0, 123,
- 118, 111, 112, 207, 127, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 32, 207, 207, 207,
-
- 207, 207, 207, 207, 207, 207, 207, 25, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 61,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 0, 0, 0, 0, 14, 0, 121, 0, 120, 0,
- 122, 123, 118, 207, 207, 23, 207, 207, 174, 167,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 31,
- 130, 207, 207, 207, 207, 67, 207, 207, 135, 149,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
-
- 207, 207, 146, 170, 48, 49, 50, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 133, 125, 207,
- 207, 26, 207, 207, 207, 207, 207, 207, 207, 45,
- 46, 47, 94, 207, 207, 0, 0, 0, 0, 0,
- 120, 207, 207, 27, 36, 37, 38, 207, 128, 207,
- 22, 207, 207, 207, 207, 157, 158, 159, 207, 126,
- 207, 150, 24, 160, 161, 162, 172, 154, 155, 156,
- 207, 207, 207, 62, 152, 207, 207, 207, 39, 40,
- 41, 207, 207, 207, 207, 207, 207, 207, 207, 207,
-
- 207, 207, 207, 207, 207, 207, 207, 147, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 129, 207,
- 207, 169, 42, 43, 44, 207, 207, 30, 0, 0,
- 0, 0, 177, 207, 207, 175, 207, 207, 207, 148,
- 143, 180, 207, 207, 207, 207, 207, 207, 138, 207,
- 207, 207, 95, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 207, 207, 207, 207, 153, 134, 207, 207,
- 141, 35, 207, 207, 166, 68, 142, 93, 178, 136,
- 207, 207, 207, 207, 207, 207, 207, 207, 0, 0,
- 0, 0, 207, 207, 207, 137, 34, 207, 207, 207,
-
- 207, 207, 207, 181, 182, 183, 207, 207, 207, 207,
- 207, 171, 207, 207, 207, 207, 207, 207, 207, 207,
- 131, 207, 207, 207, 207, 207, 63, 207, 207, 64,
- 207, 0, 0, 0, 0, 0, 207, 65, 28, 144,
- 185, 186, 187, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 139, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 132, 189, 190, 191, 207,
- 207, 151, 207, 140, 0, 0, 6, 0, 0, 0,
- 11, 3, 21, 207, 207, 207, 207, 207, 207, 207,
- 207, 207, 184, 145, 66, 207, 207, 207, 207, 168,
-
- 207, 176, 173, 206, 70, 71, 72, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 0, 0, 0,
- 0, 0, 0, 207, 207, 207, 188, 207, 207, 207,
- 207, 207, 81, 82, 83, 207, 207, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 192, 87,
- 88, 89, 207, 4, 0, 5, 0, 0, 0, 0,
- 0, 207, 207, 207, 207, 207, 207, 207, 203, 207,
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 73, 207, 207, 207, 207, 207, 207, 0, 0, 0,
- 207, 207, 204, 193, 207, 194, 207, 207, 207, 84,
-
- 207, 207, 207, 207, 207, 207, 207, 207, 207, 207,
- 207, 205, 207, 207, 90, 0, 0, 195, 196, 207,
- 199, 207, 200, 207, 207, 69, 207, 207, 207, 163,
- 207, 164, 179, 207, 197, 198, 207, 207, 0, 0,
- 207, 207, 207, 207, 74, 207, 75, 207, 207, 207,
- 207, 207, 0, 0, 0, 207, 207, 85, 86, 207,
- 76, 207, 207, 77, 207, 91, 92, 0, 0, 0,
- 207, 207, 207, 207, 207, 207, 0, 0, 0, 207,
- 207, 207, 207, 207, 78, 0, 0, 7, 0, 0,
- 201, 202, 207, 207, 207, 0, 8, 0, 0, 207,
-
- 207, 165, 0, 0, 79, 80, 0, 0, 9, 0,
- 10, 0
+ 0, 0, 16, 16, 0, 0, 211, 209, 1, 21,
+ 209, 209, 209, 209, 209, 209, 209, 209, 120, 118,
+ 209, 209, 209, 208, 209, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 209, 1, 209, 210, 16,
+ 20, 210, 19, 17, 18, 14, 13, 1, 102, 111,
+ 103, 114, 108, 97, 110, 98, 117, 122, 109, 123,
+ 120, 0, 0, 125, 120, 0, 118, 118, 106, 99,
+ 101, 100, 107, 208, 115, 105, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 30, 208,
+
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 34, 208, 208, 61, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 116,
+ 104, 1, 0, 0, 2, 0, 0, 0, 0, 16,
+ 15, 19, 18, 0, 122, 121, 0, 123, 0, 124,
+ 119, 112, 113, 208, 128, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 33, 208, 208, 208,
+
+ 208, 208, 208, 208, 208, 208, 208, 26, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 62,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 0, 0, 0, 0, 15, 0, 122, 0, 121, 0,
+ 123, 124, 119, 208, 208, 24, 208, 208, 175, 168,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 32,
+ 131, 208, 208, 208, 208, 68, 208, 208, 136, 150,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+
+ 208, 208, 147, 171, 49, 50, 51, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 134, 126, 208,
+ 208, 27, 208, 208, 208, 208, 208, 208, 208, 46,
+ 47, 48, 95, 208, 208, 0, 0, 0, 0, 0,
+ 121, 208, 208, 28, 37, 38, 39, 208, 129, 208,
+ 23, 208, 208, 208, 208, 158, 159, 160, 208, 127,
+ 208, 151, 25, 161, 162, 163, 173, 155, 156, 157,
+ 208, 208, 208, 63, 153, 208, 208, 208, 40, 41,
+ 42, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+
+ 208, 208, 208, 208, 208, 208, 208, 148, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 130, 208,
+ 208, 170, 43, 44, 45, 208, 208, 31, 0, 0,
+ 0, 0, 178, 208, 208, 176, 208, 208, 208, 149,
+ 144, 181, 208, 208, 208, 208, 208, 208, 139, 208,
+ 208, 208, 96, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 208, 208, 208, 208, 154, 135, 208, 208,
+ 142, 36, 208, 208, 167, 69, 143, 94, 179, 137,
+ 208, 208, 208, 208, 208, 208, 208, 208, 0, 0,
+ 0, 0, 208, 208, 208, 138, 35, 208, 208, 208,
+
+ 208, 208, 208, 182, 183, 184, 208, 208, 208, 208,
+ 208, 172, 208, 208, 208, 208, 208, 208, 208, 208,
+ 132, 208, 208, 208, 208, 208, 64, 208, 208, 65,
+ 208, 0, 0, 0, 0, 0, 208, 66, 29, 145,
+ 186, 187, 188, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 140, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 133, 190, 191, 192, 208,
+ 208, 152, 208, 141, 0, 0, 6, 0, 0, 0,
+ 12, 3, 22, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 185, 146, 67, 208, 208, 208, 208, 169,
+
+ 208, 177, 174, 207, 71, 72, 73, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 0, 0, 0,
+ 0, 0, 0, 0, 208, 208, 208, 189, 208, 208,
+ 208, 208, 208, 82, 83, 84, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 193,
+ 88, 89, 90, 208, 4, 0, 5, 0, 0, 0,
+ 0, 0, 0, 208, 208, 208, 208, 208, 208, 208,
+ 204, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 74, 208, 208, 208, 208, 208, 208, 0,
+ 0, 0, 0, 208, 208, 205, 194, 208, 195, 208,
+
+ 208, 208, 85, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 206, 208, 208, 91, 0, 0,
+ 0, 196, 197, 208, 200, 208, 201, 208, 208, 70,
+ 208, 208, 208, 164, 208, 165, 180, 208, 198, 199,
+ 208, 208, 0, 0, 0, 208, 208, 208, 208, 75,
+ 208, 76, 208, 208, 208, 208, 208, 0, 0, 0,
+ 0, 208, 208, 86, 87, 208, 77, 208, 208, 78,
+ 208, 92, 93, 0, 0, 0, 0, 208, 208, 208,
+ 208, 208, 208, 0, 0, 0, 0, 208, 208, 208,
+ 208, 208, 79, 0, 0, 0, 7, 0, 0, 202,
+
+ 203, 208, 208, 208, 0, 0, 8, 0, 0, 208,
+ 208, 166, 0, 0, 0, 80, 81, 0, 0, 0,
+ 9, 0, 0, 10, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 11, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -461,13 +472,13 @@ static yyconst flex_int32_t yy_ec[256] = 10, 11, 12, 1, 13, 14, 15, 16, 17, 18,
19, 20, 21, 21, 21, 22, 22, 23, 1, 24,
25, 26, 1, 1, 27, 28, 29, 30, 31, 32,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 34, 35, 33, 36, 33, 33, 37, 33, 33,
- 1, 1, 1, 38, 39, 1, 40, 41, 42, 43,
+ 33, 34, 34, 34, 34, 35, 34, 34, 34, 34,
+ 34, 36, 37, 38, 39, 34, 34, 40, 34, 34,
+ 1, 1, 1, 41, 42, 1, 43, 44, 45, 46,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 33, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 1, 65, 1, 1, 1, 1, 1, 1,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 34, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 1, 68, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -484,350 +495,357 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[66] =
+static yyconst flex_int32_t yy_meta[69] =
{ 0,
- 1, 2, 3, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 4, 4, 4, 4, 4,
- 4, 5, 1, 1, 1, 1, 6, 6, 6, 6,
- 5, 5, 7, 7, 7, 7, 8, 1, 7, 6,
- 6, 6, 6, 5, 5, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 8, 7, 7, 1
+ 1, 1, 2, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 3, 3, 3, 3, 3,
+ 3, 3, 1, 1, 1, 1, 4, 4, 4, 4,
+ 3, 3, 5, 5, 5, 5, 5, 5, 5, 5,
+ 1, 5, 4, 4, 4, 4, 3, 3, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 1
} ;
-static yyconst flex_int16_t yy_base[824] =
+static yyconst flex_int16_t yy_base[845] =
{ 0,
- 0, 64, 70, 0, 1185, 1184, 1186, 1189, 65, 1189,
- 1160, 1159, 128, 1158, 125, 126, 124, 1157, 140, 189,
- 123, 1156, 138, 0, 127, 124, 113, 135, 144, 161,
- 176, 1126, 130, 187, 140, 143, 161, 1120, 182, 174,
- 202, 199, 211, 212, 1131, 130, 263, 255, 1189, 189,
- 1189, 1162, 256, 1189, 0, 1189, 1189, 215, 1189, 1189,
- 1189, 1189, 1189, 1189, 1189, 1189, 1189, 248, 1189, 250,
- 112, 302, 319, 1189, 1189, 0, 0, 1189, 1151, 1189,
- 1189, 1189, 1150, 0, 1189, 1189, 1116, 1121, 1114, 1117,
- 1126, 1125, 1111, 1114, 1126, 144, 1120, 1107, 1104, 1118,
-
- 1104, 1101, 1101, 1107, 175, 191, 1101, 1112, 1097, 1103,
- 1107, 1108, 0, 1099, 1110, 247, 1109, 1104, 1084, 230,
- 1088, 1102, 1092, 241, 1085, 228, 1098, 1100, 1082, 1078,
- 1086, 1083, 1072, 1081, 173, 1079, 1085, 1080, 1083, 1071,
- 1074, 233, 240, 260, 1084, 1071, 1084, 239, 1077, 1189,
- 1189, 307, 301, 323, 1189, 1062, 1075, 1066, 1077, 249,
- 0, 368, 0, 379, 1189, 298, 390, 1189, 397, 404,
- 291, 1189, 1189, 1072, 0, 1063, 1067, 1077, 1074, 270,
- 1057, 1057, 1061, 291, 1072, 1069, 1069, 1067, 1064, 1055,
- 1062, 1048, 1046, 1059, 1044, 1061, 0, 1058, 1045, 1053,
-
- 1050, 1054, 1055, 1048, 1045, 1033, 1032, 1046, 1049, 1036,
- 1045, 1032, 1039, 1029, 335, 1035, 1038, 1028, 1036, 1024,
- 1028, 1019, 1034, 1024, 1015, 1034, 1017, 1015, 1026, 1015,
- 1010, 1008, 1022, 1007, 1009, 1006, 1018, 1017, 1020, 1001,
- 306, 1010, 1005, 1003, 1013, 991, 339, 1010, 1012, 1000,
- 992, 996, 1008, 991, 0, 411, 421, 438, 1189, 451,
- 458, 1189, 1189, 986, 997, 0, 994, 344, 0, 0,
- 987, 985, 987, 982, 991, 979, 997, 985, 350, 0,
- 0, 979, 990, 989, 989, 0, 973, 353, 0, 0,
- 975, 357, 983, 984, 974, 968, 967, 968, 967, 967,
-
- 361, 962, 0, 0, 958, 957, 956, 958, 959, 964,
- 958, 954, 968, 963, 962, 961, 952, 955, 955, 947,
- 950, 945, 954, 959, 944, 957, 947, 0, 0, 954,
- 950, 0, 941, 941, 947, 937, 945, 426, 942, 0,
- 0, 0, 0, 931, 944, 943, 942, 939, 927, 465,
- 475, 939, 941, 0, 0, 0, 0, 927, 0, 927,
- 0, 926, 927, 921, 932, 0, 0, 0, 922, 0,
- 918, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 929, 481, 928, 0, 0, 926, 922, 918, 0, 0,
- 0, 910, 443, 486, 493, 915, 911, 917, 907, 905,
-
- 919, 903, 903, 917, 905, 917, 912, 0, 910, 907,
- 911, 894, 896, 903, 909, 904, 903, 890, 0, 892,
- 893, 0, 0, 0, 0, 890, 894, 0, 888, 938,
- 887, 890, 0, 878, 888, 0, 876, 876, 890, 0,
- 892, 0, 497, 901, 900, 899, 869, 868, 0, 886,
- 885, 880, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 868, 882, 868, 865, 0, 0, 871, 870,
- 0, 0, 868, 860, 0, 0, 0, 0, 0, 0,
- 857, 869, 500, 861, 868, 867, 864, 858, 851, 519,
- 867, 852, 847, 861, 859, 0, 0, 851, 871, 870,
-
- 869, 839, 838, 495, 496, 0, 851, 854, 852, 840,
- 836, 0, 849, 846, 845, 834, 833, 832, 515, 841,
- 0, 854, 853, 852, 822, 821, 0, 836, 822, 0,
- 833, 828, 543, 545, 873, 821, 829, 0, 0, 0,
- 845, 844, 0, 825, 828, 812, 820, 810, 818, 819,
- 819, 818, 803, 539, 816, 0, 817, 805, 804, 800,
- 825, 824, 823, 793, 792, 0, 823, 822, 0, 803,
- 806, 0, 552, 0, 792, 557, 1189, 580, 0, 590,
- 499, 1189, 0, 789, 788, 798, 798, 785, 800, 783,
- 798, 793, 0, 0, 0, 806, 805, 804, 774, 0,
-
- 774, 0, 0, 0, 559, 568, 797, 785, 788, 772,
- 771, 781, 781, 794, 793, 792, 762, 767, 552, 613,
- 363, 775, 763, 761, 760, 771, 0, 774, 770, 772,
- 768, 754, 782, 781, 0, 766, 758, 749, 757, 747,
- 758, 754, 756, 754, 754, 741, 740, 751, 0, 767,
- 766, 0, 751, 1189, 391, 1189, 620, 0, 640, 750,
- 732, 749, 748, 731, 723, 731, 721, 729, 0, 726,
- 725, 736, 719, 722, 737, 720, 733, 734, 731, 728,
- 736, 730, 729, 712, 711, 710, 721, 402, 705, 715,
- 699, 698, 0, 725, 698, 723, 696, 700, 699, 0,
-
- 710, 713, 709, 711, 688, 702, 686, 680, 688, 671,
- 662, 0, 640, 639, 0, 648, 641, 0, 0, 645,
- 0, 644, 0, 650, 649, 0, 625, 633, 623, 650,
- 630, 0, 0, 643, 0, 0, 642, 641, 582, 632,
- 639, 638, 614, 613, 635, 608, 633, 607, 590, 607,
- 586, 585, 611, 380, 526, 545, 544, 0, 0, 538,
- 0, 504, 510, 0, 495, 0, 0, 550, 572, 483,
- 470, 454, 462, 449, 445, 404, 419, 616, 619, 391,
- 387, 404, 392, 290, 0, 617, 642, 1189, 644, 570,
- 0, 0, 263, 258, 139, 645, 1189, 643, 618, 107,
-
- 77, 0, 23, 662, 0, 0, 663, 664, 1189, 665,
- 1189, 1189, 697, 702, 707, 712, 714, 716, 722, 729,
- 734, 739, 744
+ 0, 67, 73, 0, 1210, 1209, 1211, 1214, 68, 1214,
+ 1185, 1184, 134, 1183, 131, 132, 130, 1182, 146, 198,
+ 129, 1181, 144, 0, 130, 113, 124, 141, 150, 126,
+ 181, 1148, 159, 192, 118, 129, 146, 1142, 147, 174,
+ 206, 192, 203, 222, 1153, 203, 221, 231, 1214, 260,
+ 1214, 1187, 279, 1214, 0, 1214, 1214, 270, 1214, 1214,
+ 1214, 1214, 1214, 1214, 1214, 1214, 1214, 244, 1214, 255,
+ 139, 290, 307, 1214, 1214, 0, 0, 1214, 1176, 1214,
+ 1214, 1214, 1175, 0, 1214, 1214, 1138, 1143, 1136, 1139,
+ 1148, 1147, 1133, 1136, 1148, 144, 1142, 1129, 1126, 1140,
+
+ 1126, 1123, 1123, 1129, 219, 193, 1123, 1134, 1119, 1125,
+ 1129, 1130, 0, 1121, 1132, 278, 1131, 1126, 1106, 224,
+ 1110, 1124, 1114, 232, 1107, 271, 1120, 1122, 1104, 1100,
+ 1108, 1105, 1094, 1103, 234, 1101, 1107, 1102, 1105, 1093,
+ 1096, 226, 145, 262, 1106, 1093, 1106, 263, 1099, 1214,
+ 1214, 338, 331, 343, 1214, 1084, 1097, 1088, 1099, 345,
+ 0, 334, 0, 345, 1214, 328, 391, 1214, 352, 398,
+ 338, 1214, 1214, 1094, 0, 1085, 1089, 1099, 1096, 332,
+ 1079, 1079, 1083, 320, 1094, 1091, 1091, 1089, 1086, 1077,
+ 1084, 1070, 1068, 1081, 1066, 1083, 0, 1080, 1067, 1075,
+
+ 1072, 1076, 1077, 1070, 1067, 1055, 1054, 1068, 1071, 1058,
+ 1067, 1054, 1061, 1051, 364, 1057, 1060, 1050, 1058, 1046,
+ 1050, 1041, 1056, 1046, 1037, 1056, 1039, 1037, 1048, 1037,
+ 1032, 1030, 1044, 1029, 1031, 1028, 1040, 1039, 1042, 1023,
+ 338, 1032, 1027, 1025, 1035, 1013, 403, 1032, 1034, 1022,
+ 1014, 1018, 1030, 1013, 0, 415, 422, 439, 1214, 446,
+ 455, 1214, 1214, 1008, 1019, 0, 1016, 406, 0, 0,
+ 1009, 1007, 1009, 1004, 1013, 1001, 1019, 1007, 409, 0,
+ 0, 1001, 1012, 1011, 1011, 0, 995, 429, 0, 0,
+ 997, 460, 1005, 1006, 996, 990, 989, 990, 989, 989,
+
+ 463, 984, 0, 0, 980, 979, 978, 980, 981, 986,
+ 980, 976, 990, 985, 984, 983, 974, 977, 977, 969,
+ 972, 967, 976, 981, 966, 979, 969, 0, 0, 976,
+ 972, 0, 963, 963, 969, 959, 967, 466, 964, 0,
+ 0, 0, 0, 953, 966, 965, 964, 961, 949, 472,
+ 479, 961, 963, 0, 0, 0, 0, 949, 0, 949,
+ 0, 948, 949, 943, 954, 0, 0, 0, 944, 0,
+ 940, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 951, 487, 950, 0, 0, 948, 944, 940, 0, 0,
+ 0, 932, 489, 494, 499, 937, 933, 939, 929, 927,
+
+ 941, 925, 925, 939, 927, 939, 934, 0, 932, 929,
+ 933, 916, 918, 925, 931, 926, 925, 912, 0, 914,
+ 915, 0, 0, 0, 0, 912, 916, 0, 910, 963,
+ 909, 912, 0, 900, 910, 0, 898, 898, 912, 0,
+ 914, 0, 503, 926, 925, 924, 891, 890, 0, 908,
+ 907, 902, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 890, 904, 890, 887, 0, 0, 893, 892,
+ 0, 0, 890, 882, 0, 0, 0, 0, 0, 0,
+ 879, 891, 506, 883, 890, 889, 886, 880, 873, 524,
+ 889, 874, 869, 883, 881, 0, 0, 873, 896, 895,
+
+ 894, 861, 860, 361, 365, 0, 873, 876, 874, 862,
+ 858, 0, 871, 868, 867, 856, 855, 854, 519, 863,
+ 0, 879, 878, 877, 844, 843, 0, 858, 844, 0,
+ 855, 850, 547, 553, 898, 843, 851, 0, 0, 0,
+ 870, 869, 0, 847, 850, 834, 842, 832, 840, 841,
+ 841, 840, 825, 559, 838, 0, 839, 827, 826, 822,
+ 850, 849, 848, 815, 814, 0, 848, 847, 0, 825,
+ 828, 0, 562, 0, 814, 580, 1214, 587, 0, 607,
+ 584, 1214, 0, 811, 810, 820, 820, 807, 822, 805,
+ 820, 815, 0, 0, 0, 831, 830, 829, 796, 0,
+
+ 796, 0, 0, 0, 502, 524, 820, 807, 810, 794,
+ 793, 803, 803, 819, 818, 817, 784, 789, 615, 640,
+ 550, 806, 796, 784, 782, 781, 792, 0, 795, 791,
+ 793, 789, 775, 806, 805, 0, 787, 779, 770, 778,
+ 768, 779, 775, 777, 775, 775, 762, 761, 772, 0,
+ 791, 790, 0, 772, 1214, 555, 1214, 647, 0, 667,
+ 785, 770, 752, 769, 768, 751, 743, 751, 741, 749,
+ 0, 746, 745, 756, 739, 742, 757, 740, 753, 754,
+ 751, 748, 757, 750, 749, 732, 731, 730, 741, 582,
+ 754, 724, 734, 718, 717, 0, 745, 717, 743, 715,
+
+ 719, 718, 0, 729, 732, 728, 730, 711, 725, 709,
+ 710, 718, 701, 700, 0, 706, 705, 0, 728, 713,
+ 706, 0, 0, 710, 0, 709, 0, 715, 714, 0,
+ 690, 698, 688, 716, 695, 0, 0, 708, 0, 0,
+ 707, 706, 746, 611, 696, 703, 702, 678, 677, 705,
+ 677, 703, 689, 674, 691, 670, 669, 190, 613, 557,
+ 667, 687, 686, 0, 0, 681, 0, 680, 686, 0,
+ 671, 0, 0, 671, 590, 343, 672, 645, 644, 654,
+ 635, 631, 612, 612, 604, 443, 635, 576, 575, 549,
+ 25, 87, 0, 183, 500, 552, 1214, 636, 591, 0,
+
+ 0, 196, 258, 254, 272, 609, 1214, 614, 598, 279,
+ 284, 0, 336, 348, 671, 0, 0, 362, 672, 688,
+ 1214, 394, 689, 1214, 408, 670, 691, 649, 651, 474,
+ 476, 693, 694, 1214, 1214, 704, 707, 710, 530, 591,
+ 713, 717, 720, 722
} ;
-static yyconst flex_int16_t yy_def[824] =
+static yyconst flex_int16_t yy_def[845] =
{ 0,
- 812, 1, 812, 3, 813, 813, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 814, 812, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 815, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 816, 812, 817,
- 19, 812, 812, 812, 812, 818, 20, 812, 812, 812,
- 812, 812, 812, 814, 812, 812, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
-
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 819, 812, 815, 812, 812, 817, 812, 812, 812, 812,
- 818, 812, 812, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
-
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 812, 812, 812, 812, 819, 812, 812, 812, 812, 812,
- 812, 812, 812, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
-
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 812, 812, 812, 812, 812,
- 812, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
-
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 812, 812,
- 812, 812, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 812, 812,
- 812, 812, 814, 814, 814, 814, 814, 814, 814, 814,
-
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 812, 820, 812, 812, 812, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 812, 812, 812, 812, 821, 812,
- 812, 812, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
-
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 812, 822, 812,
- 821, 812, 812, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 812, 812, 812, 812, 823, 812, 812,
- 812, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 823, 812, 812,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
-
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 812, 812, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 814, 812, 812,
- 814, 814, 814, 814, 814, 814, 814, 814, 814, 814,
- 814, 814, 812, 812, 812, 814, 814, 814, 814, 814,
- 814, 814, 814, 814, 814, 814, 814, 812, 812, 812,
- 814, 814, 814, 814, 814, 814, 812, 812, 812, 814,
- 814, 814, 814, 814, 814, 812, 812, 812, 812, 812,
- 814, 814, 814, 814, 814, 812, 812, 812, 812, 814,
-
- 814, 814, 812, 812, 814, 814, 812, 812, 812, 812,
- 812, 0, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812
+ 835, 1, 835, 3, 836, 836, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 837, 835, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 838, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 839, 835, 840,
+ 19, 835, 835, 835, 835, 841, 20, 835, 835, 835,
+ 835, 835, 835, 837, 835, 835, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 842, 835, 838, 835, 835, 840, 835, 835, 835, 835,
+ 841, 835, 835, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 835, 835, 835, 835, 842, 835, 835, 835, 835, 835,
+ 835, 835, 835, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 835, 835, 835, 835, 835,
+ 835, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 835, 835,
+ 835, 835, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 835, 835,
+ 835, 835, 837, 837, 837, 837, 837, 837, 837, 837,
+
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 835, 835, 835, 835, 835, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 835, 835, 835, 835, 843, 835,
+ 835, 835, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 835, 835, 835,
+ 843, 835, 835, 835, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 835, 835, 835, 835, 844, 835,
+ 835, 835, 835, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 844,
+ 835, 835, 835, 837, 837, 837, 837, 837, 837, 837,
+
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 835, 835,
+ 835, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 835, 835, 835, 837, 837, 837, 837, 837,
+ 837, 837, 837, 837, 837, 837, 837, 835, 835, 835,
+ 835, 837, 837, 837, 837, 837, 837, 837, 837, 837,
+ 837, 837, 837, 835, 835, 835, 835, 837, 837, 837,
+ 837, 837, 837, 835, 835, 835, 835, 837, 837, 837,
+ 837, 837, 837, 835, 835, 835, 835, 835, 835, 837,
+
+ 837, 837, 837, 837, 835, 835, 835, 835, 835, 837,
+ 837, 837, 835, 835, 835, 837, 837, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 0, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835
} ;
-static yyconst flex_int16_t yy_nxt[1255] =
+static yyconst flex_int16_t yy_nxt[1283] =
{ 0,
8, 9, 10, 9, 11, 8, 12, 13, 8, 8,
14, 15, 16, 17, 18, 19, 20, 20, 20, 20,
20, 20, 8, 21, 22, 23, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 25, 24, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 24, 24,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 24, 24, 24, 46, 47, 58, 807, 58, 48,
- 49, 50, 51, 50, 49, 49, 49, 49, 49, 49,
- 49, 49, 49, 49, 52, 49, 53, 53, 53, 53,
- 53, 53, 54, 49, 49, 49, 55, 55, 55, 55,
-
- 55, 55, 55, 55, 55, 55, 55, 49, 55, 55,
+ 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+ 25, 24, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 24, 24, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 24, 24, 24, 46, 47, 58,
+ 803, 58, 48, 49, 50, 51, 50, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 52, 49, 53,
+ 53, 53, 53, 53, 53, 54, 49, 49, 49, 55,
+
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+ 55, 55, 55, 49, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
- 55, 55, 55, 55, 49, 61, 64, 806, 66, 68,
- 68, 68, 68, 68, 68, 68, 79, 80, 812, 65,
- 67, 85, 62, 70, 150, 71, 71, 71, 71, 71,
- 71, 72, 82, 83, 86, 87, 90, 805, 91, 110,
- 73, 74, 92, 812, 93, 75, 76, 111, 94, 119,
- 88, 89, 121, 73, 74, 95, 122, 97, 96, 112,
- 160, 98, 160, 120, 151, 183, 184, 99, 75, 802,
-
- 123, 76, 70, 100, 77, 77, 77, 77, 77, 77,
- 77, 101, 231, 102, 124, 104, 58, 129, 58, 73,
- 74, 126, 103, 105, 78, 193, 106, 130, 232, 107,
- 195, 113, 73, 74, 114, 108, 194, 127, 115, 116,
- 128, 131, 138, 117, 196, 139, 118, 78, 132, 133,
- 160, 146, 160, 134, 140, 147, 154, 155, 142, 135,
- 136, 141, 137, 143, 152, 148, 58, 144, 153, 221,
- 145, 162, 162, 162, 162, 162, 162, 162, 164, 165,
- 167, 168, 213, 222, 239, 240, 248, 241, 218, 249,
- 214, 164, 165, 167, 168, 219, 242, 205, 156, 243,
-
- 206, 207, 154, 155, 208, 157, 209, 244, 152, 158,
- 58, 801, 153, 269, 159, 70, 800, 72, 72, 72,
- 72, 72, 72, 72, 154, 155, 263, 270, 258, 259,
- 169, 169, 73, 74, 170, 170, 170, 170, 170, 170,
- 170, 258, 259, 795, 156, 73, 74, 274, 275, 263,
- 333, 157, 305, 306, 307, 158, 340, 341, 342, 334,
- 159, 355, 356, 357, 576, 577, 156, 366, 367, 368,
- 374, 375, 376, 157, 378, 379, 380, 158, 389, 390,
- 391, 768, 159, 162, 162, 162, 162, 162, 162, 162,
- 256, 256, 655, 656, 257, 257, 257, 257, 257, 257,
-
- 257, 260, 260, 655, 656, 261, 261, 261, 261, 261,
- 261, 261, 170, 170, 170, 170, 170, 170, 170, 170,
- 170, 170, 170, 170, 170, 170, 257, 257, 257, 257,
- 257, 257, 257, 769, 794, 262, 257, 257, 257, 257,
- 257, 257, 257, 423, 424, 425, 793, 792, 262, 350,
- 350, 791, 165, 351, 351, 351, 351, 351, 351, 351,
- 454, 455, 456, 786, 785, 165, 261, 261, 261, 261,
- 261, 261, 261, 261, 261, 261, 261, 261, 261, 261,
- 351, 351, 351, 351, 351, 351, 351, 784, 783, 168,
- 351, 351, 351, 351, 351, 351, 351, 444, 445, 446,
-
- 581, 782, 168, 457, 458, 459, 259, 781, 447, 448,
- 460, 461, 462, 499, 500, 501, 522, 523, 524, 259,
- 490, 546, 548, 780, 502, 503, 779, 525, 526, 547,
- 549, 561, 562, 563, 533, 534, 534, 534, 534, 534,
- 534, 622, 564, 565, 576, 577, 576, 577, 776, 775,
- 774, 768, 623, 655, 656, 596, 597, 598, 576, 577,
- 580, 580, 580, 580, 580, 580, 580, 599, 614, 615,
- 616, 798, 619, 620, 620, 620, 620, 620, 620, 579,
- 617, 576, 577, 753, 773, 638, 772, 771, 658, 770,
- 754, 576, 577, 639, 640, 578, 578, 578, 578, 578,
-
- 578, 641, 642, 769, 579, 580, 580, 580, 580, 580,
- 580, 580, 753, 658, 655, 656, 777, 787, 796, 754,
- 789, 655, 656, 799, 778, 788, 797, 790, 659, 659,
- 659, 659, 659, 659, 659, 657, 657, 657, 657, 657,
- 657, 655, 656, 787, 798, 789, 796, 767, 766, 765,
- 764, 788, 790, 763, 797, 659, 659, 659, 659, 659,
- 659, 659, 803, 808, 810, 808, 810, 762, 761, 760,
- 804, 809, 811, 809, 811, 759, 758, 757, 756, 755,
- 752, 751, 750, 749, 748, 747, 746, 745, 744, 743,
- 742, 741, 740, 739, 738, 737, 799, 56, 56, 56,
-
- 56, 56, 56, 56, 56, 84, 84, 84, 84, 84,
- 163, 163, 163, 163, 163, 68, 68, 166, 166, 171,
- 171, 171, 255, 255, 736, 255, 255, 255, 255, 255,
- 578, 578, 578, 735, 734, 733, 578, 621, 621, 621,
- 657, 657, 657, 732, 731, 730, 657, 688, 688, 688,
- 729, 728, 727, 726, 725, 724, 723, 722, 721, 720,
- 719, 718, 717, 716, 715, 714, 713, 712, 711, 710,
- 709, 708, 707, 706, 705, 704, 703, 702, 701, 700,
- 699, 698, 697, 696, 695, 694, 693, 692, 691, 690,
- 689, 687, 686, 685, 684, 683, 682, 681, 680, 679,
-
- 678, 677, 676, 675, 674, 673, 672, 671, 670, 669,
- 668, 667, 666, 665, 664, 663, 662, 661, 660, 654,
- 653, 652, 651, 650, 649, 648, 647, 646, 645, 644,
- 643, 637, 636, 635, 634, 633, 632, 631, 630, 629,
- 628, 627, 626, 625, 624, 618, 613, 612, 611, 610,
- 609, 608, 607, 606, 605, 604, 603, 602, 601, 600,
- 595, 594, 593, 592, 591, 590, 589, 588, 587, 586,
- 585, 584, 583, 582, 581, 575, 574, 573, 572, 571,
- 570, 569, 568, 567, 566, 560, 559, 558, 557, 556,
- 555, 554, 553, 552, 551, 550, 545, 544, 543, 542,
-
- 541, 540, 539, 538, 537, 536, 535, 532, 531, 530,
- 529, 528, 527, 521, 520, 519, 518, 517, 516, 515,
- 514, 513, 512, 511, 510, 509, 508, 507, 506, 505,
- 504, 498, 497, 496, 495, 494, 493, 492, 491, 490,
- 489, 488, 487, 486, 485, 484, 483, 482, 481, 480,
- 479, 478, 477, 476, 475, 474, 473, 472, 471, 470,
- 469, 468, 467, 466, 465, 464, 463, 453, 452, 451,
- 450, 449, 443, 442, 441, 440, 439, 438, 437, 436,
- 435, 434, 433, 432, 431, 430, 429, 428, 427, 426,
- 422, 421, 420, 419, 418, 417, 416, 415, 414, 413,
-
- 412, 411, 410, 409, 408, 407, 406, 405, 404, 403,
- 402, 401, 400, 399, 398, 397, 396, 395, 394, 393,
- 392, 388, 387, 386, 385, 384, 383, 382, 381, 377,
- 373, 372, 371, 370, 369, 365, 364, 363, 362, 361,
- 360, 359, 358, 354, 353, 352, 349, 348, 347, 346,
- 345, 344, 343, 339, 338, 337, 336, 335, 332, 331,
- 330, 329, 328, 327, 326, 325, 324, 323, 322, 321,
- 320, 319, 318, 317, 316, 315, 314, 313, 312, 311,
- 310, 309, 308, 304, 303, 302, 301, 300, 299, 298,
- 297, 296, 295, 294, 293, 292, 291, 290, 289, 288,
-
- 287, 286, 285, 284, 283, 282, 281, 280, 279, 278,
- 277, 276, 273, 272, 271, 268, 267, 266, 265, 264,
- 254, 253, 252, 251, 250, 247, 246, 245, 238, 237,
- 236, 235, 234, 233, 230, 229, 228, 227, 226, 225,
- 224, 223, 220, 217, 216, 215, 212, 211, 210, 204,
- 203, 202, 201, 200, 199, 198, 197, 192, 191, 190,
- 189, 188, 187, 186, 185, 182, 181, 180, 179, 178,
- 177, 176, 175, 174, 173, 172, 161, 149, 125, 109,
- 81, 69, 63, 60, 59, 812, 57, 57, 7, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
-
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812
+ 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+ 49, 61, 64, 804, 66, 68, 68, 68, 68, 68,
+ 68, 68, 79, 80, 85, 65, 67, 87, 62, 70,
+ 119, 71, 71, 71, 71, 71, 71, 72, 82, 83,
+ 86, 121, 88, 89, 120, 122, 73, 74, 835, 101,
+ 90, 102, 91, 93, 75, 76, 92, 94, 123, 126,
+ 103, 758, 73, 74, 95, 241, 97, 96, 183, 184,
+
+ 98, 110, 124, 835, 242, 127, 99, 75, 128, 111,
+ 76, 70, 100, 77, 77, 77, 77, 77, 77, 77,
+ 129, 112, 152, 104, 58, 805, 153, 150, 73, 74,
+ 130, 105, 154, 155, 106, 195, 78, 107, 138, 113,
+ 774, 139, 114, 108, 73, 74, 115, 116, 131, 196,
+ 140, 117, 810, 142, 118, 132, 133, 141, 143, 78,
+ 134, 160, 144, 160, 146, 145, 135, 136, 147, 137,
+ 151, 58, 193, 58, 164, 165, 231, 156, 148, 213,
+ 239, 240, 218, 194, 157, 167, 168, 214, 158, 219,
+ 164, 165, 232, 159, 162, 162, 162, 162, 162, 162,
+
+ 162, 167, 168, 70, 243, 72, 72, 72, 72, 72,
+ 72, 72, 244, 248, 811, 221, 249, 812, 169, 169,
+ 73, 74, 170, 170, 170, 170, 170, 170, 170, 222,
+ 813, 205, 154, 155, 206, 207, 73, 74, 208, 152,
+ 209, 58, 816, 153, 154, 155, 160, 817, 160, 162,
+ 162, 162, 162, 162, 162, 162, 256, 256, 258, 259,
+ 257, 257, 257, 257, 257, 257, 257, 170, 170, 170,
+ 170, 170, 170, 170, 258, 259, 263, 156, 269, 274,
+ 275, 305, 306, 307, 157, 333, 818, 546, 158, 156,
+ 785, 548, 270, 159, 334, 819, 157, 547, 786, 263,
+
+ 158, 549, 260, 260, 822, 159, 261, 261, 261, 261,
+ 261, 261, 261, 170, 170, 170, 170, 170, 170, 170,
+ 340, 341, 342, 355, 356, 357, 366, 367, 368, 262,
+ 257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
+ 257, 257, 257, 257, 796, 262, 374, 375, 376, 825,
+ 350, 350, 797, 165, 351, 351, 351, 351, 351, 351,
+ 351, 261, 261, 261, 261, 261, 261, 261, 826, 165,
+ 261, 261, 261, 261, 261, 261, 261, 378, 379, 380,
+ 389, 390, 391, 423, 424, 425, 168, 351, 351, 351,
+ 351, 351, 351, 351, 351, 351, 351, 351, 351, 351,
+
+ 351, 806, 168, 444, 445, 446, 454, 455, 456, 807,
+ 259, 457, 458, 459, 447, 448, 460, 461, 462, 499,
+ 500, 501, 522, 523, 524, 490, 259, 831, 639, 832,
+ 502, 503, 68, 525, 526, 561, 562, 563, 640, 533,
+ 534, 534, 534, 534, 534, 534, 564, 565, 576, 577,
+ 641, 576, 577, 796, 576, 577, 656, 657, 775, 642,
+ 643, 797, 578, 578, 578, 578, 578, 578, 580, 580,
+ 580, 580, 580, 580, 580, 596, 597, 598, 614, 615,
+ 616, 576, 577, 656, 657, 581, 579, 599, 576, 577,
+ 617, 775, 808, 166, 802, 619, 620, 620, 620, 620,
+
+ 620, 620, 578, 578, 578, 578, 578, 578, 576, 577,
+ 806, 579, 759, 776, 759, 808, 656, 657, 807, 760,
+ 622, 760, 580, 580, 580, 580, 580, 580, 580, 623,
+ 658, 658, 658, 658, 658, 658, 798, 798, 801, 800,
+ 624, 656, 657, 799, 799, 814, 776, 809, 656, 657,
+ 829, 795, 829, 815, 659, 660, 660, 660, 660, 660,
+ 660, 660, 658, 658, 658, 658, 658, 658, 656, 657,
+ 809, 827, 820, 823, 794, 793, 792, 791, 828, 659,
+ 821, 824, 660, 660, 660, 660, 660, 660, 660, 820,
+ 823, 830, 827, 830, 833, 833, 790, 821, 824, 828,
+
+ 789, 788, 834, 834, 56, 56, 56, 56, 56, 84,
+ 84, 84, 163, 163, 163, 171, 171, 255, 787, 255,
+ 255, 255, 621, 621, 690, 690, 784, 783, 782, 781,
+ 780, 779, 778, 777, 773, 772, 771, 770, 769, 768,
+ 767, 766, 765, 764, 763, 762, 761, 758, 757, 756,
+ 755, 754, 753, 752, 751, 750, 749, 748, 747, 746,
+ 745, 744, 743, 742, 741, 740, 739, 738, 737, 736,
+ 735, 734, 733, 732, 731, 730, 729, 728, 727, 726,
+ 725, 724, 723, 722, 721, 720, 719, 718, 717, 716,
+ 715, 714, 713, 712, 711, 710, 709, 708, 707, 706,
+
+ 705, 704, 703, 702, 701, 700, 699, 698, 697, 696,
+ 695, 694, 693, 692, 691, 689, 688, 687, 686, 685,
+ 684, 683, 682, 681, 680, 679, 678, 677, 676, 675,
+ 674, 673, 672, 671, 670, 669, 668, 667, 666, 665,
+ 664, 663, 662, 661, 655, 654, 653, 652, 651, 650,
+ 649, 648, 647, 646, 645, 644, 638, 637, 636, 635,
+ 634, 633, 632, 631, 630, 629, 628, 627, 626, 625,
+ 618, 613, 612, 611, 610, 609, 608, 607, 606, 605,
+ 604, 603, 602, 601, 600, 595, 594, 593, 592, 591,
+ 590, 589, 588, 587, 586, 585, 584, 583, 582, 581,
+
+ 575, 574, 573, 572, 571, 570, 569, 568, 567, 566,
+ 560, 559, 558, 557, 556, 555, 554, 553, 552, 551,
+ 550, 545, 544, 543, 542, 541, 540, 539, 538, 537,
+ 536, 535, 532, 531, 530, 529, 528, 527, 521, 520,
+ 519, 518, 517, 516, 515, 514, 513, 512, 511, 510,
+ 509, 508, 507, 506, 505, 504, 498, 497, 496, 495,
+ 494, 493, 492, 491, 490, 489, 488, 487, 486, 485,
+ 484, 483, 482, 481, 480, 479, 478, 477, 476, 475,
+ 474, 473, 472, 471, 470, 469, 468, 467, 466, 465,
+ 464, 463, 453, 452, 451, 450, 449, 443, 442, 441,
+
+ 440, 439, 438, 437, 436, 435, 434, 433, 432, 431,
+ 430, 429, 428, 427, 426, 422, 421, 420, 419, 418,
+ 417, 416, 415, 414, 413, 412, 411, 410, 409, 408,
+ 407, 406, 405, 404, 403, 402, 401, 400, 399, 398,
+ 397, 396, 395, 394, 393, 392, 388, 387, 386, 385,
+ 384, 383, 382, 381, 377, 373, 372, 371, 370, 369,
+ 365, 364, 363, 362, 361, 360, 359, 358, 354, 353,
+ 352, 349, 348, 347, 346, 345, 344, 343, 339, 338,
+ 337, 336, 335, 332, 331, 330, 329, 328, 327, 326,
+ 325, 324, 323, 322, 321, 320, 319, 318, 317, 316,
+
+ 315, 314, 313, 312, 311, 310, 309, 308, 304, 303,
+ 302, 301, 300, 299, 298, 297, 296, 295, 294, 293,
+ 292, 291, 290, 289, 288, 287, 286, 285, 284, 283,
+ 282, 281, 280, 279, 278, 277, 276, 273, 272, 271,
+ 268, 267, 266, 265, 264, 254, 253, 252, 251, 250,
+ 247, 246, 245, 238, 237, 236, 235, 234, 233, 230,
+ 229, 228, 227, 226, 225, 224, 223, 220, 217, 216,
+ 215, 212, 211, 210, 204, 203, 202, 201, 200, 199,
+ 198, 197, 192, 191, 190, 189, 188, 187, 186, 185,
+ 182, 181, 180, 179, 178, 177, 176, 175, 174, 173,
+
+ 172, 161, 149, 125, 109, 81, 69, 63, 60, 59,
+ 835, 57, 57, 7, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835
} ;
-static yyconst flex_int16_t yy_chk[1255] =
+static yyconst flex_int16_t yy_chk[1283] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -835,138 +853,141 @@ static yyconst flex_int16_t yy_chk[1255] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 2, 9, 803, 9, 2,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 1, 1, 1, 1, 1, 1, 1, 1, 2, 9,
+ 791, 9, 2, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 13, 15, 801, 16, 17,
- 17, 17, 17, 17, 17, 17, 21, 21, 71, 15,
- 16, 25, 13, 19, 46, 19, 19, 19, 19, 19,
- 19, 19, 23, 23, 25, 26, 27, 800, 27, 33,
- 19, 19, 27, 71, 28, 19, 19, 33, 28, 35,
- 26, 26, 36, 19, 19, 28, 36, 29, 28, 33,
- 50, 29, 50, 35, 46, 96, 96, 29, 19, 795,
-
- 37, 19, 20, 29, 20, 20, 20, 20, 20, 20,
- 20, 30, 135, 30, 37, 31, 58, 40, 58, 20,
- 20, 39, 30, 31, 20, 105, 31, 40, 135, 31,
- 106, 34, 20, 20, 34, 31, 105, 39, 34, 34,
- 39, 41, 42, 34, 106, 42, 34, 20, 41, 41,
- 160, 44, 160, 41, 42, 44, 48, 48, 43, 41,
- 41, 42, 41, 43, 47, 44, 47, 43, 47, 126,
- 43, 53, 53, 53, 53, 53, 53, 53, 68, 68,
- 70, 70, 120, 126, 142, 142, 148, 143, 124, 148,
- 120, 68, 68, 70, 70, 124, 143, 116, 48, 144,
-
- 116, 116, 153, 153, 116, 48, 116, 144, 152, 48,
- 152, 794, 152, 180, 48, 72, 793, 72, 72, 72,
- 72, 72, 72, 72, 154, 154, 171, 180, 166, 166,
- 73, 73, 72, 72, 73, 73, 73, 73, 73, 73,
- 73, 166, 166, 784, 153, 72, 72, 184, 184, 171,
- 241, 153, 215, 215, 215, 153, 247, 247, 247, 241,
- 153, 268, 268, 268, 621, 621, 154, 279, 279, 279,
- 288, 288, 288, 154, 292, 292, 292, 154, 301, 301,
- 301, 754, 154, 162, 162, 162, 162, 162, 162, 162,
- 164, 164, 655, 655, 164, 164, 164, 164, 164, 164,
-
- 164, 167, 167, 688, 688, 167, 167, 167, 167, 167,
- 167, 167, 169, 169, 169, 169, 169, 169, 169, 170,
- 170, 170, 170, 170, 170, 170, 256, 256, 256, 256,
- 256, 256, 256, 754, 783, 170, 257, 257, 257, 257,
- 257, 257, 257, 338, 338, 338, 782, 781, 170, 258,
- 258, 780, 257, 258, 258, 258, 258, 258, 258, 258,
- 393, 393, 393, 777, 776, 257, 260, 260, 260, 260,
- 260, 260, 260, 261, 261, 261, 261, 261, 261, 261,
- 350, 350, 350, 350, 350, 350, 350, 775, 774, 261,
- 351, 351, 351, 351, 351, 351, 351, 382, 382, 382,
-
- 581, 773, 261, 394, 394, 394, 351, 772, 382, 382,
- 395, 395, 395, 443, 443, 443, 483, 483, 483, 351,
- 490, 504, 505, 771, 443, 443, 770, 483, 483, 504,
- 505, 519, 519, 519, 490, 490, 490, 490, 490, 490,
- 490, 581, 519, 519, 533, 533, 534, 534, 765, 763,
- 762, 768, 581, 619, 619, 554, 554, 554, 576, 576,
- 534, 534, 534, 534, 534, 534, 534, 554, 573, 573,
- 573, 790, 576, 576, 576, 576, 576, 576, 576, 533,
- 573, 578, 578, 739, 760, 605, 757, 756, 619, 755,
- 739, 580, 580, 605, 606, 578, 578, 578, 578, 578,
-
- 578, 606, 606, 768, 533, 580, 580, 580, 580, 580,
- 580, 580, 753, 619, 620, 620, 769, 778, 786, 753,
- 779, 657, 657, 790, 769, 778, 786, 779, 620, 620,
- 620, 620, 620, 620, 620, 657, 657, 657, 657, 657,
- 657, 659, 659, 787, 798, 789, 796, 752, 751, 750,
- 749, 787, 789, 748, 796, 659, 659, 659, 659, 659,
- 659, 659, 799, 804, 807, 808, 810, 747, 746, 745,
- 799, 804, 807, 808, 810, 744, 743, 742, 741, 740,
- 738, 737, 734, 731, 730, 729, 728, 727, 725, 724,
- 722, 720, 717, 716, 714, 713, 798, 813, 813, 813,
-
- 813, 813, 813, 813, 813, 814, 814, 814, 814, 814,
- 815, 815, 815, 815, 815, 816, 816, 817, 817, 818,
- 818, 818, 819, 819, 711, 819, 819, 819, 819, 819,
- 820, 820, 820, 710, 709, 708, 820, 821, 821, 821,
- 822, 822, 822, 707, 706, 705, 822, 823, 823, 823,
- 704, 703, 702, 701, 699, 698, 697, 696, 695, 694,
- 692, 691, 690, 689, 687, 686, 685, 684, 683, 682,
- 681, 680, 679, 678, 677, 676, 675, 674, 673, 672,
- 671, 670, 668, 667, 666, 665, 664, 663, 662, 661,
- 660, 653, 651, 650, 648, 647, 646, 645, 644, 643,
-
- 642, 641, 640, 639, 638, 637, 636, 634, 633, 632,
- 631, 630, 629, 628, 626, 625, 624, 623, 622, 618,
- 617, 616, 615, 614, 613, 612, 611, 610, 609, 608,
- 607, 601, 599, 598, 597, 596, 592, 591, 590, 589,
- 588, 587, 586, 585, 584, 575, 571, 570, 568, 567,
- 565, 564, 563, 562, 561, 560, 559, 558, 557, 555,
- 553, 552, 551, 550, 549, 548, 547, 546, 545, 544,
- 542, 541, 537, 536, 535, 532, 531, 529, 528, 526,
- 525, 524, 523, 522, 520, 518, 517, 516, 515, 514,
- 513, 511, 510, 509, 508, 507, 503, 502, 501, 500,
-
- 499, 498, 495, 494, 493, 492, 491, 489, 488, 487,
- 486, 485, 484, 482, 481, 474, 473, 470, 469, 466,
- 465, 464, 463, 452, 451, 450, 448, 447, 446, 445,
- 444, 441, 439, 438, 437, 435, 434, 432, 431, 430,
- 429, 427, 426, 421, 420, 418, 417, 416, 415, 414,
- 413, 412, 411, 410, 409, 407, 406, 405, 404, 403,
- 402, 401, 400, 399, 398, 397, 396, 392, 388, 387,
- 386, 383, 381, 371, 369, 365, 364, 363, 362, 360,
- 358, 353, 352, 349, 348, 347, 346, 345, 344, 339,
- 337, 336, 335, 334, 333, 331, 330, 327, 326, 325,
-
- 324, 323, 322, 321, 320, 319, 318, 317, 316, 315,
- 314, 313, 312, 311, 310, 309, 308, 307, 306, 305,
- 302, 300, 299, 298, 297, 296, 295, 294, 293, 291,
- 287, 285, 284, 283, 282, 278, 277, 276, 275, 274,
- 273, 272, 271, 267, 265, 264, 254, 253, 252, 251,
- 250, 249, 248, 246, 245, 244, 243, 242, 240, 239,
- 238, 237, 236, 235, 234, 233, 232, 231, 230, 229,
- 228, 227, 226, 225, 224, 223, 222, 221, 220, 219,
- 218, 217, 216, 214, 213, 212, 211, 210, 209, 208,
- 207, 206, 205, 204, 203, 202, 201, 200, 199, 198,
-
- 196, 195, 194, 193, 192, 191, 190, 189, 188, 187,
- 186, 185, 183, 182, 181, 179, 178, 177, 176, 174,
- 159, 158, 157, 156, 149, 147, 146, 145, 141, 140,
- 139, 138, 137, 136, 134, 133, 132, 131, 130, 129,
- 128, 127, 125, 123, 122, 121, 119, 118, 117, 115,
- 114, 112, 111, 110, 109, 108, 107, 104, 103, 102,
- 101, 100, 99, 98, 97, 95, 94, 93, 92, 91,
- 90, 89, 88, 87, 83, 79, 52, 45, 38, 32,
- 22, 18, 14, 12, 11, 7, 6, 5, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
-
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812, 812, 812, 812, 812, 812, 812,
- 812, 812, 812, 812
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 13, 15, 792, 16, 17, 17, 17, 17, 17,
+ 17, 17, 21, 21, 25, 15, 16, 26, 13, 19,
+ 35, 19, 19, 19, 19, 19, 19, 19, 23, 23,
+ 25, 36, 26, 26, 35, 36, 19, 19, 71, 30,
+ 27, 30, 27, 28, 19, 19, 27, 28, 37, 39,
+ 30, 758, 19, 19, 28, 143, 29, 28, 96, 96,
+
+ 29, 33, 37, 71, 143, 39, 29, 19, 39, 33,
+ 19, 20, 29, 20, 20, 20, 20, 20, 20, 20,
+ 40, 33, 47, 31, 47, 794, 47, 46, 20, 20,
+ 40, 31, 48, 48, 31, 106, 20, 31, 42, 34,
+ 758, 42, 34, 31, 20, 20, 34, 34, 41, 106,
+ 42, 34, 802, 43, 34, 41, 41, 42, 43, 20,
+ 41, 50, 43, 50, 44, 43, 41, 41, 44, 41,
+ 46, 58, 105, 58, 68, 68, 135, 48, 44, 120,
+ 142, 142, 124, 105, 48, 70, 70, 120, 48, 124,
+ 68, 68, 135, 48, 53, 53, 53, 53, 53, 53,
+
+ 53, 70, 70, 72, 144, 72, 72, 72, 72, 72,
+ 72, 72, 144, 148, 803, 126, 148, 804, 73, 73,
+ 72, 72, 73, 73, 73, 73, 73, 73, 73, 126,
+ 805, 116, 153, 153, 116, 116, 72, 72, 116, 152,
+ 116, 152, 810, 152, 154, 154, 160, 811, 160, 162,
+ 162, 162, 162, 162, 162, 162, 164, 164, 166, 166,
+ 164, 164, 164, 164, 164, 164, 164, 169, 169, 169,
+ 169, 169, 169, 169, 166, 166, 171, 153, 180, 184,
+ 184, 215, 215, 215, 153, 241, 813, 504, 153, 154,
+ 776, 505, 180, 153, 241, 814, 154, 504, 776, 171,
+
+ 154, 505, 167, 167, 818, 154, 167, 167, 167, 167,
+ 167, 167, 167, 170, 170, 170, 170, 170, 170, 170,
+ 247, 247, 247, 268, 268, 268, 279, 279, 279, 170,
+ 256, 256, 256, 256, 256, 256, 256, 257, 257, 257,
+ 257, 257, 257, 257, 786, 170, 288, 288, 288, 822,
+ 258, 258, 786, 257, 258, 258, 258, 258, 258, 258,
+ 258, 260, 260, 260, 260, 260, 260, 260, 825, 257,
+ 261, 261, 261, 261, 261, 261, 261, 292, 292, 292,
+ 301, 301, 301, 338, 338, 338, 261, 350, 350, 350,
+ 350, 350, 350, 350, 351, 351, 351, 351, 351, 351,
+
+ 351, 795, 261, 382, 382, 382, 393, 393, 393, 795,
+ 351, 394, 394, 394, 382, 382, 395, 395, 395, 443,
+ 443, 443, 483, 483, 483, 490, 351, 830, 605, 831,
+ 443, 443, 839, 483, 483, 519, 519, 519, 605, 490,
+ 490, 490, 490, 490, 490, 490, 519, 519, 533, 533,
+ 606, 621, 621, 796, 534, 534, 656, 656, 760, 606,
+ 606, 796, 533, 533, 533, 533, 533, 533, 534, 534,
+ 534, 534, 534, 534, 534, 554, 554, 554, 573, 573,
+ 573, 576, 576, 690, 690, 581, 533, 554, 578, 578,
+ 573, 775, 799, 840, 790, 576, 576, 576, 576, 576,
+
+ 576, 576, 578, 578, 578, 578, 578, 578, 580, 580,
+ 806, 533, 744, 760, 759, 808, 619, 619, 806, 744,
+ 581, 759, 580, 580, 580, 580, 580, 580, 580, 581,
+ 619, 619, 619, 619, 619, 619, 787, 798, 789, 788,
+ 581, 620, 620, 787, 798, 809, 775, 799, 658, 658,
+ 828, 785, 829, 809, 619, 620, 620, 620, 620, 620,
+ 620, 620, 658, 658, 658, 658, 658, 658, 660, 660,
+ 808, 826, 815, 819, 784, 783, 782, 781, 826, 619,
+ 815, 819, 660, 660, 660, 660, 660, 660, 660, 820,
+ 823, 828, 827, 829, 832, 833, 780, 820, 823, 827,
+
+ 779, 778, 832, 833, 836, 836, 836, 836, 836, 837,
+ 837, 837, 838, 838, 838, 841, 841, 842, 777, 842,
+ 842, 842, 843, 843, 844, 844, 774, 771, 769, 768,
+ 766, 763, 762, 761, 757, 756, 755, 754, 753, 752,
+ 751, 750, 749, 748, 747, 746, 745, 743, 742, 741,
+ 738, 735, 734, 733, 732, 731, 729, 728, 726, 724,
+ 721, 720, 719, 717, 716, 714, 713, 712, 711, 710,
+ 709, 708, 707, 706, 705, 704, 702, 701, 700, 699,
+ 698, 697, 695, 694, 693, 692, 691, 689, 688, 687,
+ 686, 685, 684, 683, 682, 681, 680, 679, 678, 677,
+
+ 676, 675, 674, 673, 672, 670, 669, 668, 667, 666,
+ 665, 664, 663, 662, 661, 654, 652, 651, 649, 648,
+ 647, 646, 645, 644, 643, 642, 641, 640, 639, 638,
+ 637, 635, 634, 633, 632, 631, 630, 629, 627, 626,
+ 625, 624, 623, 622, 618, 617, 616, 615, 614, 613,
+ 612, 611, 610, 609, 608, 607, 601, 599, 598, 597,
+ 596, 592, 591, 590, 589, 588, 587, 586, 585, 584,
+ 575, 571, 570, 568, 567, 565, 564, 563, 562, 561,
+ 560, 559, 558, 557, 555, 553, 552, 551, 550, 549,
+ 548, 547, 546, 545, 544, 542, 541, 537, 536, 535,
+
+ 532, 531, 529, 528, 526, 525, 524, 523, 522, 520,
+ 518, 517, 516, 515, 514, 513, 511, 510, 509, 508,
+ 507, 503, 502, 501, 500, 499, 498, 495, 494, 493,
+ 492, 491, 489, 488, 487, 486, 485, 484, 482, 481,
+ 474, 473, 470, 469, 466, 465, 464, 463, 452, 451,
+ 450, 448, 447, 446, 445, 444, 441, 439, 438, 437,
+ 435, 434, 432, 431, 430, 429, 427, 426, 421, 420,
+ 418, 417, 416, 415, 414, 413, 412, 411, 410, 409,
+ 407, 406, 405, 404, 403, 402, 401, 400, 399, 398,
+ 397, 396, 392, 388, 387, 386, 383, 381, 371, 369,
+
+ 365, 364, 363, 362, 360, 358, 353, 352, 349, 348,
+ 347, 346, 345, 344, 339, 337, 336, 335, 334, 333,
+ 331, 330, 327, 326, 325, 324, 323, 322, 321, 320,
+ 319, 318, 317, 316, 315, 314, 313, 312, 311, 310,
+ 309, 308, 307, 306, 305, 302, 300, 299, 298, 297,
+ 296, 295, 294, 293, 291, 287, 285, 284, 283, 282,
+ 278, 277, 276, 275, 274, 273, 272, 271, 267, 265,
+ 264, 254, 253, 252, 251, 250, 249, 248, 246, 245,
+ 244, 243, 242, 240, 239, 238, 237, 236, 235, 234,
+ 233, 232, 231, 230, 229, 228, 227, 226, 225, 224,
+
+ 223, 222, 221, 220, 219, 218, 217, 216, 214, 213,
+ 212, 211, 210, 209, 208, 207, 206, 205, 204, 203,
+ 202, 201, 200, 199, 198, 196, 195, 194, 193, 192,
+ 191, 190, 189, 188, 187, 186, 185, 183, 182, 181,
+ 179, 178, 177, 176, 174, 159, 158, 157, 156, 149,
+ 147, 146, 145, 141, 140, 139, 138, 137, 136, 134,
+ 133, 132, 131, 130, 129, 128, 127, 125, 123, 122,
+ 121, 119, 118, 117, 115, 114, 112, 111, 110, 109,
+ 108, 107, 104, 103, 102, 101, 100, 99, 98, 97,
+ 95, 94, 93, 92, 91, 90, 89, 88, 87, 83,
+
+ 79, 52, 45, 38, 32, 22, 18, 14, 12, 11,
+ 7, 6, 5, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
+ 835, 835
} ;
/* The intent behind this definition is that it'll catch
@@ -1055,7 +1076,7 @@ static yyconst flex_int16_t yy_chk[1255] = */
#define ES yyextra->es_shader
-#line 1059 "glsl_lexer.cpp"
+#line 1080 "glsl_lexer.cpp"
#define INITIAL 0
#define PP 1
@@ -1182,7 +1203,12 @@ static int input (yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -1201,7 +1227,7 @@ static int input (yyscan_t yyscanner ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1292,7 +1318,7 @@ YY_DECL #line 95 "glsl_lexer.lpp"
-#line 1296 "glsl_lexer.cpp"
+#line 1322 "glsl_lexer.cpp"
yylval = yylval_param;
@@ -1350,13 +1376,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 813 )
+ if ( yy_current_state >= 836 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_current_state != 812 );
+ while ( yy_current_state != 835 );
yy_cp = yyg->yy_last_accepting_cpos;
yy_current_state = yyg->yy_last_accepting_state;
@@ -1478,435 +1504,443 @@ YY_RULE_SETUP case 11:
YY_RULE_SETUP
#line 148 "glsl_lexer.lpp"
-{ BEGIN PRAGMA; }
+{
+ BEGIN PP;
+ return PRAGMA_INVARIANT_ALL;
+ }
YY_BREAK
case 12:
-/* rule 12 can match eol */
YY_RULE_SETUP
-#line 150 "glsl_lexer.lpp"
-{ BEGIN 0; yylineno++; yycolumn = 0; }
+#line 152 "glsl_lexer.lpp"
+{ BEGIN PRAGMA; }
YY_BREAK
case 13:
+/* rule 13 can match eol */
YY_RULE_SETUP
-#line 151 "glsl_lexer.lpp"
-{ }
+#line 154 "glsl_lexer.lpp"
+{ BEGIN 0; yylineno++; yycolumn = 0; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 153 "glsl_lexer.lpp"
+#line 155 "glsl_lexer.lpp"
{ }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 154 "glsl_lexer.lpp"
+#line 157 "glsl_lexer.lpp"
{ }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 155 "glsl_lexer.lpp"
-return COLON;
+#line 158 "glsl_lexer.lpp"
+{ }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 156 "glsl_lexer.lpp"
+#line 159 "glsl_lexer.lpp"
+return COLON;
+ YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 160 "glsl_lexer.lpp"
{
yylval->identifier = strdup(yytext);
return IDENTIFIER;
}
YY_BREAK
-case 18:
+case 19:
YY_RULE_SETUP
-#line 160 "glsl_lexer.lpp"
+#line 164 "glsl_lexer.lpp"
{
yylval->n = strtol(yytext, NULL, 10);
return INTCONSTANT;
}
YY_BREAK
-case 19:
-/* rule 19 can match eol */
+case 20:
+/* rule 20 can match eol */
YY_RULE_SETUP
-#line 164 "glsl_lexer.lpp"
+#line 168 "glsl_lexer.lpp"
{ BEGIN 0; yylineno++; yycolumn = 0; return EOL; }
YY_BREAK
-case 20:
-/* rule 20 can match eol */
+case 21:
+/* rule 21 can match eol */
YY_RULE_SETUP
-#line 166 "glsl_lexer.lpp"
+#line 170 "glsl_lexer.lpp"
{ yylineno++; yycolumn = 0; }
YY_BREAK
-case 21:
+case 22:
YY_RULE_SETUP
-#line 168 "glsl_lexer.lpp"
+#line 172 "glsl_lexer.lpp"
return ATTRIBUTE;
YY_BREAK
-case 22:
+case 23:
YY_RULE_SETUP
-#line 169 "glsl_lexer.lpp"
+#line 173 "glsl_lexer.lpp"
return CONST_TOK;
YY_BREAK
-case 23:
+case 24:
YY_RULE_SETUP
-#line 170 "glsl_lexer.lpp"
+#line 174 "glsl_lexer.lpp"
return BOOL_TOK;
YY_BREAK
-case 24:
+case 25:
YY_RULE_SETUP
-#line 171 "glsl_lexer.lpp"
+#line 175 "glsl_lexer.lpp"
return FLOAT_TOK;
YY_BREAK
-case 25:
+case 26:
YY_RULE_SETUP
-#line 172 "glsl_lexer.lpp"
+#line 176 "glsl_lexer.lpp"
return INT_TOK;
YY_BREAK
-case 26:
+case 27:
YY_RULE_SETUP
-#line 173 "glsl_lexer.lpp"
+#line 177 "glsl_lexer.lpp"
KEYWORD(130, 130, UINT_TOK);
YY_BREAK
-case 27:
+case 28:
YY_RULE_SETUP
-#line 175 "glsl_lexer.lpp"
+#line 179 "glsl_lexer.lpp"
return BREAK;
YY_BREAK
-case 28:
+case 29:
YY_RULE_SETUP
-#line 176 "glsl_lexer.lpp"
+#line 180 "glsl_lexer.lpp"
return CONTINUE;
YY_BREAK
-case 29:
+case 30:
YY_RULE_SETUP
-#line 177 "glsl_lexer.lpp"
+#line 181 "glsl_lexer.lpp"
return DO;
YY_BREAK
-case 30:
+case 31:
YY_RULE_SETUP
-#line 178 "glsl_lexer.lpp"
+#line 182 "glsl_lexer.lpp"
return WHILE;
YY_BREAK
-case 31:
+case 32:
YY_RULE_SETUP
-#line 179 "glsl_lexer.lpp"
+#line 183 "glsl_lexer.lpp"
return ELSE;
YY_BREAK
-case 32:
+case 33:
YY_RULE_SETUP
-#line 180 "glsl_lexer.lpp"
+#line 184 "glsl_lexer.lpp"
return FOR;
YY_BREAK
-case 33:
+case 34:
YY_RULE_SETUP
-#line 181 "glsl_lexer.lpp"
+#line 185 "glsl_lexer.lpp"
return IF;
YY_BREAK
-case 34:
+case 35:
YY_RULE_SETUP
-#line 182 "glsl_lexer.lpp"
+#line 186 "glsl_lexer.lpp"
return DISCARD;
YY_BREAK
-case 35:
+case 36:
YY_RULE_SETUP
-#line 183 "glsl_lexer.lpp"
+#line 187 "glsl_lexer.lpp"
return RETURN;
YY_BREAK
-case 36:
+case 37:
YY_RULE_SETUP
-#line 185 "glsl_lexer.lpp"
+#line 189 "glsl_lexer.lpp"
return BVEC2;
YY_BREAK
-case 37:
+case 38:
YY_RULE_SETUP
-#line 186 "glsl_lexer.lpp"
+#line 190 "glsl_lexer.lpp"
return BVEC3;
YY_BREAK
-case 38:
+case 39:
YY_RULE_SETUP
-#line 187 "glsl_lexer.lpp"
+#line 191 "glsl_lexer.lpp"
return BVEC4;
YY_BREAK
-case 39:
+case 40:
YY_RULE_SETUP
-#line 188 "glsl_lexer.lpp"
+#line 192 "glsl_lexer.lpp"
return IVEC2;
YY_BREAK
-case 40:
+case 41:
YY_RULE_SETUP
-#line 189 "glsl_lexer.lpp"
+#line 193 "glsl_lexer.lpp"
return IVEC3;
YY_BREAK
-case 41:
+case 42:
YY_RULE_SETUP
-#line 190 "glsl_lexer.lpp"
+#line 194 "glsl_lexer.lpp"
return IVEC4;
YY_BREAK
-case 42:
+case 43:
YY_RULE_SETUP
-#line 191 "glsl_lexer.lpp"
+#line 195 "glsl_lexer.lpp"
KEYWORD(130, 130, UVEC2);
YY_BREAK
-case 43:
+case 44:
YY_RULE_SETUP
-#line 192 "glsl_lexer.lpp"
+#line 196 "glsl_lexer.lpp"
KEYWORD(130, 130, UVEC3);
YY_BREAK
-case 44:
+case 45:
YY_RULE_SETUP
-#line 193 "glsl_lexer.lpp"
+#line 197 "glsl_lexer.lpp"
KEYWORD(130, 130, UVEC4);
YY_BREAK
-case 45:
+case 46:
YY_RULE_SETUP
-#line 194 "glsl_lexer.lpp"
+#line 198 "glsl_lexer.lpp"
return VEC2;
YY_BREAK
-case 46:
+case 47:
YY_RULE_SETUP
-#line 195 "glsl_lexer.lpp"
+#line 199 "glsl_lexer.lpp"
return VEC3;
YY_BREAK
-case 47:
+case 48:
YY_RULE_SETUP
-#line 196 "glsl_lexer.lpp"
+#line 200 "glsl_lexer.lpp"
return VEC4;
YY_BREAK
-case 48:
+case 49:
YY_RULE_SETUP
-#line 197 "glsl_lexer.lpp"
+#line 201 "glsl_lexer.lpp"
return MAT2X2;
YY_BREAK
-case 49:
+case 50:
YY_RULE_SETUP
-#line 198 "glsl_lexer.lpp"
+#line 202 "glsl_lexer.lpp"
return MAT3X3;
YY_BREAK
-case 50:
+case 51:
YY_RULE_SETUP
-#line 199 "glsl_lexer.lpp"
+#line 203 "glsl_lexer.lpp"
return MAT4X4;
YY_BREAK
-case 51:
+case 52:
YY_RULE_SETUP
-#line 200 "glsl_lexer.lpp"
+#line 204 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT2X2);
YY_BREAK
-case 52:
+case 53:
YY_RULE_SETUP
-#line 201 "glsl_lexer.lpp"
+#line 205 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT2X3);
YY_BREAK
-case 53:
+case 54:
YY_RULE_SETUP
-#line 202 "glsl_lexer.lpp"
+#line 206 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT2X4);
YY_BREAK
-case 54:
+case 55:
YY_RULE_SETUP
-#line 203 "glsl_lexer.lpp"
+#line 207 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT3X2);
YY_BREAK
-case 55:
+case 56:
YY_RULE_SETUP
-#line 204 "glsl_lexer.lpp"
+#line 208 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT3X3);
YY_BREAK
-case 56:
+case 57:
YY_RULE_SETUP
-#line 205 "glsl_lexer.lpp"
+#line 209 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT3X4);
YY_BREAK
-case 57:
+case 58:
YY_RULE_SETUP
-#line 206 "glsl_lexer.lpp"
+#line 210 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT4X2);
YY_BREAK
-case 58:
+case 59:
YY_RULE_SETUP
-#line 207 "glsl_lexer.lpp"
+#line 211 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT4X3);
YY_BREAK
-case 59:
+case 60:
YY_RULE_SETUP
-#line 208 "glsl_lexer.lpp"
+#line 212 "glsl_lexer.lpp"
KEYWORD(120, 120, MAT4X4);
YY_BREAK
-case 60:
+case 61:
YY_RULE_SETUP
-#line 210 "glsl_lexer.lpp"
+#line 214 "glsl_lexer.lpp"
return IN_TOK;
YY_BREAK
-case 61:
+case 62:
YY_RULE_SETUP
-#line 211 "glsl_lexer.lpp"
+#line 215 "glsl_lexer.lpp"
return OUT_TOK;
YY_BREAK
-case 62:
+case 63:
YY_RULE_SETUP
-#line 212 "glsl_lexer.lpp"
+#line 216 "glsl_lexer.lpp"
return INOUT_TOK;
YY_BREAK
-case 63:
+case 64:
YY_RULE_SETUP
-#line 213 "glsl_lexer.lpp"
+#line 217 "glsl_lexer.lpp"
return UNIFORM;
YY_BREAK
-case 64:
+case 65:
YY_RULE_SETUP
-#line 214 "glsl_lexer.lpp"
+#line 218 "glsl_lexer.lpp"
return VARYING;
YY_BREAK
-case 65:
+case 66:
YY_RULE_SETUP
-#line 215 "glsl_lexer.lpp"
+#line 219 "glsl_lexer.lpp"
KEYWORD(120, 120, CENTROID);
YY_BREAK
-case 66:
+case 67:
YY_RULE_SETUP
-#line 216 "glsl_lexer.lpp"
+#line 220 "glsl_lexer.lpp"
KEYWORD(120 || ES, 120 || ES, INVARIANT);
YY_BREAK
-case 67:
+case 68:
YY_RULE_SETUP
-#line 217 "glsl_lexer.lpp"
+#line 221 "glsl_lexer.lpp"
KEYWORD(130 || ES, 130, FLAT);
YY_BREAK
-case 68:
+case 69:
YY_RULE_SETUP
-#line 218 "glsl_lexer.lpp"
+#line 222 "glsl_lexer.lpp"
KEYWORD(130, 130, SMOOTH);
YY_BREAK
-case 69:
+case 70:
YY_RULE_SETUP
-#line 219 "glsl_lexer.lpp"
+#line 223 "glsl_lexer.lpp"
KEYWORD(130, 130, NOPERSPECTIVE);
YY_BREAK
-case 70:
+case 71:
YY_RULE_SETUP
-#line 221 "glsl_lexer.lpp"
+#line 225 "glsl_lexer.lpp"
return SAMPLER1D;
YY_BREAK
-case 71:
+case 72:
YY_RULE_SETUP
-#line 222 "glsl_lexer.lpp"
+#line 226 "glsl_lexer.lpp"
return SAMPLER2D;
YY_BREAK
-case 72:
+case 73:
YY_RULE_SETUP
-#line 223 "glsl_lexer.lpp"
+#line 227 "glsl_lexer.lpp"
return SAMPLER3D;
YY_BREAK
-case 73:
+case 74:
YY_RULE_SETUP
-#line 224 "glsl_lexer.lpp"
+#line 228 "glsl_lexer.lpp"
return SAMPLERCUBE;
YY_BREAK
-case 74:
+case 75:
YY_RULE_SETUP
-#line 225 "glsl_lexer.lpp"
+#line 229 "glsl_lexer.lpp"
KEYWORD(130, 130, SAMPLER1DARRAY);
YY_BREAK
-case 75:
+case 76:
YY_RULE_SETUP
-#line 226 "glsl_lexer.lpp"
+#line 230 "glsl_lexer.lpp"
KEYWORD(130, 130, SAMPLER2DARRAY);
YY_BREAK
-case 76:
+case 77:
YY_RULE_SETUP
-#line 227 "glsl_lexer.lpp"
+#line 231 "glsl_lexer.lpp"
return SAMPLER1DSHADOW;
YY_BREAK
-case 77:
+case 78:
YY_RULE_SETUP
-#line 228 "glsl_lexer.lpp"
+#line 232 "glsl_lexer.lpp"
return SAMPLER2DSHADOW;
YY_BREAK
-case 78:
+case 79:
YY_RULE_SETUP
-#line 229 "glsl_lexer.lpp"
+#line 233 "glsl_lexer.lpp"
KEYWORD(130, 130, SAMPLERCUBESHADOW);
YY_BREAK
-case 79:
+case 80:
YY_RULE_SETUP
-#line 230 "glsl_lexer.lpp"
+#line 234 "glsl_lexer.lpp"
KEYWORD(130, 130, SAMPLER1DARRAYSHADOW);
YY_BREAK
-case 80:
+case 81:
YY_RULE_SETUP
-#line 231 "glsl_lexer.lpp"
+#line 235 "glsl_lexer.lpp"
KEYWORD(130, 130, SAMPLER2DARRAYSHADOW);
YY_BREAK
-case 81:
+case 82:
YY_RULE_SETUP
-#line 232 "glsl_lexer.lpp"
+#line 236 "glsl_lexer.lpp"
KEYWORD(130, 130, ISAMPLER1D);
YY_BREAK
-case 82:
+case 83:
YY_RULE_SETUP
-#line 233 "glsl_lexer.lpp"
+#line 237 "glsl_lexer.lpp"
KEYWORD(130, 130, ISAMPLER2D);
YY_BREAK
-case 83:
+case 84:
YY_RULE_SETUP
-#line 234 "glsl_lexer.lpp"
+#line 238 "glsl_lexer.lpp"
KEYWORD(130, 130, ISAMPLER3D);
YY_BREAK
-case 84:
+case 85:
YY_RULE_SETUP
-#line 235 "glsl_lexer.lpp"
+#line 239 "glsl_lexer.lpp"
KEYWORD(130, 130, ISAMPLERCUBE);
YY_BREAK
-case 85:
+case 86:
YY_RULE_SETUP
-#line 236 "glsl_lexer.lpp"
+#line 240 "glsl_lexer.lpp"
KEYWORD(130, 130, ISAMPLER1DARRAY);
YY_BREAK
-case 86:
+case 87:
YY_RULE_SETUP
-#line 237 "glsl_lexer.lpp"
+#line 241 "glsl_lexer.lpp"
KEYWORD(130, 130, ISAMPLER2DARRAY);
YY_BREAK
-case 87:
+case 88:
YY_RULE_SETUP
-#line 238 "glsl_lexer.lpp"
+#line 242 "glsl_lexer.lpp"
KEYWORD(130, 130, USAMPLER1D);
YY_BREAK
-case 88:
+case 89:
YY_RULE_SETUP
-#line 239 "glsl_lexer.lpp"
+#line 243 "glsl_lexer.lpp"
KEYWORD(130, 130, USAMPLER2D);
YY_BREAK
-case 89:
+case 90:
YY_RULE_SETUP
-#line 240 "glsl_lexer.lpp"
+#line 244 "glsl_lexer.lpp"
KEYWORD(130, 130, USAMPLER3D);
YY_BREAK
-case 90:
+case 91:
YY_RULE_SETUP
-#line 241 "glsl_lexer.lpp"
+#line 245 "glsl_lexer.lpp"
KEYWORD(130, 130, USAMPLERCUBE);
YY_BREAK
-case 91:
+case 92:
YY_RULE_SETUP
-#line 242 "glsl_lexer.lpp"
+#line 246 "glsl_lexer.lpp"
KEYWORD(130, 130, USAMPLER1DARRAY);
YY_BREAK
-case 92:
+case 93:
YY_RULE_SETUP
-#line 243 "glsl_lexer.lpp"
+#line 247 "glsl_lexer.lpp"
KEYWORD(130, 130, USAMPLER2DARRAY);
YY_BREAK
-case 93:
+case 94:
YY_RULE_SETUP
-#line 246 "glsl_lexer.lpp"
+#line 250 "glsl_lexer.lpp"
return STRUCT;
YY_BREAK
-case 94:
+case 95:
YY_RULE_SETUP
-#line 247 "glsl_lexer.lpp"
+#line 251 "glsl_lexer.lpp"
return VOID_TOK;
YY_BREAK
-case 95:
+case 96:
YY_RULE_SETUP
-#line 249 "glsl_lexer.lpp"
+#line 253 "glsl_lexer.lpp"
{
if ((yyextra->language_version >= 140)
|| yyextra->ARB_explicit_attrib_location_enable
@@ -1918,124 +1952,116 @@ YY_RULE_SETUP }
}
YY_BREAK
-case 96:
-YY_RULE_SETUP
-#line 260 "glsl_lexer.lpp"
-return INC_OP;
- YY_BREAK
case 97:
YY_RULE_SETUP
-#line 261 "glsl_lexer.lpp"
-return DEC_OP;
+#line 264 "glsl_lexer.lpp"
+return INC_OP;
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 262 "glsl_lexer.lpp"
-return LE_OP;
+#line 265 "glsl_lexer.lpp"
+return DEC_OP;
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 263 "glsl_lexer.lpp"
-return GE_OP;
+#line 266 "glsl_lexer.lpp"
+return LE_OP;
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 264 "glsl_lexer.lpp"
-return EQ_OP;
+#line 267 "glsl_lexer.lpp"
+return GE_OP;
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 265 "glsl_lexer.lpp"
-return NE_OP;
+#line 268 "glsl_lexer.lpp"
+return EQ_OP;
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 266 "glsl_lexer.lpp"
-return AND_OP;
+#line 269 "glsl_lexer.lpp"
+return NE_OP;
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 267 "glsl_lexer.lpp"
-return OR_OP;
+#line 270 "glsl_lexer.lpp"
+return AND_OP;
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 268 "glsl_lexer.lpp"
-return XOR_OP;
+#line 271 "glsl_lexer.lpp"
+return OR_OP;
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 269 "glsl_lexer.lpp"
-return LEFT_OP;
+#line 272 "glsl_lexer.lpp"
+return XOR_OP;
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 270 "glsl_lexer.lpp"
-return RIGHT_OP;
+#line 273 "glsl_lexer.lpp"
+return LEFT_OP;
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 272 "glsl_lexer.lpp"
-return MUL_ASSIGN;
+#line 274 "glsl_lexer.lpp"
+return RIGHT_OP;
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 273 "glsl_lexer.lpp"
-return DIV_ASSIGN;
+#line 276 "glsl_lexer.lpp"
+return MUL_ASSIGN;
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 274 "glsl_lexer.lpp"
-return ADD_ASSIGN;
+#line 277 "glsl_lexer.lpp"
+return DIV_ASSIGN;
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 275 "glsl_lexer.lpp"
-return MOD_ASSIGN;
+#line 278 "glsl_lexer.lpp"
+return ADD_ASSIGN;
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 276 "glsl_lexer.lpp"
-return LEFT_ASSIGN;
+#line 279 "glsl_lexer.lpp"
+return MOD_ASSIGN;
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 277 "glsl_lexer.lpp"
-return RIGHT_ASSIGN;
+#line 280 "glsl_lexer.lpp"
+return LEFT_ASSIGN;
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 278 "glsl_lexer.lpp"
-return AND_ASSIGN;
+#line 281 "glsl_lexer.lpp"
+return RIGHT_ASSIGN;
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 279 "glsl_lexer.lpp"
-return XOR_ASSIGN;
+#line 282 "glsl_lexer.lpp"
+return AND_ASSIGN;
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 280 "glsl_lexer.lpp"
-return OR_ASSIGN;
+#line 283 "glsl_lexer.lpp"
+return XOR_ASSIGN;
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 281 "glsl_lexer.lpp"
-return SUB_ASSIGN;
+#line 284 "glsl_lexer.lpp"
+return OR_ASSIGN;
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 283 "glsl_lexer.lpp"
-{
- yylval->n = strtol(yytext, NULL, 10);
- return IS_UINT ? UINTCONSTANT : INTCONSTANT;
- }
+#line 285 "glsl_lexer.lpp"
+return SUB_ASSIGN;
YY_BREAK
case 118:
YY_RULE_SETUP
#line 287 "glsl_lexer.lpp"
{
- yylval->n = strtol(yytext + 2, NULL, 16);
+ yylval->n = strtol(yytext, NULL, 10);
return IS_UINT ? UINTCONSTANT : INTCONSTANT;
}
YY_BREAK
@@ -2043,16 +2069,16 @@ case 119: YY_RULE_SETUP
#line 291 "glsl_lexer.lpp"
{
- yylval->n = strtol(yytext, NULL, 8);
+ yylval->n = strtol(yytext + 2, NULL, 16);
return IS_UINT ? UINTCONSTANT : INTCONSTANT;
}
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 296 "glsl_lexer.lpp"
+#line 295 "glsl_lexer.lpp"
{
- yylval->real = glsl_strtod(yytext, NULL);
- return FLOATCONSTANT;
+ yylval->n = strtol(yytext, NULL, 8);
+ return IS_UINT ? UINTCONSTANT : INTCONSTANT;
}
YY_BREAK
case 121:
@@ -2089,426 +2115,434 @@ YY_RULE_SETUP YY_BREAK
case 125:
YY_RULE_SETUP
-#line 317 "glsl_lexer.lpp"
+#line 316 "glsl_lexer.lpp"
{
- yylval->n = 1;
- return BOOLCONSTANT;
+ yylval->real = glsl_strtod(yytext, NULL);
+ return FLOATCONSTANT;
}
YY_BREAK
case 126:
YY_RULE_SETUP
#line 321 "glsl_lexer.lpp"
{
+ yylval->n = 1;
+ return BOOLCONSTANT;
+ }
+ YY_BREAK
+case 127:
+YY_RULE_SETUP
+#line 325 "glsl_lexer.lpp"
+{
yylval->n = 0;
return BOOLCONSTANT;
}
YY_BREAK
/* Reserved words in GLSL 1.10. */
-case 127:
+case 128:
YY_RULE_SETUP
-#line 328 "glsl_lexer.lpp"
+#line 332 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, ASM);
YY_BREAK
-case 128:
+case 129:
YY_RULE_SETUP
-#line 329 "glsl_lexer.lpp"
+#line 333 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, CLASS);
YY_BREAK
-case 129:
+case 130:
YY_RULE_SETUP
-#line 330 "glsl_lexer.lpp"
+#line 334 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, UNION);
YY_BREAK
-case 130:
+case 131:
YY_RULE_SETUP
-#line 331 "glsl_lexer.lpp"
+#line 335 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, ENUM);
YY_BREAK
-case 131:
+case 132:
YY_RULE_SETUP
-#line 332 "glsl_lexer.lpp"
+#line 336 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, TYPEDEF);
YY_BREAK
-case 132:
+case 133:
YY_RULE_SETUP
-#line 333 "glsl_lexer.lpp"
+#line 337 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, TEMPLATE);
YY_BREAK
-case 133:
+case 134:
YY_RULE_SETUP
-#line 334 "glsl_lexer.lpp"
+#line 338 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, THIS);
YY_BREAK
-case 134:
+case 135:
YY_RULE_SETUP
-#line 335 "glsl_lexer.lpp"
+#line 339 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, PACKED_TOK);
YY_BREAK
-case 135:
+case 136:
YY_RULE_SETUP
-#line 336 "glsl_lexer.lpp"
+#line 340 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, GOTO);
YY_BREAK
-case 136:
+case 137:
YY_RULE_SETUP
-#line 337 "glsl_lexer.lpp"
+#line 341 "glsl_lexer.lpp"
KEYWORD(110 || ES, 130, SWITCH);
YY_BREAK
-case 137:
+case 138:
YY_RULE_SETUP
-#line 338 "glsl_lexer.lpp"
+#line 342 "glsl_lexer.lpp"
KEYWORD(110 || ES, 130, DEFAULT);
YY_BREAK
-case 138:
+case 139:
YY_RULE_SETUP
-#line 339 "glsl_lexer.lpp"
+#line 343 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, INLINE_TOK);
YY_BREAK
-case 139:
+case 140:
YY_RULE_SETUP
-#line 340 "glsl_lexer.lpp"
+#line 344 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, NOINLINE);
YY_BREAK
-case 140:
+case 141:
YY_RULE_SETUP
-#line 341 "glsl_lexer.lpp"
+#line 345 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, VOLATILE);
YY_BREAK
-case 141:
+case 142:
YY_RULE_SETUP
-#line 342 "glsl_lexer.lpp"
+#line 346 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, PUBLIC_TOK);
YY_BREAK
-case 142:
+case 143:
YY_RULE_SETUP
-#line 343 "glsl_lexer.lpp"
+#line 347 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, STATIC);
YY_BREAK
-case 143:
+case 144:
YY_RULE_SETUP
-#line 344 "glsl_lexer.lpp"
+#line 348 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, EXTERN);
YY_BREAK
-case 144:
+case 145:
YY_RULE_SETUP
-#line 345 "glsl_lexer.lpp"
+#line 349 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, EXTERNAL);
YY_BREAK
-case 145:
+case 146:
YY_RULE_SETUP
-#line 346 "glsl_lexer.lpp"
+#line 350 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, INTERFACE);
YY_BREAK
-case 146:
+case 147:
YY_RULE_SETUP
-#line 347 "glsl_lexer.lpp"
+#line 351 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, LONG_TOK);
YY_BREAK
-case 147:
+case 148:
YY_RULE_SETUP
-#line 348 "glsl_lexer.lpp"
+#line 352 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, SHORT_TOK);
YY_BREAK
-case 148:
+case 149:
YY_RULE_SETUP
-#line 349 "glsl_lexer.lpp"
+#line 353 "glsl_lexer.lpp"
KEYWORD(110 || ES, 400, DOUBLE_TOK);
YY_BREAK
-case 149:
+case 150:
YY_RULE_SETUP
-#line 350 "glsl_lexer.lpp"
+#line 354 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, HALF);
YY_BREAK
-case 150:
+case 151:
YY_RULE_SETUP
-#line 351 "glsl_lexer.lpp"
+#line 355 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, FIXED_TOK);
YY_BREAK
-case 151:
+case 152:
YY_RULE_SETUP
-#line 352 "glsl_lexer.lpp"
+#line 356 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, UNSIGNED);
YY_BREAK
-case 152:
+case 153:
YY_RULE_SETUP
-#line 353 "glsl_lexer.lpp"
+#line 357 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, INPUT_TOK);
YY_BREAK
-case 153:
+case 154:
YY_RULE_SETUP
-#line 354 "glsl_lexer.lpp"
+#line 358 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, OUTPUT);
YY_BREAK
-case 154:
+case 155:
YY_RULE_SETUP
-#line 355 "glsl_lexer.lpp"
+#line 359 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, HVEC2);
YY_BREAK
-case 155:
+case 156:
YY_RULE_SETUP
-#line 356 "glsl_lexer.lpp"
+#line 360 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, HVEC3);
YY_BREAK
-case 156:
+case 157:
YY_RULE_SETUP
-#line 357 "glsl_lexer.lpp"
+#line 361 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, HVEC4);
YY_BREAK
-case 157:
+case 158:
YY_RULE_SETUP
-#line 358 "glsl_lexer.lpp"
+#line 362 "glsl_lexer.lpp"
KEYWORD(110 || ES, 400, DVEC2);
YY_BREAK
-case 158:
+case 159:
YY_RULE_SETUP
-#line 359 "glsl_lexer.lpp"
+#line 363 "glsl_lexer.lpp"
KEYWORD(110 || ES, 400, DVEC3);
YY_BREAK
-case 159:
+case 160:
YY_RULE_SETUP
-#line 360 "glsl_lexer.lpp"
+#line 364 "glsl_lexer.lpp"
KEYWORD(110 || ES, 400, DVEC4);
YY_BREAK
-case 160:
+case 161:
YY_RULE_SETUP
-#line 361 "glsl_lexer.lpp"
+#line 365 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, FVEC2);
YY_BREAK
-case 161:
+case 162:
YY_RULE_SETUP
-#line 362 "glsl_lexer.lpp"
+#line 366 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, FVEC3);
YY_BREAK
-case 162:
+case 163:
YY_RULE_SETUP
-#line 363 "glsl_lexer.lpp"
+#line 367 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, FVEC4);
YY_BREAK
-case 163:
+case 164:
YY_RULE_SETUP
-#line 364 "glsl_lexer.lpp"
+#line 368 "glsl_lexer.lpp"
return SAMPLER2DRECT;
YY_BREAK
-case 164:
+case 165:
YY_RULE_SETUP
-#line 365 "glsl_lexer.lpp"
+#line 369 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, SAMPLER3DRECT);
YY_BREAK
-case 165:
+case 166:
YY_RULE_SETUP
-#line 366 "glsl_lexer.lpp"
+#line 370 "glsl_lexer.lpp"
return SAMPLER2DRECTSHADOW;
YY_BREAK
-case 166:
+case 167:
YY_RULE_SETUP
-#line 367 "glsl_lexer.lpp"
+#line 371 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, SIZEOF);
YY_BREAK
-case 167:
+case 168:
YY_RULE_SETUP
-#line 368 "glsl_lexer.lpp"
+#line 372 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, CAST);
YY_BREAK
-case 168:
+case 169:
YY_RULE_SETUP
-#line 369 "glsl_lexer.lpp"
+#line 373 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, NAMESPACE);
YY_BREAK
-case 169:
+case 170:
YY_RULE_SETUP
-#line 370 "glsl_lexer.lpp"
+#line 374 "glsl_lexer.lpp"
KEYWORD(110 || ES, 999, USING);
YY_BREAK
/* Additional reserved words in GLSL 1.20. */
-case 170:
+case 171:
YY_RULE_SETUP
-#line 373 "glsl_lexer.lpp"
+#line 377 "glsl_lexer.lpp"
KEYWORD(120, 130 || ES, LOWP);
YY_BREAK
-case 171:
+case 172:
YY_RULE_SETUP
-#line 374 "glsl_lexer.lpp"
+#line 378 "glsl_lexer.lpp"
KEYWORD(120, 130 || ES, MEDIUMP);
YY_BREAK
-case 172:
+case 173:
YY_RULE_SETUP
-#line 375 "glsl_lexer.lpp"
+#line 379 "glsl_lexer.lpp"
KEYWORD(120, 130 || ES, HIGHP);
YY_BREAK
-case 173:
+case 174:
YY_RULE_SETUP
-#line 376 "glsl_lexer.lpp"
+#line 380 "glsl_lexer.lpp"
KEYWORD(120, 130 || ES, PRECISION);
YY_BREAK
/* Additional reserved words in GLSL 1.30. */
-case 174:
+case 175:
YY_RULE_SETUP
-#line 379 "glsl_lexer.lpp"
+#line 383 "glsl_lexer.lpp"
KEYWORD(130, 130, CASE);
YY_BREAK
-case 175:
+case 176:
YY_RULE_SETUP
-#line 380 "glsl_lexer.lpp"
+#line 384 "glsl_lexer.lpp"
KEYWORD(130, 999, COMMON);
YY_BREAK
-case 176:
+case 177:
YY_RULE_SETUP
-#line 381 "glsl_lexer.lpp"
+#line 385 "glsl_lexer.lpp"
KEYWORD(130, 999, PARTITION);
YY_BREAK
-case 177:
+case 178:
YY_RULE_SETUP
-#line 382 "glsl_lexer.lpp"
+#line 386 "glsl_lexer.lpp"
KEYWORD(130, 999, ACTIVE);
YY_BREAK
-case 178:
+case 179:
YY_RULE_SETUP
-#line 383 "glsl_lexer.lpp"
+#line 387 "glsl_lexer.lpp"
KEYWORD(130 || ES, 999, SUPERP);
YY_BREAK
-case 179:
+case 180:
YY_RULE_SETUP
-#line 384 "glsl_lexer.lpp"
+#line 388 "glsl_lexer.lpp"
KEYWORD(130, 140, SAMPLERBUFFER);
YY_BREAK
-case 180:
+case 181:
YY_RULE_SETUP
-#line 385 "glsl_lexer.lpp"
+#line 389 "glsl_lexer.lpp"
KEYWORD(130, 999, FILTER);
YY_BREAK
-case 181:
+case 182:
YY_RULE_SETUP
-#line 386 "glsl_lexer.lpp"
+#line 390 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE1D);
YY_BREAK
-case 182:
+case 183:
YY_RULE_SETUP
-#line 387 "glsl_lexer.lpp"
+#line 391 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE2D);
YY_BREAK
-case 183:
+case 184:
YY_RULE_SETUP
-#line 388 "glsl_lexer.lpp"
+#line 392 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE3D);
YY_BREAK
-case 184:
+case 185:
YY_RULE_SETUP
-#line 389 "glsl_lexer.lpp"
+#line 393 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGECUBE);
YY_BREAK
-case 185:
+case 186:
YY_RULE_SETUP
-#line 390 "glsl_lexer.lpp"
+#line 394 "glsl_lexer.lpp"
KEYWORD(130, 999, IIMAGE1D);
YY_BREAK
-case 186:
+case 187:
YY_RULE_SETUP
-#line 391 "glsl_lexer.lpp"
+#line 395 "glsl_lexer.lpp"
KEYWORD(130, 999, IIMAGE2D);
YY_BREAK
-case 187:
+case 188:
YY_RULE_SETUP
-#line 392 "glsl_lexer.lpp"
+#line 396 "glsl_lexer.lpp"
KEYWORD(130, 999, IIMAGE3D);
YY_BREAK
-case 188:
+case 189:
YY_RULE_SETUP
-#line 393 "glsl_lexer.lpp"
+#line 397 "glsl_lexer.lpp"
KEYWORD(130, 999, IIMAGECUBE);
YY_BREAK
-case 189:
+case 190:
YY_RULE_SETUP
-#line 394 "glsl_lexer.lpp"
+#line 398 "glsl_lexer.lpp"
KEYWORD(130, 999, UIMAGE1D);
YY_BREAK
-case 190:
+case 191:
YY_RULE_SETUP
-#line 395 "glsl_lexer.lpp"
+#line 399 "glsl_lexer.lpp"
KEYWORD(130, 999, UIMAGE2D);
YY_BREAK
-case 191:
+case 192:
YY_RULE_SETUP
-#line 396 "glsl_lexer.lpp"
+#line 400 "glsl_lexer.lpp"
KEYWORD(130, 999, UIMAGE3D);
YY_BREAK
-case 192:
+case 193:
YY_RULE_SETUP
-#line 397 "glsl_lexer.lpp"
+#line 401 "glsl_lexer.lpp"
KEYWORD(130, 999, UIMAGECUBE);
YY_BREAK
-case 193:
+case 194:
YY_RULE_SETUP
-#line 398 "glsl_lexer.lpp"
+#line 402 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE1DARRAY);
YY_BREAK
-case 194:
+case 195:
YY_RULE_SETUP
-#line 399 "glsl_lexer.lpp"
+#line 403 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE2DARRAY);
YY_BREAK
-case 195:
+case 196:
YY_RULE_SETUP
-#line 400 "glsl_lexer.lpp"
+#line 404 "glsl_lexer.lpp"
KEYWORD(130, 999, IIMAGE1DARRAY);
YY_BREAK
-case 196:
+case 197:
YY_RULE_SETUP
-#line 401 "glsl_lexer.lpp"
+#line 405 "glsl_lexer.lpp"
KEYWORD(130, 999, IIMAGE2DARRAY);
YY_BREAK
-case 197:
+case 198:
YY_RULE_SETUP
-#line 402 "glsl_lexer.lpp"
+#line 406 "glsl_lexer.lpp"
KEYWORD(130, 999, UIMAGE1DARRAY);
YY_BREAK
-case 198:
+case 199:
YY_RULE_SETUP
-#line 403 "glsl_lexer.lpp"
+#line 407 "glsl_lexer.lpp"
KEYWORD(130, 999, UIMAGE2DARRAY);
YY_BREAK
-case 199:
+case 200:
YY_RULE_SETUP
-#line 404 "glsl_lexer.lpp"
+#line 408 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE1DSHADOW);
YY_BREAK
-case 200:
+case 201:
YY_RULE_SETUP
-#line 405 "glsl_lexer.lpp"
+#line 409 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE2DSHADOW);
YY_BREAK
-case 201:
+case 202:
YY_RULE_SETUP
-#line 406 "glsl_lexer.lpp"
+#line 410 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE1DARRAYSHADOW);
YY_BREAK
-case 202:
+case 203:
YY_RULE_SETUP
-#line 407 "glsl_lexer.lpp"
+#line 411 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGE2DARRAYSHADOW);
YY_BREAK
-case 203:
+case 204:
YY_RULE_SETUP
-#line 408 "glsl_lexer.lpp"
+#line 412 "glsl_lexer.lpp"
KEYWORD(130, 999, IMAGEBUFFER);
YY_BREAK
-case 204:
+case 205:
YY_RULE_SETUP
-#line 409 "glsl_lexer.lpp"
+#line 413 "glsl_lexer.lpp"
KEYWORD(130, 999, IIMAGEBUFFER);
YY_BREAK
-case 205:
+case 206:
YY_RULE_SETUP
-#line 410 "glsl_lexer.lpp"
+#line 414 "glsl_lexer.lpp"
KEYWORD(130, 999, UIMAGEBUFFER);
YY_BREAK
-case 206:
+case 207:
YY_RULE_SETUP
-#line 411 "glsl_lexer.lpp"
+#line 415 "glsl_lexer.lpp"
KEYWORD(130, 999, ROW_MAJOR);
YY_BREAK
-case 207:
+case 208:
YY_RULE_SETUP
-#line 413 "glsl_lexer.lpp"
+#line 417 "glsl_lexer.lpp"
{
struct _mesa_glsl_parse_state *state = yyextra;
void *ctx = state;
@@ -2516,17 +2550,17 @@ YY_RULE_SETUP return IDENTIFIER;
}
YY_BREAK
-case 208:
+case 209:
YY_RULE_SETUP
-#line 420 "glsl_lexer.lpp"
+#line 424 "glsl_lexer.lpp"
{ return yytext[0]; }
YY_BREAK
-case 209:
+case 210:
YY_RULE_SETUP
-#line 422 "glsl_lexer.lpp"
+#line 426 "glsl_lexer.lpp"
ECHO;
YY_BREAK
-#line 2530 "glsl_lexer.cpp"
+#line 2564 "glsl_lexer.cpp"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(PP):
case YY_STATE_EOF(PRAGMA):
@@ -2824,7 +2858,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 813 )
+ if ( yy_current_state >= 836 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2853,11 +2887,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 813 )
+ if ( yy_current_state >= 836 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 812);
+ yy_is_jam = (yy_current_state == 835);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -3262,8 +3296,8 @@ YY_BUFFER_STATE _mesa_glsl__scan_string (yyconst char * yystr , yyscan_t yyscann /** Setup the input buffer state to scan the given bytes. The next call to _mesa_glsl_lex() will
* scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
@@ -3669,7 +3703,7 @@ void _mesa_glsl_free (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables"
-#line 422 "glsl_lexer.lpp"
+#line 426 "glsl_lexer.lpp"
diff --git a/mesalib/src/glsl/glsl_lexer.lpp b/mesalib/src/glsl/glsl_lexer.lpp index 1c6de692a..35405dad6 100644 --- a/mesalib/src/glsl/glsl_lexer.lpp +++ b/mesalib/src/glsl/glsl_lexer.lpp @@ -145,6 +145,10 @@ HASH ^{SPC}#{SPC} BEGIN PP;
return PRAGMA_OPTIMIZE_OFF;
}
+^{SPC}#{SPC}pragma{SPCP}STDGL{SPCP}invariant{SPC}\({SPC}all{SPC}\) {
+ BEGIN PP;
+ return PRAGMA_INVARIANT_ALL;
+ }
^{SPC}#{SPC}pragma{SPCP} { BEGIN PRAGMA; }
<PRAGMA>\n { BEGIN 0; yylineno++; yycolumn = 0; }
diff --git a/mesalib/src/glsl/glsl_parser.cpp b/mesalib/src/glsl/glsl_parser.cpp index df858db2b..443657968 100644 --- a/mesalib/src/glsl/glsl_parser.cpp +++ b/mesalib/src/glsl/glsl_parser.cpp @@ -1,9 +1,10 @@ -/* A Bison parser, made by GNU Bison 2.4.3. */
+
+/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -45,7 +46,7 @@ #define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.4.1"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -113,7 +114,7 @@ /* Line 189 of yacc.c */
-#line 117 "glsl_parser.cpp"
+#line 118 "glsl_parser.cpp"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -257,79 +258,80 @@ PRAGMA_DEBUG_OFF = 372,
PRAGMA_OPTIMIZE_ON = 373,
PRAGMA_OPTIMIZE_OFF = 374,
- LAYOUT_TOK = 375,
- ASM = 376,
- CLASS = 377,
- UNION = 378,
- ENUM = 379,
- TYPEDEF = 380,
- TEMPLATE = 381,
- THIS = 382,
- PACKED_TOK = 383,
- GOTO = 384,
- INLINE_TOK = 385,
- NOINLINE = 386,
- VOLATILE = 387,
- PUBLIC_TOK = 388,
- STATIC = 389,
- EXTERN = 390,
- EXTERNAL = 391,
- LONG_TOK = 392,
- SHORT_TOK = 393,
- DOUBLE_TOK = 394,
- HALF = 395,
- FIXED_TOK = 396,
- UNSIGNED = 397,
- INPUT_TOK = 398,
- OUPTUT = 399,
- HVEC2 = 400,
- HVEC3 = 401,
- HVEC4 = 402,
- DVEC2 = 403,
- DVEC3 = 404,
- DVEC4 = 405,
- FVEC2 = 406,
- FVEC3 = 407,
- FVEC4 = 408,
- SAMPLER2DRECT = 409,
- SAMPLER3DRECT = 410,
- SAMPLER2DRECTSHADOW = 411,
- SIZEOF = 412,
- CAST = 413,
- NAMESPACE = 414,
- USING = 415,
- ERROR_TOK = 416,
- COMMON = 417,
- PARTITION = 418,
- ACTIVE = 419,
- SAMPLERBUFFER = 420,
- FILTER = 421,
- IMAGE1D = 422,
- IMAGE2D = 423,
- IMAGE3D = 424,
- IMAGECUBE = 425,
- IMAGE1DARRAY = 426,
- IMAGE2DARRAY = 427,
- IIMAGE1D = 428,
- IIMAGE2D = 429,
- IIMAGE3D = 430,
- IIMAGECUBE = 431,
- IIMAGE1DARRAY = 432,
- IIMAGE2DARRAY = 433,
- UIMAGE1D = 434,
- UIMAGE2D = 435,
- UIMAGE3D = 436,
- UIMAGECUBE = 437,
- UIMAGE1DARRAY = 438,
- UIMAGE2DARRAY = 439,
- IMAGE1DSHADOW = 440,
- IMAGE2DSHADOW = 441,
- IMAGEBUFFER = 442,
- IIMAGEBUFFER = 443,
- UIMAGEBUFFER = 444,
- IMAGE1DARRAYSHADOW = 445,
- IMAGE2DARRAYSHADOW = 446,
- ROW_MAJOR = 447
+ PRAGMA_INVARIANT_ALL = 375,
+ LAYOUT_TOK = 376,
+ ASM = 377,
+ CLASS = 378,
+ UNION = 379,
+ ENUM = 380,
+ TYPEDEF = 381,
+ TEMPLATE = 382,
+ THIS = 383,
+ PACKED_TOK = 384,
+ GOTO = 385,
+ INLINE_TOK = 386,
+ NOINLINE = 387,
+ VOLATILE = 388,
+ PUBLIC_TOK = 389,
+ STATIC = 390,
+ EXTERN = 391,
+ EXTERNAL = 392,
+ LONG_TOK = 393,
+ SHORT_TOK = 394,
+ DOUBLE_TOK = 395,
+ HALF = 396,
+ FIXED_TOK = 397,
+ UNSIGNED = 398,
+ INPUT_TOK = 399,
+ OUPTUT = 400,
+ HVEC2 = 401,
+ HVEC3 = 402,
+ HVEC4 = 403,
+ DVEC2 = 404,
+ DVEC3 = 405,
+ DVEC4 = 406,
+ FVEC2 = 407,
+ FVEC3 = 408,
+ FVEC4 = 409,
+ SAMPLER2DRECT = 410,
+ SAMPLER3DRECT = 411,
+ SAMPLER2DRECTSHADOW = 412,
+ SIZEOF = 413,
+ CAST = 414,
+ NAMESPACE = 415,
+ USING = 416,
+ ERROR_TOK = 417,
+ COMMON = 418,
+ PARTITION = 419,
+ ACTIVE = 420,
+ SAMPLERBUFFER = 421,
+ FILTER = 422,
+ IMAGE1D = 423,
+ IMAGE2D = 424,
+ IMAGE3D = 425,
+ IMAGECUBE = 426,
+ IMAGE1DARRAY = 427,
+ IMAGE2DARRAY = 428,
+ IIMAGE1D = 429,
+ IIMAGE2D = 430,
+ IIMAGE3D = 431,
+ IIMAGECUBE = 432,
+ IIMAGE1DARRAY = 433,
+ IIMAGE2DARRAY = 434,
+ UIMAGE1D = 435,
+ UIMAGE2D = 436,
+ UIMAGE3D = 437,
+ UIMAGECUBE = 438,
+ UIMAGE1DARRAY = 439,
+ UIMAGE2DARRAY = 440,
+ IMAGE1DSHADOW = 441,
+ IMAGE2DSHADOW = 442,
+ IMAGEBUFFER = 443,
+ IIMAGEBUFFER = 444,
+ UIMAGEBUFFER = 445,
+ IMAGE1DARRAYSHADOW = 446,
+ IMAGE2DARRAYSHADOW = 447,
+ ROW_MAJOR = 448
};
#endif
@@ -373,7 +375,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */
-#line 377 "glsl_parser.cpp"
+#line 379 "glsl_parser.cpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -398,7 +400,7 @@ typedef struct YYLTYPE /* Line 264 of yacc.c */
-#line 402 "glsl_parser.cpp"
+#line 404 "glsl_parser.cpp"
#ifdef short
# undef short
@@ -448,7 +450,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -615,20 +617,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 3718
+#define YYLAST 3738
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 217
+#define YYNTOKENS 218
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 87
/* YYNRULES -- Number of rules. */
-#define YYNRULES 278
+#define YYNRULES 279
/* YYNRULES -- Number of states. */
-#define YYNSTATES 413
+#define YYNSTATES 415
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 447
+#define YYMAXUTOK 448
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -639,16 +641,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 201, 2, 2, 2, 205, 208, 2,
- 193, 194, 203, 199, 198, 200, 197, 204, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 212, 214,
- 206, 213, 207, 211, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 202, 2, 2, 2, 206, 209, 2,
+ 194, 195, 204, 200, 199, 201, 198, 205, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 213, 215,
+ 207, 214, 208, 212, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 195, 2, 196, 209, 2, 2, 2, 2, 2,
+ 2, 196, 2, 197, 210, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 215, 210, 216, 202, 2, 2, 2,
+ 2, 2, 2, 216, 211, 217, 203, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -680,7 +682,7 @@ static const yytype_uint8 yytranslate[] = 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192
+ 185, 186, 187, 188, 189, 190, 191, 192, 193
};
#if YYDEBUG
@@ -689,151 +691,151 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint16 yyprhs[] =
{
0, 0, 3, 4, 9, 10, 14, 17, 20, 23,
- 26, 27, 30, 36, 38, 41, 43, 45, 47, 49,
- 51, 53, 57, 59, 64, 66, 70, 73, 76, 78,
- 80, 82, 86, 89, 92, 95, 97, 100, 104, 107,
- 109, 111, 113, 115, 118, 121, 124, 126, 128, 130,
- 132, 134, 138, 142, 146, 148, 152, 156, 158, 162,
- 166, 168, 172, 176, 180, 184, 186, 190, 194, 196,
- 200, 202, 206, 208, 212, 214, 218, 220, 224, 226,
- 230, 232, 238, 240, 244, 246, 248, 250, 252, 254,
- 256, 258, 260, 262, 264, 266, 268, 272, 274, 277,
- 280, 285, 288, 290, 292, 295, 299, 303, 306, 312,
- 316, 319, 323, 326, 327, 329, 331, 333, 335, 337,
- 341, 347, 354, 362, 371, 377, 379, 382, 387, 393,
- 400, 408, 413, 416, 418, 421, 426, 428, 432, 434,
- 438, 440, 442, 444, 446, 448, 450, 453, 455, 458,
- 461, 465, 467, 469, 471, 473, 476, 478, 480, 483,
- 486, 488, 490, 493, 495, 499, 504, 506, 508, 510,
- 512, 514, 516, 518, 520, 522, 524, 526, 528, 530,
- 532, 534, 536, 538, 540, 542, 544, 546, 548, 550,
- 552, 554, 556, 558, 560, 562, 564, 566, 568, 570,
- 572, 574, 576, 578, 580, 582, 584, 586, 588, 590,
- 592, 594, 596, 598, 600, 602, 604, 606, 608, 610,
- 612, 614, 616, 618, 624, 629, 631, 634, 638, 640,
- 644, 646, 651, 653, 655, 657, 659, 661, 663, 665,
- 667, 669, 671, 673, 676, 680, 682, 684, 687, 691,
- 693, 696, 698, 701, 707, 711, 713, 715, 720, 726,
- 730, 733, 739, 747, 754, 756, 758, 760, 761, 764,
- 768, 771, 774, 777, 781, 784, 786, 788, 790
+ 26, 29, 30, 33, 39, 41, 44, 46, 48, 50,
+ 52, 54, 56, 60, 62, 67, 69, 73, 76, 79,
+ 81, 83, 85, 89, 92, 95, 98, 100, 103, 107,
+ 110, 112, 114, 116, 118, 121, 124, 127, 129, 131,
+ 133, 135, 137, 141, 145, 149, 151, 155, 159, 161,
+ 165, 169, 171, 175, 179, 183, 187, 189, 193, 197,
+ 199, 203, 205, 209, 211, 215, 217, 221, 223, 227,
+ 229, 233, 235, 241, 243, 247, 249, 251, 253, 255,
+ 257, 259, 261, 263, 265, 267, 269, 271, 275, 277,
+ 280, 283, 288, 291, 293, 295, 298, 302, 306, 309,
+ 315, 319, 322, 326, 329, 330, 332, 334, 336, 338,
+ 340, 344, 350, 357, 365, 374, 380, 382, 385, 390,
+ 396, 403, 411, 416, 419, 421, 424, 429, 431, 435,
+ 437, 441, 443, 445, 447, 449, 451, 453, 456, 458,
+ 461, 464, 468, 470, 472, 474, 476, 479, 481, 483,
+ 486, 489, 491, 493, 496, 498, 502, 507, 509, 511,
+ 513, 515, 517, 519, 521, 523, 525, 527, 529, 531,
+ 533, 535, 537, 539, 541, 543, 545, 547, 549, 551,
+ 553, 555, 557, 559, 561, 563, 565, 567, 569, 571,
+ 573, 575, 577, 579, 581, 583, 585, 587, 589, 591,
+ 593, 595, 597, 599, 601, 603, 605, 607, 609, 611,
+ 613, 615, 617, 619, 621, 627, 632, 634, 637, 641,
+ 643, 647, 649, 654, 656, 658, 660, 662, 664, 666,
+ 668, 670, 672, 674, 676, 679, 683, 685, 687, 690,
+ 694, 696, 699, 701, 704, 710, 714, 716, 718, 723,
+ 729, 733, 736, 742, 750, 757, 759, 761, 763, 764,
+ 767, 771, 774, 777, 780, 784, 787, 789, 791, 793
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 218, 0, -1, -1, 220, 222, 219, 224, -1, -1,
+ 219, 0, -1, -1, 221, 223, 220, 225, -1, -1,
109, 78, 113, -1, 116, 113, -1, 117, 113, -1,
- 118, 113, -1, 119, 113, -1, -1, 222, 223, -1,
- 110, 76, 112, 76, 113, -1, 302, -1, 224, 302,
- -1, 76, -1, 225, -1, 78, -1, 79, -1, 77,
- -1, 80, -1, 193, 252, 194, -1, 226, -1, 227,
- 195, 228, 196, -1, 229, -1, 227, 197, 76, -1,
- 227, 84, -1, 227, 85, -1, 252, -1, 230, -1,
- 231, -1, 227, 197, 231, -1, 233, 194, -1, 232,
- 194, -1, 234, 74, -1, 234, -1, 234, 250, -1,
- 233, 198, 250, -1, 235, 193, -1, 273, -1, 76,
- -1, 81, -1, 227, -1, 84, 236, -1, 85, 236,
- -1, 237, 236, -1, 199, -1, 200, -1, 201, -1,
- 202, -1, 236, -1, 238, 203, 236, -1, 238, 204,
- 236, -1, 238, 205, 236, -1, 238, -1, 239, 199,
- 238, -1, 239, 200, 238, -1, 239, -1, 240, 82,
- 239, -1, 240, 83, 239, -1, 240, -1, 241, 206,
- 240, -1, 241, 207, 240, -1, 241, 86, 240, -1,
- 241, 87, 240, -1, 241, -1, 242, 88, 241, -1,
- 242, 89, 241, -1, 242, -1, 243, 208, 242, -1,
- 243, -1, 244, 209, 243, -1, 244, -1, 245, 210,
- 244, -1, 245, -1, 246, 90, 245, -1, 246, -1,
- 247, 92, 246, -1, 247, -1, 248, 91, 247, -1,
- 248, -1, 248, 211, 252, 212, 250, -1, 249, -1,
- 236, 251, 250, -1, 213, -1, 93, -1, 94, -1,
- 96, -1, 95, -1, 102, -1, 97, -1, 98, -1,
- 99, -1, 100, -1, 101, -1, 250, -1, 252, 198,
- 250, -1, 249, -1, 255, 214, -1, 263, 214, -1,
- 108, 277, 274, 214, -1, 256, 194, -1, 258, -1,
- 257, -1, 258, 260, -1, 257, 198, 260, -1, 265,
- 76, 193, -1, 273, 76, -1, 273, 76, 195, 253,
- 196, -1, 270, 261, 259, -1, 261, 259, -1, 270,
- 261, 262, -1, 261, 262, -1, -1, 33, -1, 34,
- -1, 35, -1, 273, -1, 264, -1, 263, 198, 76,
- -1, 263, 198, 76, 195, 196, -1, 263, 198, 76,
- 195, 253, 196, -1, 263, 198, 76, 195, 196, 213,
- 283, -1, 263, 198, 76, 195, 253, 196, 213, 283,
- -1, 263, 198, 76, 213, 283, -1, 265, -1, 265,
- 76, -1, 265, 76, 195, 196, -1, 265, 76, 195,
- 253, 196, -1, 265, 76, 195, 196, 213, 283, -1,
- 265, 76, 195, 253, 196, 213, 283, -1, 265, 76,
- 213, 283, -1, 103, 76, -1, 273, -1, 271, 273,
- -1, 120, 193, 267, 194, -1, 268, -1, 267, 198,
- 268, -1, 76, -1, 76, 213, 78, -1, 40, -1,
- 39, -1, 38, -1, 4, -1, 272, -1, 266, -1,
- 266, 272, -1, 269, -1, 269, 272, -1, 103, 272,
- -1, 103, 269, 272, -1, 103, -1, 4, -1, 3,
- -1, 37, -1, 32, 37, -1, 33, -1, 34, -1,
- 32, 33, -1, 32, 34, -1, 36, -1, 274, -1,
- 277, 274, -1, 275, -1, 275, 195, 196, -1, 275,
- 195, 253, 196, -1, 276, -1, 278, -1, 76, -1,
- 74, -1, 6, -1, 7, -1, 8, -1, 5, -1,
- 29, -1, 30, -1, 31, -1, 20, -1, 21, -1,
- 22, -1, 23, -1, 24, -1, 25, -1, 26, -1,
- 27, -1, 28, -1, 41, -1, 42, -1, 43, -1,
- 44, -1, 45, -1, 46, -1, 47, -1, 48, -1,
- 49, -1, 50, -1, 51, -1, 154, -1, 52, -1,
- 53, -1, 54, -1, 55, -1, 156, -1, 56, -1,
- 57, -1, 58, -1, 59, -1, 60, -1, 61, -1,
- 62, -1, 63, -1, 64, -1, 65, -1, 66, -1,
- 67, -1, 68, -1, 69, -1, 70, -1, 71, -1,
- 72, -1, 106, -1, 105, -1, 104, -1, 73, 76,
- 215, 279, 216, -1, 73, 215, 279, 216, -1, 280,
- -1, 279, 280, -1, 273, 281, 214, -1, 282, -1,
- 281, 198, 282, -1, 76, -1, 76, 195, 253, 196,
- -1, 250, -1, 254, -1, 287, -1, 286, -1, 284,
- -1, 291, -1, 292, -1, 295, -1, 296, -1, 297,
- -1, 301, -1, 215, 216, -1, 215, 290, 216, -1,
- 289, -1, 286, -1, 215, 216, -1, 215, 290, 216,
- -1, 285, -1, 290, 285, -1, 214, -1, 252, 214,
- -1, 14, 193, 252, 194, 293, -1, 285, 12, 285,
- -1, 285, -1, 252, -1, 265, 76, 213, 283, -1,
- 17, 193, 252, 194, 287, -1, 18, 252, 212, -1,
- 19, 212, -1, 75, 193, 294, 194, 288, -1, 11,
- 285, 75, 193, 252, 194, 214, -1, 13, 193, 298,
- 300, 194, 288, -1, 291, -1, 284, -1, 294, -1,
- -1, 299, 214, -1, 299, 214, 252, -1, 10, 214,
- -1, 9, 214, -1, 16, 214, -1, 16, 252, 214,
- -1, 15, 214, -1, 303, -1, 254, -1, 221, -1,
- 255, 289, -1
+ 118, 113, -1, 119, 113, -1, 120, 113, -1, -1,
+ 223, 224, -1, 110, 76, 112, 76, 113, -1, 303,
+ -1, 225, 303, -1, 76, -1, 226, -1, 78, -1,
+ 79, -1, 77, -1, 80, -1, 194, 253, 195, -1,
+ 227, -1, 228, 196, 229, 197, -1, 230, -1, 228,
+ 198, 76, -1, 228, 84, -1, 228, 85, -1, 253,
+ -1, 231, -1, 232, -1, 228, 198, 232, -1, 234,
+ 195, -1, 233, 195, -1, 235, 74, -1, 235, -1,
+ 235, 251, -1, 234, 199, 251, -1, 236, 194, -1,
+ 274, -1, 76, -1, 81, -1, 228, -1, 84, 237,
+ -1, 85, 237, -1, 238, 237, -1, 200, -1, 201,
+ -1, 202, -1, 203, -1, 237, -1, 239, 204, 237,
+ -1, 239, 205, 237, -1, 239, 206, 237, -1, 239,
+ -1, 240, 200, 239, -1, 240, 201, 239, -1, 240,
+ -1, 241, 82, 240, -1, 241, 83, 240, -1, 241,
+ -1, 242, 207, 241, -1, 242, 208, 241, -1, 242,
+ 86, 241, -1, 242, 87, 241, -1, 242, -1, 243,
+ 88, 242, -1, 243, 89, 242, -1, 243, -1, 244,
+ 209, 243, -1, 244, -1, 245, 210, 244, -1, 245,
+ -1, 246, 211, 245, -1, 246, -1, 247, 90, 246,
+ -1, 247, -1, 248, 92, 247, -1, 248, -1, 249,
+ 91, 248, -1, 249, -1, 249, 212, 253, 213, 251,
+ -1, 250, -1, 237, 252, 251, -1, 214, -1, 93,
+ -1, 94, -1, 96, -1, 95, -1, 102, -1, 97,
+ -1, 98, -1, 99, -1, 100, -1, 101, -1, 251,
+ -1, 253, 199, 251, -1, 250, -1, 256, 215, -1,
+ 264, 215, -1, 108, 278, 275, 215, -1, 257, 195,
+ -1, 259, -1, 258, -1, 259, 261, -1, 258, 199,
+ 261, -1, 266, 76, 194, -1, 274, 76, -1, 274,
+ 76, 196, 254, 197, -1, 271, 262, 260, -1, 262,
+ 260, -1, 271, 262, 263, -1, 262, 263, -1, -1,
+ 33, -1, 34, -1, 35, -1, 274, -1, 265, -1,
+ 264, 199, 76, -1, 264, 199, 76, 196, 197, -1,
+ 264, 199, 76, 196, 254, 197, -1, 264, 199, 76,
+ 196, 197, 214, 284, -1, 264, 199, 76, 196, 254,
+ 197, 214, 284, -1, 264, 199, 76, 214, 284, -1,
+ 266, -1, 266, 76, -1, 266, 76, 196, 197, -1,
+ 266, 76, 196, 254, 197, -1, 266, 76, 196, 197,
+ 214, 284, -1, 266, 76, 196, 254, 197, 214, 284,
+ -1, 266, 76, 214, 284, -1, 103, 76, -1, 274,
+ -1, 272, 274, -1, 121, 194, 268, 195, -1, 269,
+ -1, 268, 199, 269, -1, 76, -1, 76, 214, 78,
+ -1, 40, -1, 39, -1, 38, -1, 4, -1, 273,
+ -1, 267, -1, 267, 273, -1, 270, -1, 270, 273,
+ -1, 103, 273, -1, 103, 270, 273, -1, 103, -1,
+ 4, -1, 3, -1, 37, -1, 32, 37, -1, 33,
+ -1, 34, -1, 32, 33, -1, 32, 34, -1, 36,
+ -1, 275, -1, 278, 275, -1, 276, -1, 276, 196,
+ 197, -1, 276, 196, 254, 197, -1, 277, -1, 279,
+ -1, 76, -1, 74, -1, 6, -1, 7, -1, 8,
+ -1, 5, -1, 29, -1, 30, -1, 31, -1, 20,
+ -1, 21, -1, 22, -1, 23, -1, 24, -1, 25,
+ -1, 26, -1, 27, -1, 28, -1, 41, -1, 42,
+ -1, 43, -1, 44, -1, 45, -1, 46, -1, 47,
+ -1, 48, -1, 49, -1, 50, -1, 51, -1, 155,
+ -1, 52, -1, 53, -1, 54, -1, 55, -1, 157,
+ -1, 56, -1, 57, -1, 58, -1, 59, -1, 60,
+ -1, 61, -1, 62, -1, 63, -1, 64, -1, 65,
+ -1, 66, -1, 67, -1, 68, -1, 69, -1, 70,
+ -1, 71, -1, 72, -1, 106, -1, 105, -1, 104,
+ -1, 73, 76, 216, 280, 217, -1, 73, 216, 280,
+ 217, -1, 281, -1, 280, 281, -1, 274, 282, 215,
+ -1, 283, -1, 282, 199, 283, -1, 76, -1, 76,
+ 196, 254, 197, -1, 251, -1, 255, -1, 288, -1,
+ 287, -1, 285, -1, 292, -1, 293, -1, 296, -1,
+ 297, -1, 298, -1, 302, -1, 216, 217, -1, 216,
+ 291, 217, -1, 290, -1, 287, -1, 216, 217, -1,
+ 216, 291, 217, -1, 286, -1, 291, 286, -1, 215,
+ -1, 253, 215, -1, 14, 194, 253, 195, 294, -1,
+ 286, 12, 286, -1, 286, -1, 253, -1, 266, 76,
+ 214, 284, -1, 17, 194, 253, 195, 288, -1, 18,
+ 253, 213, -1, 19, 213, -1, 75, 194, 295, 195,
+ 289, -1, 11, 286, 75, 194, 253, 195, 215, -1,
+ 13, 194, 299, 301, 195, 289, -1, 292, -1, 285,
+ -1, 295, -1, -1, 300, 215, -1, 300, 215, 253,
+ -1, 10, 215, -1, 9, 215, -1, 16, 215, -1,
+ 16, 253, 215, -1, 15, 215, -1, 304, -1, 255,
+ -1, 222, -1, 256, 290, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 212, 212, 211, 218, 220, 240, 241, 242, 243,
- 246, 248, 252, 261, 269, 280, 284, 291, 298, 305,
- 312, 319, 326, 327, 333, 337, 344, 350, 359, 363,
- 367, 368, 377, 378, 382, 383, 387, 393, 405, 409,
- 415, 422, 433, 434, 440, 446, 456, 457, 458, 459,
- 463, 464, 470, 476, 485, 486, 492, 501, 502, 508,
- 517, 518, 524, 530, 536, 545, 546, 552, 561, 562,
- 571, 572, 581, 582, 591, 592, 601, 602, 611, 612,
- 621, 622, 631, 632, 641, 642, 643, 644, 645, 646,
- 647, 648, 649, 650, 651, 655, 659, 675, 679, 683,
- 687, 701, 705, 706, 710, 715, 723, 734, 744, 759,
- 766, 771, 782, 795, 798, 803, 808, 817, 821, 822,
- 831, 840, 849, 858, 867, 880, 891, 900, 909, 918,
- 927, 936, 945, 959, 966, 977, 984, 985, 1004, 1033,
- 1074, 1079, 1084, 1092, 1100, 1101, 1102, 1107, 1108, 1113,
- 1118, 1124, 1132, 1137, 1142, 1147, 1153, 1158, 1163, 1168,
- 1173, 1181, 1182, 1190, 1191, 1197, 1206, 1212, 1218, 1227,
- 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237,
- 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247,
- 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257,
- 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267,
- 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277,
- 1281, 1292, 1303, 1317, 1323, 1332, 1337, 1345, 1360, 1365,
- 1373, 1379, 1388, 1392, 1398, 1399, 1403, 1404, 1405, 1406,
- 1407, 1408, 1409, 1413, 1419, 1428, 1429, 1433, 1439, 1448,
- 1458, 1470, 1476, 1485, 1494, 1499, 1507, 1511, 1525, 1529,
- 1530, 1534, 1541, 1548, 1558, 1559, 1563, 1565, 1571, 1576,
- 1585, 1591, 1597, 1603, 1609, 1618, 1619, 1620, 1624
+ 0, 213, 213, 212, 219, 221, 241, 242, 243, 244,
+ 245, 260, 262, 266, 275, 283, 294, 298, 305, 312,
+ 319, 326, 333, 340, 341, 347, 351, 358, 364, 373,
+ 377, 381, 382, 391, 392, 396, 397, 401, 407, 419,
+ 423, 429, 436, 447, 448, 454, 460, 470, 471, 472,
+ 473, 477, 478, 484, 490, 499, 500, 506, 515, 516,
+ 522, 531, 532, 538, 544, 550, 559, 560, 566, 575,
+ 576, 585, 586, 595, 596, 605, 606, 615, 616, 625,
+ 626, 635, 636, 645, 646, 655, 656, 657, 658, 659,
+ 660, 661, 662, 663, 664, 665, 669, 673, 689, 693,
+ 697, 701, 715, 719, 720, 724, 729, 737, 748, 758,
+ 773, 780, 785, 796, 809, 812, 817, 822, 831, 835,
+ 836, 845, 854, 863, 872, 881, 894, 905, 914, 923,
+ 932, 941, 950, 959, 973, 980, 991, 998, 999, 1018,
+ 1047, 1088, 1093, 1098, 1106, 1114, 1115, 1116, 1121, 1122,
+ 1127, 1132, 1138, 1146, 1151, 1156, 1161, 1167, 1172, 1177,
+ 1182, 1187, 1195, 1196, 1204, 1205, 1211, 1220, 1226, 1232,
+ 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250,
+ 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259, 1260,
+ 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, 1270,
+ 1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280,
+ 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290,
+ 1291, 1295, 1306, 1317, 1331, 1337, 1346, 1351, 1359, 1374,
+ 1379, 1387, 1393, 1402, 1406, 1412, 1413, 1417, 1418, 1419,
+ 1420, 1421, 1422, 1423, 1427, 1433, 1442, 1443, 1447, 1453,
+ 1462, 1472, 1484, 1490, 1499, 1508, 1513, 1521, 1525, 1539,
+ 1543, 1544, 1548, 1555, 1562, 1572, 1573, 1577, 1579, 1585,
+ 1590, 1599, 1605, 1611, 1617, 1623, 1632, 1633, 1634, 1638
};
#endif
@@ -864,28 +866,28 @@ static const char *const yytname[] = "LOWP", "MEDIUMP", "HIGHP", "SUPERP", "PRECISION", "VERSION",
"EXTENSION", "LINE", "COLON", "EOL", "INTERFACE", "OUTPUT",
"PRAGMA_DEBUG_ON", "PRAGMA_DEBUG_OFF", "PRAGMA_OPTIMIZE_ON",
- "PRAGMA_OPTIMIZE_OFF", "LAYOUT_TOK", "ASM", "CLASS", "UNION", "ENUM",
- "TYPEDEF", "TEMPLATE", "THIS", "PACKED_TOK", "GOTO", "INLINE_TOK",
- "NOINLINE", "VOLATILE", "PUBLIC_TOK", "STATIC", "EXTERN", "EXTERNAL",
- "LONG_TOK", "SHORT_TOK", "DOUBLE_TOK", "HALF", "FIXED_TOK", "UNSIGNED",
- "INPUT_TOK", "OUPTUT", "HVEC2", "HVEC3", "HVEC4", "DVEC2", "DVEC3",
- "DVEC4", "FVEC2", "FVEC3", "FVEC4", "SAMPLER2DRECT", "SAMPLER3DRECT",
- "SAMPLER2DRECTSHADOW", "SIZEOF", "CAST", "NAMESPACE", "USING",
- "ERROR_TOK", "COMMON", "PARTITION", "ACTIVE", "SAMPLERBUFFER", "FILTER",
- "IMAGE1D", "IMAGE2D", "IMAGE3D", "IMAGECUBE", "IMAGE1DARRAY",
- "IMAGE2DARRAY", "IIMAGE1D", "IIMAGE2D", "IIMAGE3D", "IIMAGECUBE",
- "IIMAGE1DARRAY", "IIMAGE2DARRAY", "UIMAGE1D", "UIMAGE2D", "UIMAGE3D",
- "UIMAGECUBE", "UIMAGE1DARRAY", "UIMAGE2DARRAY", "IMAGE1DSHADOW",
- "IMAGE2DSHADOW", "IMAGEBUFFER", "IIMAGEBUFFER", "UIMAGEBUFFER",
- "IMAGE1DARRAYSHADOW", "IMAGE2DARRAYSHADOW", "ROW_MAJOR", "'('", "')'",
- "'['", "']'", "'.'", "','", "'+'", "'-'", "'!'", "'~'", "'*'", "'/'",
- "'%'", "'<'", "'>'", "'&'", "'^'", "'|'", "'?'", "':'", "'='", "';'",
- "'{'", "'}'", "$accept", "translation_unit", "$@1", "version_statement",
- "pragma_statement", "extension_statement_list", "extension_statement",
- "external_declaration_list", "variable_identifier", "primary_expression",
- "postfix_expression", "integer_expression", "function_call",
- "function_call_or_method", "function_call_generic",
- "function_call_header_no_parameters",
+ "PRAGMA_OPTIMIZE_OFF", "PRAGMA_INVARIANT_ALL", "LAYOUT_TOK", "ASM",
+ "CLASS", "UNION", "ENUM", "TYPEDEF", "TEMPLATE", "THIS", "PACKED_TOK",
+ "GOTO", "INLINE_TOK", "NOINLINE", "VOLATILE", "PUBLIC_TOK", "STATIC",
+ "EXTERN", "EXTERNAL", "LONG_TOK", "SHORT_TOK", "DOUBLE_TOK", "HALF",
+ "FIXED_TOK", "UNSIGNED", "INPUT_TOK", "OUPTUT", "HVEC2", "HVEC3",
+ "HVEC4", "DVEC2", "DVEC3", "DVEC4", "FVEC2", "FVEC3", "FVEC4",
+ "SAMPLER2DRECT", "SAMPLER3DRECT", "SAMPLER2DRECTSHADOW", "SIZEOF",
+ "CAST", "NAMESPACE", "USING", "ERROR_TOK", "COMMON", "PARTITION",
+ "ACTIVE", "SAMPLERBUFFER", "FILTER", "IMAGE1D", "IMAGE2D", "IMAGE3D",
+ "IMAGECUBE", "IMAGE1DARRAY", "IMAGE2DARRAY", "IIMAGE1D", "IIMAGE2D",
+ "IIMAGE3D", "IIMAGECUBE", "IIMAGE1DARRAY", "IIMAGE2DARRAY", "UIMAGE1D",
+ "UIMAGE2D", "UIMAGE3D", "UIMAGECUBE", "UIMAGE1DARRAY", "UIMAGE2DARRAY",
+ "IMAGE1DSHADOW", "IMAGE2DSHADOW", "IMAGEBUFFER", "IIMAGEBUFFER",
+ "UIMAGEBUFFER", "IMAGE1DARRAYSHADOW", "IMAGE2DARRAYSHADOW", "ROW_MAJOR",
+ "'('", "')'", "'['", "']'", "'.'", "','", "'+'", "'-'", "'!'", "'~'",
+ "'*'", "'/'", "'%'", "'<'", "'>'", "'&'", "'^'", "'|'", "'?'", "':'",
+ "'='", "';'", "'{'", "'}'", "$accept", "translation_unit", "$@1",
+ "version_statement", "pragma_statement", "extension_statement_list",
+ "extension_statement", "external_declaration_list",
+ "variable_identifier", "primary_expression", "postfix_expression",
+ "integer_expression", "function_call", "function_call_or_method",
+ "function_call_generic", "function_call_header_no_parameters",
"function_call_header_with_parameters", "function_call_header",
"function_identifier", "unary_expression", "unary_operator",
"multiplicative_expression", "additive_expression", "shift_expression",
@@ -940,76 +942,76 @@ static const yytype_uint16 yytoknum[] = 415, 416, 417, 418, 419, 420, 421, 422, 423, 424,
425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
435, 436, 437, 438, 439, 440, 441, 442, 443, 444,
- 445, 446, 447, 40, 41, 91, 93, 46, 44, 43,
- 45, 33, 126, 42, 47, 37, 60, 62, 38, 94,
- 124, 63, 58, 61, 59, 123, 125
+ 445, 446, 447, 448, 40, 41, 91, 93, 46, 44,
+ 43, 45, 33, 126, 42, 47, 37, 60, 62, 38,
+ 94, 124, 63, 58, 61, 59, 123, 125
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint16 yyr1[] =
{
- 0, 217, 219, 218, 220, 220, 221, 221, 221, 221,
- 222, 222, 223, 224, 224, 225, 226, 226, 226, 226,
- 226, 226, 227, 227, 227, 227, 227, 227, 228, 229,
- 230, 230, 231, 231, 232, 232, 233, 233, 234, 235,
- 235, 235, 236, 236, 236, 236, 237, 237, 237, 237,
- 238, 238, 238, 238, 239, 239, 239, 240, 240, 240,
- 241, 241, 241, 241, 241, 242, 242, 242, 243, 243,
- 244, 244, 245, 245, 246, 246, 247, 247, 248, 248,
- 249, 249, 250, 250, 251, 251, 251, 251, 251, 251,
- 251, 251, 251, 251, 251, 252, 252, 253, 254, 254,
- 254, 255, 256, 256, 257, 257, 258, 259, 259, 260,
- 260, 260, 260, 261, 261, 261, 261, 262, 263, 263,
- 263, 263, 263, 263, 263, 264, 264, 264, 264, 264,
- 264, 264, 264, 265, 265, 266, 267, 267, 268, 268,
- 269, 269, 269, 270, 271, 271, 271, 271, 271, 271,
- 271, 271, 272, 272, 272, 272, 272, 272, 272, 272,
- 272, 273, 273, 274, 274, 274, 275, 275, 275, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 277, 277, 277, 278, 278, 279, 279, 280, 281, 281,
- 282, 282, 283, 284, 285, 285, 286, 286, 286, 286,
- 286, 286, 286, 287, 287, 288, 288, 289, 289, 290,
- 290, 291, 291, 292, 293, 293, 294, 294, 295, 296,
- 296, 297, 297, 297, 298, 298, 299, 299, 300, 300,
- 301, 301, 301, 301, 301, 302, 302, 302, 303
+ 0, 218, 220, 219, 221, 221, 222, 222, 222, 222,
+ 222, 223, 223, 224, 225, 225, 226, 227, 227, 227,
+ 227, 227, 227, 228, 228, 228, 228, 228, 228, 229,
+ 230, 231, 231, 232, 232, 233, 233, 234, 234, 235,
+ 236, 236, 236, 237, 237, 237, 237, 238, 238, 238,
+ 238, 239, 239, 239, 239, 240, 240, 240, 241, 241,
+ 241, 242, 242, 242, 242, 242, 243, 243, 243, 244,
+ 244, 245, 245, 246, 246, 247, 247, 248, 248, 249,
+ 249, 250, 250, 251, 251, 252, 252, 252, 252, 252,
+ 252, 252, 252, 252, 252, 252, 253, 253, 254, 255,
+ 255, 255, 256, 257, 257, 258, 258, 259, 260, 260,
+ 261, 261, 261, 261, 262, 262, 262, 262, 263, 264,
+ 264, 264, 264, 264, 264, 264, 265, 265, 265, 265,
+ 265, 265, 265, 265, 266, 266, 267, 268, 268, 269,
+ 269, 270, 270, 270, 271, 272, 272, 272, 272, 272,
+ 272, 272, 272, 273, 273, 273, 273, 273, 273, 273,
+ 273, 273, 274, 274, 275, 275, 275, 276, 276, 276,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 278, 278, 278, 279, 279, 280, 280, 281, 282,
+ 282, 283, 283, 284, 285, 286, 286, 287, 287, 287,
+ 287, 287, 287, 287, 288, 288, 289, 289, 290, 290,
+ 291, 291, 292, 292, 293, 294, 294, 295, 295, 296,
+ 297, 297, 298, 298, 298, 299, 299, 300, 300, 301,
+ 301, 302, 302, 302, 302, 302, 303, 303, 303, 304
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
0, 2, 0, 4, 0, 3, 2, 2, 2, 2,
- 0, 2, 5, 1, 2, 1, 1, 1, 1, 1,
- 1, 3, 1, 4, 1, 3, 2, 2, 1, 1,
- 1, 3, 2, 2, 2, 1, 2, 3, 2, 1,
- 1, 1, 1, 2, 2, 2, 1, 1, 1, 1,
- 1, 3, 3, 3, 1, 3, 3, 1, 3, 3,
- 1, 3, 3, 3, 3, 1, 3, 3, 1, 3,
- 1, 3, 1, 3, 1, 3, 1, 3, 1, 3,
- 1, 5, 1, 3, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 3, 1, 2, 2,
- 4, 2, 1, 1, 2, 3, 3, 2, 5, 3,
- 2, 3, 2, 0, 1, 1, 1, 1, 1, 3,
- 5, 6, 7, 8, 5, 1, 2, 4, 5, 6,
- 7, 4, 2, 1, 2, 4, 1, 3, 1, 3,
- 1, 1, 1, 1, 1, 1, 2, 1, 2, 2,
- 3, 1, 1, 1, 1, 2, 1, 1, 2, 2,
- 1, 1, 2, 1, 3, 4, 1, 1, 1, 1,
+ 2, 0, 2, 5, 1, 2, 1, 1, 1, 1,
+ 1, 1, 3, 1, 4, 1, 3, 2, 2, 1,
+ 1, 1, 3, 2, 2, 2, 1, 2, 3, 2,
+ 1, 1, 1, 1, 2, 2, 2, 1, 1, 1,
+ 1, 1, 3, 3, 3, 1, 3, 3, 1, 3,
+ 3, 1, 3, 3, 3, 3, 1, 3, 3, 1,
+ 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
+ 3, 1, 5, 1, 3, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 3, 1, 2,
+ 2, 4, 2, 1, 1, 2, 3, 3, 2, 5,
+ 3, 2, 3, 2, 0, 1, 1, 1, 1, 1,
+ 3, 5, 6, 7, 8, 5, 1, 2, 4, 5,
+ 6, 7, 4, 2, 1, 2, 4, 1, 3, 1,
+ 3, 1, 1, 1, 1, 1, 1, 2, 1, 2,
+ 2, 3, 1, 1, 1, 1, 2, 1, 1, 2,
+ 2, 1, 1, 2, 1, 3, 4, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 5, 4, 1, 2, 3, 1, 3,
- 1, 4, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 2, 3, 1, 1, 2, 3, 1,
- 2, 1, 2, 5, 3, 1, 1, 4, 5, 3,
- 2, 5, 7, 6, 1, 1, 1, 0, 2, 3,
- 2, 2, 2, 3, 2, 1, 1, 1, 2
+ 1, 1, 1, 1, 5, 4, 1, 2, 3, 1,
+ 3, 1, 4, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 2, 3, 1, 1, 2, 3,
+ 1, 2, 1, 2, 5, 3, 1, 1, 4, 5,
+ 3, 2, 5, 7, 6, 1, 1, 1, 0, 2,
+ 3, 2, 2, 2, 3, 2, 1, 1, 1, 2
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1017,614 +1019,638 @@ static const yytype_uint8 yyr2[] = means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 4, 0, 0, 10, 0, 1, 2, 5, 0, 0,
- 11, 0, 153, 152, 173, 170, 171, 172, 177, 178,
- 179, 180, 181, 182, 183, 184, 185, 174, 175, 176,
- 0, 156, 157, 160, 154, 142, 141, 140, 186, 187,
- 188, 189, 190, 191, 192, 193, 194, 195, 196, 198,
- 199, 200, 201, 203, 204, 205, 206, 207, 208, 209,
- 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
- 0, 169, 168, 151, 222, 221, 220, 0, 0, 0,
- 0, 0, 0, 197, 202, 277, 3, 276, 0, 0,
- 103, 113, 0, 118, 125, 145, 147, 0, 144, 133,
- 161, 163, 166, 0, 167, 13, 275, 0, 158, 159,
- 155, 0, 0, 132, 0, 149, 0, 6, 7, 8,
- 9, 0, 14, 98, 0, 278, 101, 113, 143, 114,
- 115, 116, 104, 0, 113, 0, 99, 126, 146, 148,
- 134, 0, 162, 0, 0, 0, 0, 225, 150, 0,
- 138, 0, 136, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 15, 19, 17, 18, 20, 41,
- 0, 0, 0, 46, 47, 48, 49, 251, 0, 247,
- 16, 22, 42, 24, 29, 30, 0, 0, 35, 0,
- 50, 0, 54, 57, 60, 65, 68, 70, 72, 74,
- 76, 78, 80, 82, 95, 0, 233, 0, 133, 236,
- 249, 235, 234, 0, 237, 238, 239, 240, 241, 242,
- 105, 110, 112, 117, 0, 119, 106, 0, 0, 164,
- 50, 97, 0, 39, 12, 0, 230, 0, 228, 224,
- 226, 100, 0, 135, 0, 271, 270, 0, 0, 0,
- 274, 272, 0, 0, 0, 260, 0, 43, 44, 0,
- 243, 0, 26, 27, 0, 0, 33, 32, 0, 169,
- 36, 38, 85, 86, 88, 87, 90, 91, 92, 93,
- 94, 89, 84, 0, 45, 0, 0, 0, 0, 0,
+ 4, 0, 0, 11, 0, 1, 2, 5, 0, 0,
+ 12, 0, 154, 153, 174, 171, 172, 173, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 175, 176, 177,
+ 0, 157, 158, 161, 155, 143, 142, 141, 187, 188,
+ 189, 190, 191, 192, 193, 194, 195, 196, 197, 199,
+ 200, 201, 202, 204, 205, 206, 207, 208, 209, 210,
+ 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+ 0, 170, 169, 152, 223, 222, 221, 0, 0, 0,
+ 0, 0, 0, 0, 198, 203, 278, 3, 277, 0,
+ 0, 104, 114, 0, 119, 126, 146, 148, 0, 145,
+ 134, 162, 164, 167, 0, 168, 14, 276, 0, 159,
+ 160, 156, 0, 0, 133, 0, 150, 0, 6, 7,
+ 8, 9, 10, 0, 15, 99, 0, 279, 102, 114,
+ 144, 115, 116, 117, 105, 0, 114, 0, 100, 127,
+ 147, 149, 135, 0, 163, 0, 0, 0, 0, 226,
+ 151, 0, 139, 0, 137, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 16, 20, 18, 19,
+ 21, 42, 0, 0, 0, 47, 48, 49, 50, 252,
+ 0, 248, 17, 23, 43, 25, 30, 31, 0, 0,
+ 36, 0, 51, 0, 55, 58, 61, 66, 69, 71,
+ 73, 75, 77, 79, 81, 83, 96, 0, 234, 0,
+ 134, 237, 250, 236, 235, 0, 238, 239, 240, 241,
+ 242, 243, 106, 111, 113, 118, 0, 120, 107, 0,
+ 0, 165, 51, 98, 0, 40, 13, 0, 231, 0,
+ 229, 225, 227, 101, 0, 136, 0, 272, 271, 0,
+ 0, 0, 275, 273, 0, 0, 0, 261, 0, 44,
+ 45, 0, 244, 0, 27, 28, 0, 0, 34, 33,
+ 0, 170, 37, 39, 86, 87, 89, 88, 91, 92,
+ 93, 94, 95, 90, 85, 0, 46, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 252, 248, 250, 107,
- 109, 111, 0, 0, 127, 0, 232, 131, 165, 223,
- 0, 0, 227, 139, 137, 0, 265, 264, 267, 0,
- 273, 0, 259, 151, 256, 0, 0, 21, 244, 0,
- 28, 25, 31, 37, 83, 51, 52, 53, 55, 56,
- 58, 59, 63, 64, 61, 62, 66, 67, 69, 71,
- 73, 75, 77, 79, 0, 96, 0, 120, 0, 124,
- 0, 128, 0, 229, 0, 266, 0, 0, 0, 0,
- 0, 0, 23, 0, 0, 0, 121, 129, 0, 231,
- 0, 268, 0, 255, 253, 258, 0, 246, 261, 245,
- 81, 108, 122, 0, 130, 0, 269, 263, 0, 257,
- 123, 262, 254
+ 0, 0, 0, 0, 0, 0, 0, 0, 253, 249,
+ 251, 108, 110, 112, 0, 0, 128, 0, 233, 132,
+ 166, 224, 0, 0, 228, 140, 138, 0, 266, 265,
+ 268, 0, 274, 0, 260, 152, 257, 0, 0, 22,
+ 245, 0, 29, 26, 32, 38, 84, 52, 53, 54,
+ 56, 57, 59, 60, 64, 65, 62, 63, 67, 68,
+ 70, 72, 74, 76, 78, 80, 0, 97, 0, 121,
+ 0, 125, 0, 129, 0, 230, 0, 267, 0, 0,
+ 0, 0, 0, 0, 24, 0, 0, 0, 122, 130,
+ 0, 232, 0, 269, 0, 256, 254, 259, 0, 247,
+ 262, 246, 82, 109, 123, 0, 131, 0, 270, 264,
+ 0, 258, 124, 263, 255
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 2, 9, 3, 85, 6, 10, 86, 180, 181,
- 182, 339, 183, 184, 185, 186, 187, 188, 189, 190,
- 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
- 201, 202, 203, 204, 283, 205, 232, 206, 207, 89,
- 90, 91, 221, 132, 133, 222, 92, 93, 94, 95,
- 151, 152, 96, 134, 97, 98, 233, 100, 101, 102,
- 103, 104, 146, 147, 237, 238, 317, 209, 210, 211,
- 212, 398, 399, 213, 214, 215, 394, 336, 216, 217,
- 218, 328, 376, 377, 219, 105, 106
+ -1, 2, 9, 3, 86, 6, 10, 87, 182, 183,
+ 184, 341, 185, 186, 187, 188, 189, 190, 191, 192,
+ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
+ 203, 204, 205, 206, 285, 207, 234, 208, 209, 90,
+ 91, 92, 223, 134, 135, 224, 93, 94, 95, 96,
+ 153, 154, 97, 136, 98, 99, 235, 101, 102, 103,
+ 104, 105, 148, 149, 239, 240, 319, 211, 212, 213,
+ 214, 400, 401, 215, 216, 217, 396, 338, 218, 219,
+ 220, 330, 378, 379, 221, 106, 107
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -350
+#define YYPACT_NINF -321
static const yytype_int16 yypact[] =
{
- -78, -56, 54, -350, -52, -350, -37, -350, 8, 3302,
- -350, -26, -350, -350, -350, -350, -350, -350, -350, -350,
- -350, -350, -350, -350, -350, -350, -350, -350, -350, -350,
- 88, -350, -350, -350, -350, -350, -350, -350, -350, -350,
- -350, -350, -350, -350, -350, -350, -350, -350, -350, -350,
- -350, -350, -350, -350, -350, -350, -350, -350, -350, -350,
- -350, -350, -350, -350, -350, -350, -350, -350, -350, -350,
- -66, -350, -350, 42, -350, -350, -350, 70, -4, 10,
- 29, 34, -79, -350, -350, -350, 3302, -350, -19, -24,
- -69, 5, -154, -350, 102, 16, 16, 3490, -350, -350,
- -350, 18, -350, 3562, -350, -350, -350, 108, -350, -350,
- -350, -8, 3490, -350, 16, -350, 3562, -350, -350, -350,
- -350, 138, -350, -350, 387, -350, -350, 24, -350, -350,
- -350, -350, -350, 3490, 147, 141, -350, -166, -350, -350,
- -350, 2387, -350, 106, 3490, 144, 1772, -350, -350, 7,
- 11, -87, -350, 14, 15, 1243, 30, 32, 20, 2004,
- 37, 2936, 25, 39, -65, -350, -350, -350, -350, -350,
- 2936, 2936, 2936, -350, -350, -350, -350, -350, 601, -350,
- -350, -350, -59, -350, -350, -350, 28, -82, 3119, 43,
- -30, 2936, -11, -2, 118, -74, 114, 35, 31, 36,
- 148, 152, -77, -350, -350, -115, -350, 40, 52, -350,
- -350, -350, -350, 815, -350, -350, -350, -350, -350, -350,
- -350, -350, -350, 172, 3490, -180, -350, 2570, 2936, -350,
- -350, -350, 53, -350, -350, 1888, 55, -113, -350, -350,
- -350, -350, 173, -350, 138, -350, -350, 178, 1656, 2936,
- -350, -350, -108, 2936, -161, -350, 2204, -350, -350, -68,
- -350, 1029, -350, -350, 2936, 3418, -350, -350, 2936, 61,
- -350, -350, -350, -350, -350, -350, -350, -350, -350, -350,
- -350, -350, -350, 2936, -350, 2936, 2936, 2936, 2936, 2936,
- 2936, 2936, 2936, 2936, 2936, 2936, 2936, 2936, 2936, 2936,
- 2936, 2936, 2936, 2936, 2936, 2936, -350, -350, -350, 63,
- -350, -350, 2753, 2936, 46, 60, -350, -350, -350, -350,
- 2936, 144, -350, -350, -350, 67, -350, -350, 2204, -55,
- -350, -54, -350, 238, 65, 188, 71, -350, -350, 72,
- 65, 73, -350, -350, -350, -350, -350, -350, -11, -11,
- -2, -2, 118, 118, 118, 118, -74, -74, 114, 35,
- 31, 36, 148, 152, -157, -350, 2936, 56, 83, -350,
- 2936, 68, 84, -350, 2936, -350, 69, 90, 1243, 74,
- 77, 1456, -350, 2936, 86, 2936, 79, -350, 2936, -350,
- -53, 2936, 1456, 255, -350, -350, 2936, -350, -350, -350,
- -350, -350, -350, 2936, -350, 80, 65, -350, 1243, -350,
- -350, -350, -350
+ -86, -57, 45, -321, -56, -321, -50, -321, -10, 3320,
+ -321, -26, -321, -321, -321, -321, -321, -321, -321, -321,
+ -321, -321, -321, -321, -321, -321, -321, -321, -321, -321,
+ 79, -321, -321, -321, -321, -321, -321, -321, -321, -321,
+ -321, -321, -321, -321, -321, -321, -321, -321, -321, -321,
+ -321, -321, -321, -321, -321, -321, -321, -321, -321, -321,
+ -321, -321, -321, -321, -321, -321, -321, -321, -321, -321,
+ -70, -321, -321, 43, -321, -321, -321, 18, -22, -12,
+ -5, 2, 25, -101, -321, -321, -321, 3320, -321, -43,
+ -55, -54, 6, -148, -321, 52, 211, 211, 3509, -321,
+ -321, -321, -47, -321, 3581, -321, -321, -321, 110, -321,
+ -321, -321, -14, 3509, -321, 211, -321, 3581, -321, -321,
+ -321, -321, -321, 131, -321, -321, 389, -321, -321, 15,
+ -321, -321, -321, -321, -321, 3509, 109, 136, -321, -152,
+ -321, -321, -321, 2400, -321, 105, 3509, 143, 1781, -321,
+ -321, 7, 9, -107, -321, 10, 12, 1249, 27, 36,
+ 17, 2015, 40, 2952, 22, 42, -65, -321, -321, -321,
+ -321, -321, 2952, 2952, 2952, -321, -321, -321, -321, -321,
+ 604, -321, -321, -321, -20, -321, -321, -321, 47, -92,
+ 3136, 46, -67, 2952, -24, -16, 111, -73, 108, 37,
+ 41, 39, 162, 161, -82, -321, -321, -147, -321, 44,
+ 61, -321, -321, -321, -321, 819, -321, -321, -321, -321,
+ -321, -321, -321, -321, -321, 181, 3509, -160, -321, 2584,
+ 2952, -321, -321, -321, 63, -321, -321, 1898, 62, -146,
+ -321, -321, -321, -321, 183, -321, 131, -321, -321, 187,
+ 1664, 2952, -321, -321, -144, 2952, -140, -321, 2216, -321,
+ -321, -81, -321, 1034, -321, -321, 2952, 3437, -321, -321,
+ 2952, 70, -321, -321, -321, -321, -321, -321, -321, -321,
+ -321, -321, -321, -321, -321, 2952, -321, 2952, 2952, 2952,
+ 2952, 2952, 2952, 2952, 2952, 2952, 2952, 2952, 2952, 2952,
+ 2952, 2952, 2952, 2952, 2952, 2952, 2952, 2952, -321, -321,
+ -321, 74, -321, -321, 2768, 2952, 64, 69, -321, -321,
+ -321, -321, 2952, 143, -321, -321, -321, 82, -321, -321,
+ 2216, -74, -321, -68, -321, 235, 78, 203, 85, -321,
+ -321, 84, 78, 88, -321, -321, -321, -321, -321, -321,
+ -24, -24, -16, -16, 111, 111, 111, 111, -73, -73,
+ 108, 37, 41, 39, 162, 161, -129, -321, 2952, 71,
+ 86, -321, 2952, 72, 87, -321, 2952, -321, 73, 92,
+ 1249, 75, 76, 1463, -321, 2952, 95, 2952, 80, -321,
+ 2952, -321, -63, 2952, 1463, 277, -321, -321, 2952, -321,
+ -321, -321, -321, -321, -321, 2952, -321, 81, 78, -321,
+ 1249, -321, -321, -321, -321
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -350, -350, -350, -350, -350, -350, -350, -350, -350, -350,
- -350, -350, -350, -350, 22, -350, -350, -350, -350, -135,
- -350, -83, -81, -104, -85, -13, -6, -5, -3, -1,
- -7, -350, -133, -97, -350, -156, -193, 9, 12, -350,
- -350, -350, 76, 170, 168, 81, -350, -350, -239, -350,
- -350, 59, -71, -350, -350, -72, -9, 1, -350, -350,
- 227, -350, 163, -139, -350, -12, -283, 62, -151, -349,
- -67, -84, 223, 135, 66, -350, -350, -10, -350, -350,
- -350, -350, -350, -350, -350, 229, -350
+ -321, -321, -321, -321, -321, -321, -321, -321, -321, -321,
+ -321, -321, -321, -321, 26, -321, -321, -321, -321, -135,
+ -321, -91, -88, -106, -90, -3, -6, -4, -2, -1,
+ 0, -321, -139, -174, -321, -156, -217, 11, 13, -321,
+ -321, -321, 83, 170, 164, 89, -321, -321, -243, -321,
+ -321, 56, -71, -321, -321, -72, -9, -32, -321, -321,
+ 227, -321, 160, -131, -321, -15, -195, 57, -154, -320,
+ -69, -84, 222, 133, 66, -321, -321, -13, -321, -321,
+ -321, -321, -321, -321, -321, 231, -321
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -169
+#define YYTABLE_NINF -170
static const yytype_int16 yytable[] =
{
- 99, 115, 114, 252, 247, 254, 230, 240, 231, 128,
- 111, -168, 292, 293, 303, 312, 259, 335, 87, 12,
- 13, 88, 4, 138, 139, 262, 263, 226, 128, 227,
- 369, 1, 397, 313, 315, 257, 258, 305, 129, 130,
- 131, 305, 148, 397, 135, 12, 13, 228, 30, 31,
- 32, 332, 33, 34, 5, 383, 284, 129, 130, 131,
- 136, 7, 308, 272, 273, 274, 275, 276, 277, 278,
- 279, 280, 281, 8, 30, 31, 32, 99, 33, 34,
- 35, 36, 37, 305, 11, 321, 107, 387, 140, 335,
- 305, 270, 230, 329, 231, 87, 240, 331, 88, 306,
- 334, 322, 402, 145, 142, 404, 330, 243, 340, 117,
- 308, 244, 267, 409, 121, 208, 268, 149, 113, 368,
- 410, 108, 109, 118, 223, 110, 337, 372, -40, 127,
- 305, 316, 294, 295, 304, 145, 264, 145, 265, 378,
- 379, 405, 119, 305, 305, 305, 208, 120, 364, 112,
- 345, 346, 347, 230, 230, 230, 230, 230, 230, 230,
- 230, 230, 230, 230, 230, 230, 230, 230, 230, 208,
- 126, 343, 334, 384, 74, 75, 76, 230, 137, 231,
- 129, 130, 131, 282, 143, 230, 344, 231, 352, 353,
- 354, 355, 285, 286, 287, 123, 124, 288, 289, -102,
- 290, 291, 296, 297, 208, 348, 349, 144, 365, 350,
- 351, 356, 357, 141, 150, 223, 316, 225, 390, 234,
- 236, 241, 266, 248, 242, 249, 145, 393, 245, 246,
- 253, 230, 256, 231, 250, 406, 271, 255, 301, 208,
- 299, 12, 13, 298, 302, -39, 300, 208, 309, 318,
- 320, 323, 208, 325, 123, -34, 371, 412, 366, 370,
- 374, 115, 114, 305, 380, 381, -40, 408, 382, 385,
- 30, 31, 32, 316, 33, 34, 35, 36, 37, 386,
- 389, 388, 401, 391, 392, 358, 400, 342, 316, 178,
- 396, 316, 403, 359, 411, 360, 363, 220, 361, 316,
- 310, 362, 224, 324, 116, 311, 316, 235, 407, 373,
- 326, 125, 395, 261, 327, 122, 0, 0, 375, 208,
+ 100, 116, 115, 249, 233, 254, 112, 256, 232, 305,
+ 130, -169, 317, 294, 295, 337, 272, 242, 261, 130,
+ 88, 4, 89, 1, 140, 141, 274, 275, 276, 277,
+ 278, 279, 280, 281, 282, 283, 314, 259, 260, 131,
+ 132, 133, 228, 150, 229, 5, 12, 13, 131, 132,
+ 133, 137, 307, 323, 315, 307, 318, 7, 286, 307,
+ 8, 310, 230, 399, 264, 265, 11, 138, 308, 324,
+ 307, 332, 144, 334, 399, 30, 31, 32, 100, 33,
+ 34, 35, 36, 37, 385, 151, 108, 337, 245, 142,
+ 233, 118, 246, 123, 232, 331, 345, 370, 88, 333,
+ 89, 119, 336, 269, 147, 374, 242, 270, 120, 310,
+ 342, 346, 109, 110, 339, 121, 111, 210, 307, 114,
+ 371, 380, 74, 75, 76, 307, 225, 381, 139, -41,
+ 306, 307, 407, 367, 296, 297, 307, 147, 122, 147,
+ 128, 318, 131, 132, 133, 129, 113, 284, 210, 143,
+ 366, 386, 347, 348, 349, 232, 232, 232, 232, 232,
+ 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
+ 232, 210, 125, 126, 336, 233, 266, 389, 267, 232,
+ 287, 288, 289, 233, 290, 291, 145, 232, 354, 355,
+ 356, 357, 404, 292, 293, 406, 298, 299, 318, 350,
+ 351, -103, 146, 411, 352, 353, 210, 152, 358, 359,
+ 412, 402, 227, 318, 12, 13, 318, 225, 236, 238,
+ 392, 250, 243, 244, 318, 247, 395, 248, 147, 233,
+ 251, 318, 252, 232, 255, 257, 258, 408, 12, 13,
+ 273, 210, 268, 30, 31, 32, 300, 33, 34, 210,
+ 302, 301, 303, 304, 210, -40, 414, 311, 322, 125,
+ 320, 325, 327, 116, 115, -35, 373, 30, 31, 32,
+ 368, 33, 34, 35, 36, 37, 376, 307, 372, 382,
+ 383, 384, -41, 388, 391, 387, 390, 394, 393, 410,
+ 398, 180, 403, 344, 405, 361, 413, 360, 362, 222,
+ 226, 363, 326, 364, 117, 365, 237, 328, 375, 312,
+ 409, 127, 397, 263, 0, 313, 329, 377, 124, 0,
+ 0, 210, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 208,
- 0, 0, 208, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 208, 0, 0, 0, 0, 0, 0,
- 12, 13, 14, 15, 16, 17, 153, 154, 155, 208,
- 156, 157, 158, 159, 160, 161, 162, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 0, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 163, 164, 165, 166, 167, 168, 169, 0,
- 0, 170, 171, 0, 0, 0, 0, 0, 0, 0,
+ 0, 210, 0, 0, 210, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 210, 0, 0, 0, 0,
+ 0, 0, 12, 13, 14, 15, 16, 17, 155, 156,
+ 157, 210, 158, 159, 160, 161, 162, 163, 164, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 0, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 165, 166, 167, 168, 169, 170,
+ 171, 0, 0, 172, 173, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 73, 74, 75, 76, 0, 77, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 82, 0, 0,
+ 0, 0, 73, 74, 75, 76, 0, 77, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 83, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 83, 0, 84, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 84, 0, 85, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 172, 0, 0, 0, 0, 0, 173, 174, 175, 176,
+ 0, 0, 0, 174, 0, 0, 0, 0, 0, 175,
+ 176, 177, 178, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 179, 180, 181, 12, 13, 14,
+ 15, 16, 17, 155, 156, 157, 0, 158, 159, 160,
+ 161, 162, 163, 164, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 0,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 165,
+ 166, 167, 168, 169, 170, 171, 0, 0, 172, 173,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 177, 178, 179, 12, 13, 14, 15, 16, 17,
- 153, 154, 155, 0, 156, 157, 158, 159, 160, 161,
- 162, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 0, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 163, 164, 165, 166,
- 167, 168, 169, 0, 0, 170, 171, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 73, 74, 75,
+ 76, 0, 77, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 83, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 73, 74, 75, 76, 0, 77,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 82, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 84,
+ 0, 85, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 83, 0, 84, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 174, 0,
+ 0, 0, 0, 0, 175, 176, 177, 178, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 179,
+ 180, 262, 12, 13, 14, 15, 16, 17, 155, 156,
+ 157, 0, 158, 159, 160, 161, 162, 163, 164, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 0, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 165, 166, 167, 168, 169, 170,
+ 171, 0, 0, 172, 173, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 73, 74, 75, 76, 0, 77, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 83, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 172, 0, 0, 0, 0, 0,
- 173, 174, 175, 176, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 177, 178, 260, 12, 13,
- 14, 15, 16, 17, 153, 154, 155, 0, 156, 157,
- 158, 159, 160, 161, 162, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 0, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 163, 164, 165, 166, 167, 168, 169, 0, 0, 170,
- 171, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 73, 74,
- 75, 76, 0, 77, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 82, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 84, 0, 85, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 83,
- 0, 84, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 172, 0,
- 0, 0, 0, 0, 173, 174, 175, 176, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 177,
- 178, 307, 12, 13, 14, 15, 16, 17, 153, 154,
- 155, 0, 156, 157, 158, 159, 160, 161, 162, 18,
+ 0, 0, 0, 174, 0, 0, 0, 0, 0, 175,
+ 176, 177, 178, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 179, 180, 309, 12, 13, 14,
+ 15, 16, 17, 155, 156, 157, 0, 158, 159, 160,
+ 161, 162, 163, 164, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 0,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 165,
+ 166, 167, 168, 169, 170, 171, 0, 0, 172, 173,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 73, 74, 75,
+ 76, 0, 77, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 83, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 84,
+ 0, 85, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 174, 0,
+ 0, 0, 0, 0, 175, 176, 177, 178, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 179,
+ 180, 340, 12, 13, 14, 15, 16, 17, 155, 156,
+ 157, 0, 158, 159, 160, 161, 162, 163, 164, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, 0, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 163, 164, 165, 166, 167, 168,
- 169, 0, 0, 170, 171, 0, 0, 0, 0, 0,
+ 68, 69, 70, 71, 165, 166, 167, 168, 169, 170,
+ 171, 0, 0, 172, 173, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 73, 74, 75, 76, 0, 77, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 82,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 83, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 83, 0, 84, 0, 0, 0, 0,
+ 0, 0, 0, 0, 84, 0, 85, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 172, 0, 0, 0, 0, 0, 173, 174,
- 175, 176, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 177, 178, 338, 12, 13, 14, 15,
- 16, 17, 153, 154, 155, 0, 156, 157, 158, 159,
- 160, 161, 162, 18, 19, 20, 21, 22, 23, 24,
+ 0, 0, 0, 174, 0, 0, 0, 0, 0, 175,
+ 176, 177, 178, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 179, 180, 12, 13, 14, 15,
+ 16, 17, 155, 156, 157, 0, 158, 159, 160, 161,
+ 162, 163, 164, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 0, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 163, 164,
- 165, 166, 167, 168, 169, 0, 0, 170, 171, 0,
+ 64, 65, 66, 67, 68, 69, 70, 71, 165, 166,
+ 167, 168, 169, 170, 171, 0, 0, 172, 173, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 73, 74, 75, 76,
0, 77, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 82, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 83, 0, 84,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 172, 0, 0, 0,
- 0, 0, 173, 174, 175, 176, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 177, 178, 12,
- 13, 14, 15, 16, 17, 153, 154, 155, 0, 156,
- 157, 158, 159, 160, 161, 162, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 0, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 163, 164, 165, 166, 167, 168, 169, 0, 0,
- 170, 171, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 73,
- 74, 75, 76, 0, 77, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 82, 0, 0, 0,
+ 0, 0, 0, 0, 83, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 84, 0,
+ 85, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 83, 0, 84, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 174, 0, 0,
+ 0, 0, 0, 175, 176, 177, 178, 12, 13, 14,
+ 15, 16, 17, 0, 0, 0, 0, 0, 179, 126,
+ 0, 0, 0, 0, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 0,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 0,
+ 166, 167, 168, 169, 170, 171, 0, 0, 172, 173,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 172,
- 0, 0, 0, 0, 0, 173, 174, 175, 176, 12,
- 13, 14, 15, 16, 17, 0, 0, 0, 0, 0,
- 177, 124, 0, 0, 0, 0, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 0, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 0, 164, 165, 166, 167, 168, 169, 0, 0,
- 170, 171, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 73,
- 74, 75, 76, 0, 77, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 82, 14, 15, 16,
- 17, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 0, 0, 0, 0, 0, 0,
- 83, 0, 84, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 0, 72, 172,
- 0, 0, 0, 0, 0, 173, 174, 175, 176, 0,
+ 0, 0, 0, 0, 0, 0, 0, 73, 74, 75,
+ 76, 0, 77, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 83, 14, 15, 16, 17,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 177, 0, 0, 0, 0, 0, 74, 75, 76, 0,
+ 0, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 0, 0, 0, 0, 0, 0, 84,
+ 0, 85, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 0, 72, 174, 0,
+ 0, 0, 0, 0, 175, 176, 177, 178, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 179,
+ 0, 0, 0, 0, 0, 74, 75, 76, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 14, 15, 16, 17, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 0, 0, 0, 0, 0, 0, 83, 0, 84, 38,
+ 0, 0, 0, 0, 0, 0, 84, 0, 85, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
69, 70, 71, 0, 72, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 239, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 241, 0,
0, 0, 74, 75, 76, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 14,
- 15, 16, 17, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 0, 0, 0, 0,
- 0, 0, 83, 0, 84, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 0,
- 164, 165, 166, 167, 168, 169, 0, 0, 170, 171,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 319, 0, 0, 0, 74, 75,
- 76, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 83, 0,
- 84, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 14, 15, 16, 17, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 0, 0, 0,
+ 0, 0, 0, 84, 0, 85, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 0, 166, 167, 168, 169, 170, 171, 0, 0, 172,
+ 173, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 321, 0, 0, 0, 74,
+ 75, 76, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 172, 0, 0,
- 0, 0, 0, 173, 174, 175, 176, 12, 13, 14,
- 15, 16, 17, 0, 0, 0, 0, 0, 251, 0,
- 0, 0, 0, 0, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 0,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 0,
- 164, 165, 166, 167, 168, 169, 0, 0, 170, 171,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 333, 74, 75,
- 76, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 82, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 83, 0,
- 84, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 84, 0, 85, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 14, 15, 16, 17, 0, 172, 0, 0,
- 0, 0, 0, 173, 174, 175, 176, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 0, 164, 165, 166, 167, 168, 169, 0,
- 0, 170, 171, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 74, 75, 76, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 174,
+ 0, 0, 0, 0, 0, 175, 176, 177, 178, 12,
+ 13, 14, 15, 16, 17, 0, 0, 0, 0, 0,
+ 253, 0, 0, 0, 0, 0, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 0, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 0, 166, 167, 168, 169, 170, 171, 0, 0,
+ 172, 173, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 335,
+ 74, 75, 76, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 83, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 83, 0, 84, 0, 0, 0, 0, 0, 0,
+ 0, 84, 0, 85, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 14, 15, 16, 17, 0,
- 172, 0, 0, 229, 0, 0, 173, 174, 175, 176,
+ 174, 0, 0, 0, 0, 0, 175, 176, 177, 178,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 0, 0, 0, 0, 0, 0, 0, 0,
0, 38, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 0, 164, 165, 166, 167,
- 168, 169, 0, 0, 170, 171, 0, 0, 0, 0,
+ 67, 68, 69, 70, 71, 0, 166, 167, 168, 169,
+ 170, 171, 0, 0, 172, 173, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 74, 75, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 83, 0, 84, 0, 0, 0,
+ 0, 0, 0, 0, 0, 84, 0, 85, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 14, 15,
- 16, 17, 0, 172, 0, 0, 314, 0, 0, 173,
- 174, 175, 176, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 0, 164,
- 165, 166, 167, 168, 169, 0, 0, 170, 171, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 14,
+ 15, 16, 17, 0, 174, 0, 0, 231, 0, 0,
+ 175, 176, 177, 178, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 0,
+ 166, 167, 168, 169, 170, 171, 0, 0, 172, 173,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 74, 75,
+ 76, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 74, 75, 76,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 84,
+ 0, 85, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 83, 0, 84,
+ 0, 0, 0, 14, 15, 16, 17, 0, 174, 0,
+ 0, 316, 0, 0, 175, 176, 177, 178, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 0, 166, 167, 168, 169, 170, 171,
+ 0, 0, 172, 173, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 74, 75, 76, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 14, 15, 16, 17, 0, 172, 0, 0, 367,
- 0, 0, 173, 174, 175, 176, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 0, 164, 165, 166, 167, 168, 169, 0, 0,
- 170, 171, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 74, 75, 76, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 84, 0, 85, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 14, 15, 16,
+ 17, 0, 174, 0, 0, 369, 0, 0, 175, 176,
+ 177, 178, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, 71, 0, 166, 167,
+ 168, 169, 170, 171, 0, 0, 172, 173, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 83, 0, 84, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 74, 75, 76, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 14, 15, 16, 17, 0, 172,
- 0, 0, 0, 0, 0, 173, 174, 175, 176, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 269, 0, 164, 165, 166, 167, 168,
- 169, 0, 0, 170, 171, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 74, 75, 76, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 84, 0, 85,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 83, 0, 84, 0, 0, 0, 0,
+ 0, 14, 15, 16, 17, 0, 174, 0, 0, 0,
+ 0, 0, 175, 176, 177, 178, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 271, 0, 166, 167, 168, 169, 170, 171, 0, 0,
+ 172, 173, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 74, 75, 76, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 12, 13, 14, 15, 16,
- 17, 0, 172, 0, 0, 0, 0, 0, 173, 174,
- 175, 176, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 0, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 0, 72, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 73, 74, 75, 76, 0,
- 77, 0, 0, 0, 0, 0, 0, 0, 78, 79,
- 80, 81, 82, 14, 15, 16, 17, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 0, 0, 0, 0, 0, 0, 83, 0, 84, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 0, 341, 14, 15, 16, 17, 169,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 84, 0, 85, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 12, 13, 14, 15, 16, 17, 0,
+ 174, 0, 0, 0, 0, 0, 175, 176, 177, 178,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 74, 75, 76, 0, 0, 0, 0, 0,
- 0, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 28, 29, 30, 31, 32, 0, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 0, 72, 14, 15, 16,
- 17, 0, 83, 0, 84, 0, 0, 0, 0, 0,
- 0, 0, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 74, 75, 76, 0, 0, 0,
- 0, 0, 0, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 0, 72, 0,
- 0, 0, 0, 0, 83, 0, 84, 0, 0, 0,
+ 67, 68, 69, 70, 71, 0, 72, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 73, 74, 75, 76, 0, 77, 0,
+ 0, 0, 0, 0, 0, 0, 78, 79, 80, 81,
+ 82, 83, 14, 15, 16, 17, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 0,
+ 0, 0, 0, 0, 0, 84, 0, 85, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 0, 343, 14, 15, 16, 17, 171, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 74, 75, 76, 0, 0, 0, 0, 0, 0,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 0, 72, 14, 15, 16, 17,
+ 0, 0, 84, 0, 85, 0, 0, 0, 0, 0,
+ 0, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 74, 75, 76, 0, 0, 0, 0,
+ 0, 0, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 0, 72, 0, 0,
+ 0, 0, 0, 0, 84, 0, 85, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 83, 0, 84
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 84, 0, 85
};
static const yytype_int16 yycheck[] =
{
- 9, 73, 73, 159, 155, 161, 141, 146, 141, 4,
- 76, 76, 86, 87, 91, 195, 172, 256, 9, 3,
- 4, 9, 78, 95, 96, 84, 85, 193, 4, 195,
- 313, 109, 381, 213, 227, 170, 171, 198, 33, 34,
- 35, 198, 114, 392, 198, 3, 4, 213, 32, 33,
- 34, 212, 36, 37, 0, 212, 191, 33, 34, 35,
- 214, 113, 213, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, 102, 110, 32, 33, 34, 86, 36, 37,
- 38, 39, 40, 198, 76, 198, 112, 370, 97, 328,
- 198, 188, 227, 249, 227, 86, 235, 253, 86, 214,
- 256, 214, 385, 112, 103, 388, 214, 194, 264, 113,
- 261, 198, 194, 396, 193, 124, 198, 116, 76, 312,
- 403, 33, 34, 113, 133, 37, 194, 320, 193, 198,
- 198, 228, 206, 207, 211, 144, 195, 146, 197, 194,
- 194, 194, 113, 198, 198, 198, 155, 113, 304, 215,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 178,
- 194, 268, 328, 366, 104, 105, 106, 312, 76, 312,
- 33, 34, 35, 213, 76, 320, 283, 320, 292, 293,
- 294, 295, 203, 204, 205, 214, 215, 199, 200, 194,
- 82, 83, 88, 89, 213, 288, 289, 215, 305, 290,
- 291, 296, 297, 195, 76, 224, 313, 76, 374, 113,
- 76, 214, 194, 193, 213, 193, 235, 378, 214, 214,
- 193, 366, 193, 366, 214, 391, 193, 212, 90, 248,
- 209, 3, 4, 208, 92, 193, 210, 256, 76, 196,
- 195, 78, 261, 75, 214, 194, 196, 408, 195, 213,
- 193, 333, 333, 198, 76, 194, 193, 12, 196, 213,
- 32, 33, 34, 370, 36, 37, 38, 39, 40, 196,
- 196, 213, 196, 214, 194, 298, 383, 265, 385, 215,
- 213, 388, 213, 299, 214, 300, 303, 127, 301, 396,
- 224, 302, 134, 244, 77, 224, 403, 144, 392, 321,
- 248, 88, 379, 178, 248, 86, -1, -1, 328, 328,
+ 9, 73, 73, 157, 143, 161, 76, 163, 143, 91,
+ 4, 76, 229, 86, 87, 258, 190, 148, 174, 4,
+ 9, 78, 9, 109, 96, 97, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 196, 172, 173, 33,
+ 34, 35, 194, 115, 196, 0, 3, 4, 33, 34,
+ 35, 199, 199, 199, 214, 199, 230, 113, 193, 199,
+ 110, 215, 214, 383, 84, 85, 76, 215, 215, 215,
+ 199, 215, 104, 213, 394, 32, 33, 34, 87, 36,
+ 37, 38, 39, 40, 213, 117, 112, 330, 195, 98,
+ 229, 113, 199, 194, 229, 251, 270, 314, 87, 255,
+ 87, 113, 258, 195, 113, 322, 237, 199, 113, 263,
+ 266, 285, 33, 34, 195, 113, 37, 126, 199, 76,
+ 315, 195, 104, 105, 106, 199, 135, 195, 76, 194,
+ 212, 199, 195, 307, 207, 208, 199, 146, 113, 148,
+ 195, 315, 33, 34, 35, 199, 216, 214, 157, 196,
+ 306, 368, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+ 305, 180, 215, 216, 330, 314, 196, 372, 198, 314,
+ 204, 205, 206, 322, 200, 201, 76, 322, 294, 295,
+ 296, 297, 387, 82, 83, 390, 88, 89, 372, 290,
+ 291, 195, 216, 398, 292, 293, 215, 76, 298, 299,
+ 405, 385, 76, 387, 3, 4, 390, 226, 113, 76,
+ 376, 194, 215, 214, 398, 215, 380, 215, 237, 368,
+ 194, 405, 215, 368, 194, 213, 194, 393, 3, 4,
+ 194, 250, 195, 32, 33, 34, 209, 36, 37, 258,
+ 211, 210, 90, 92, 263, 194, 410, 76, 196, 215,
+ 197, 78, 75, 335, 335, 195, 197, 32, 33, 34,
+ 196, 36, 37, 38, 39, 40, 194, 199, 214, 76,
+ 195, 197, 194, 197, 197, 214, 214, 195, 215, 12,
+ 214, 216, 197, 267, 214, 301, 215, 300, 302, 129,
+ 136, 303, 246, 304, 77, 305, 146, 250, 323, 226,
+ 394, 89, 381, 180, -1, 226, 250, 330, 87, -1,
+ -1, 330, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 378,
- -1, -1, 381, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 392, -1, -1, -1, -1, -1, -1,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 408,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, -1, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, -1,
- -1, 84, 85, -1, -1, -1, -1, -1, -1, -1,
+ -1, 380, -1, -1, 383, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 394, -1, -1, -1, -1,
+ -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, 410, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, -1, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, -1, -1, 84, 85, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 103, 104, 105, 106, -1, 108, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 120, -1, -1,
+ -1, -1, 103, 104, 105, 106, -1, 108, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 121, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 154, -1, 156, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 155, -1, 157, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 193, -1, -1, -1, -1, -1, 199, 200, 201, 202,
+ -1, -1, -1, 194, -1, -1, -1, -1, -1, 200,
+ 201, 202, 203, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 215, 216, 217, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, -1, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, -1, -1, 84, 85,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 214, 215, 216, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, -1, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, -1, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, -1, -1, 84, 85, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 103, 104, 105,
+ 106, -1, 108, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 121, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 103, 104, 105, 106, -1, 108,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 120, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 155,
+ -1, 157, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 154, -1, 156, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 194, -1,
+ -1, -1, -1, -1, 200, 201, 202, 203, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 215,
+ 216, 217, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, -1, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, -1, -1, 84, 85, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 103, 104, 105, 106, -1, 108, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 121, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 155, -1, 157, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 193, -1, -1, -1, -1, -1,
- 199, 200, 201, 202, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 214, 215, 216, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, -1, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- -1, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, -1, -1, 84,
- 85, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 103, 104,
- 105, 106, -1, 108, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 120, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 194, -1, -1, -1, -1, -1, 200,
+ 201, 202, 203, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 215, 216, 217, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, -1, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, -1, -1, 84, 85,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 103, 104, 105,
+ 106, -1, 108, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 121, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 154,
- -1, 156, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 155,
+ -1, 157, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 193, -1,
- -1, -1, -1, -1, 199, 200, 201, 202, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 214,
- 215, 216, 3, 4, 5, 6, 7, 8, 9, 10,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 194, -1,
+ -1, -1, -1, -1, 200, 201, 202, 203, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 215,
+ 216, 217, 3, 4, 5, 6, 7, 8, 9, 10,
11, -1, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31, 32, 33, 34, -1, 36, 37, 38, 39, 40,
@@ -1635,17 +1661,17 @@ static const yytype_int16 yycheck[] = 81, -1, -1, 84, 85, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 103, 104, 105, 106, -1, 108, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 120,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 121, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 154, -1, 156, -1, -1, -1, -1,
+ -1, -1, -1, -1, 155, -1, 157, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 193, -1, -1, -1, -1, -1, 199, 200,
- 201, 202, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 214, 215, 216, 3, 4, 5, 6,
+ -1, -1, -1, 194, -1, -1, -1, -1, -1, 200,
+ 201, 202, 203, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 215, 216, 3, 4, 5, 6,
7, 8, 9, 10, 11, -1, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, -1, 36,
@@ -1657,38 +1683,72 @@ static const yytype_int16 yycheck[] = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 103, 104, 105, 106,
-1, 108, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 120, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 121, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 155, -1,
+ 157, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 194, -1, -1,
+ -1, -1, -1, 200, 201, 202, 203, 3, 4, 5,
+ 6, 7, 8, -1, -1, -1, -1, -1, 215, 216,
+ -1, -1, -1, -1, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, -1,
+ 76, 77, 78, 79, 80, 81, -1, -1, 84, 85,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 103, 104, 105,
+ 106, -1, 108, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 121, 5, 6, 7, 8,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 154, -1, 156,
+ -1, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, -1, -1, -1, -1, -1, -1, 155,
+ -1, 157, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, -1, 76, 194, -1,
+ -1, -1, -1, -1, 200, 201, 202, 203, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 215,
+ -1, -1, -1, -1, -1, 104, 105, 106, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 5, 6, 7, 8, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ -1, -1, -1, -1, -1, -1, 155, -1, 157, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, -1, 76, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 217, -1,
+ -1, -1, 104, 105, 106, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 5, 6, 7, 8, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, -1, -1, -1,
+ -1, -1, -1, 155, -1, 157, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ -1, 76, 77, 78, 79, 80, 81, -1, -1, 84,
+ 85, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 217, -1, -1, -1, 104,
+ 105, 106, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 193, -1, -1, -1,
- -1, -1, 199, 200, 201, 202, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 214, 215, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, -1, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, -1, -1,
- 84, 85, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 103,
- 104, 105, 106, -1, 108, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 120, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 154, -1, 156, -1, -1, -1, -1, -1, -1, -1,
+ 155, -1, 157, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 193,
- -1, -1, -1, -1, -1, 199, 200, 201, 202, 3,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, -1, -1, 200, 201, 202, 203, 3,
4, 5, 6, 7, 8, -1, -1, -1, -1, -1,
- 214, 215, -1, -1, -1, -1, 20, 21, 22, 23,
+ 215, -1, -1, -1, -1, -1, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, -1, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
@@ -1697,126 +1757,90 @@ static const yytype_int16 yycheck[] = 74, -1, 76, 77, 78, 79, 80, 81, -1, -1,
84, 85, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 103,
- 104, 105, 106, -1, 108, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 120, 5, 6, 7,
- 8, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, -1, -1, -1, -1, -1, -1,
- 154, -1, 156, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, -1, 76, 193,
- -1, -1, -1, -1, -1, 199, 200, 201, 202, -1,
+ 104, 105, 106, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 121, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 214, -1, -1, -1, -1, -1, 104, 105, 106, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 5, 6, 7, 8, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- -1, -1, -1, -1, -1, -1, 154, -1, 156, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, -1, 76, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 216, -1,
- -1, -1, 104, 105, 106, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 5,
- 6, 7, 8, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, -1, -1, -1, -1,
- -1, -1, 154, -1, 156, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, -1,
- 76, 77, 78, 79, 80, 81, -1, -1, 84, 85,
+ -1, 155, -1, 157, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 216, -1, -1, -1, 104, 105,
- 106, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 5, 6, 7, 8, -1,
+ 194, -1, -1, -1, -1, -1, 200, 201, 202, 203,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, -1, 76, 77, 78, 79,
+ 80, 81, -1, -1, 84, 85, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 104, 105, 106, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 154, -1,
- 156, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 193, -1, -1,
- -1, -1, -1, 199, 200, 201, 202, 3, 4, 5,
- 6, 7, 8, -1, -1, -1, -1, -1, 214, -1,
- -1, -1, -1, -1, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ -1, -1, -1, -1, -1, 155, -1, 157, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 5,
+ 6, 7, 8, -1, 194, -1, -1, 197, -1, -1,
+ 200, 201, 202, 203, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 41, 42, 43, 44, 45,
46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, -1,
76, 77, 78, 79, 80, 81, -1, -1, 84, 85,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 103, 104, 105,
+ -1, -1, -1, -1, -1, -1, -1, -1, 104, 105,
106, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 120, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 154, -1,
- 156, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 5, 6, 7, 8, -1, 193, -1, -1,
- -1, -1, -1, 199, 200, 201, 202, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, -1, 76, 77, 78, 79, 80, 81, -1,
- -1, 84, 85, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 104, 105, 106, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 155,
+ -1, 157, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 5, 6, 7, 8, -1, 194, -1,
+ -1, 197, -1, -1, 200, 201, 202, 203, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, -1, 76, 77, 78, 79, 80, 81,
+ -1, -1, 84, 85, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 154, -1, 156, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 5, 6, 7, 8, -1,
- 193, -1, -1, 196, -1, -1, 199, 200, 201, 202,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, -1, 76, 77, 78, 79,
- 80, 81, -1, -1, 84, 85, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 104, 105, 106, -1, -1, -1,
+ -1, -1, 104, 105, 106, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 154, -1, 156, -1, -1, -1,
+ -1, -1, -1, 155, -1, 157, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 5, 6,
- 7, 8, -1, 193, -1, -1, 196, -1, -1, 199,
- 200, 201, 202, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, -1, 76,
- 77, 78, 79, 80, 81, -1, -1, 84, 85, -1,
+ -1, -1, -1, -1, -1, -1, -1, 5, 6, 7,
+ 8, -1, 194, -1, -1, 197, -1, -1, 200, 201,
+ 202, 203, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, -1, 76, 77,
+ 78, 79, 80, 81, -1, -1, 84, 85, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 104, 105, 106,
+ -1, -1, -1, -1, -1, -1, 104, 105, 106, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 154, -1, 156,
+ -1, -1, -1, -1, -1, -1, -1, 155, -1, 157,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 5, 6, 7, 8, -1, 193, -1, -1, 196,
- -1, -1, 199, 200, 201, 202, 20, 21, 22, 23,
+ -1, 5, 6, 7, 8, -1, 194, -1, -1, -1,
+ -1, -1, 200, 201, 202, 203, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
@@ -1830,117 +1854,99 @@ static const yytype_int16 yycheck[] = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 154, -1, 156, -1, -1, -1, -1, -1, -1, -1,
+ -1, 155, -1, 157, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 5, 6, 7, 8, -1, 193,
- -1, -1, -1, -1, -1, 199, 200, 201, 202, 20,
+ -1, -1, -1, 3, 4, 5, 6, 7, 8, -1,
+ 194, -1, -1, -1, -1, -1, 200, 201, 202, 203,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, -1, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, -1, 76, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 103, 104, 105, 106, -1, 108, -1,
+ -1, -1, -1, -1, -1, -1, 116, 117, 118, 119,
+ 120, 121, 5, 6, 7, 8, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, -1,
+ -1, -1, -1, -1, -1, 155, -1, 157, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, -1, 76, 5, 6, 7, 8, 81, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 31, 104, 105, 106, -1, -1, -1, -1, -1, -1,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, -1, 76, 77, 78, 79, 80,
- 81, -1, -1, 84, 85, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 104, 105, 106, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 154, -1, 156, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
- 8, -1, 193, -1, -1, -1, -1, -1, 199, 200,
- 201, 202, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, -1, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, -1, 76, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 103, 104, 105, 106, -1,
- 108, -1, -1, -1, -1, -1, -1, -1, 116, 117,
- 118, 119, 120, 5, 6, 7, 8, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- -1, -1, -1, -1, -1, -1, 154, -1, 156, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, -1, 76, 5, 6, 7, 8, 81,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 104, 105, 106, -1, -1, -1, -1, -1,
- -1, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, -1, 76, 5, 6, 7,
- 8, -1, 154, -1, 156, -1, -1, -1, -1, -1,
- -1, -1, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 104, 105, 106, -1, -1, -1,
- -1, -1, -1, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, -1, 76, -1,
- -1, -1, -1, -1, 154, -1, 156, -1, -1, -1,
+ 71, 72, 73, 74, -1, 76, 5, 6, 7, 8,
+ -1, -1, 155, -1, 157, -1, -1, -1, -1, -1,
+ -1, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 104, 105, 106, -1, -1, -1, -1,
+ -1, -1, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, -1, 76, -1, -1,
+ -1, -1, -1, -1, 155, -1, 157, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 154, -1, 156
+ -1, -1, -1, -1, -1, -1, 155, -1, 157
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint16 yystos[] =
{
- 0, 109, 218, 220, 78, 0, 222, 113, 110, 219,
- 223, 76, 3, 4, 5, 6, 7, 8, 20, 21,
+ 0, 109, 219, 221, 78, 0, 223, 113, 110, 220,
+ 224, 76, 3, 4, 5, 6, 7, 8, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
73, 74, 76, 103, 104, 105, 106, 108, 116, 117,
- 118, 119, 120, 154, 156, 221, 224, 254, 255, 256,
- 257, 258, 263, 264, 265, 266, 269, 271, 272, 273,
- 274, 275, 276, 277, 278, 302, 303, 112, 33, 34,
- 37, 76, 215, 76, 269, 272, 277, 113, 113, 113,
- 113, 193, 302, 214, 215, 289, 194, 198, 4, 33,
- 34, 35, 260, 261, 270, 198, 214, 76, 272, 272,
- 273, 195, 274, 76, 215, 273, 279, 280, 272, 274,
- 76, 267, 268, 9, 10, 11, 13, 14, 15, 16,
- 17, 18, 19, 75, 76, 77, 78, 79, 80, 81,
- 84, 85, 193, 199, 200, 201, 202, 214, 215, 216,
- 225, 226, 227, 229, 230, 231, 232, 233, 234, 235,
- 236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
- 246, 247, 248, 249, 250, 252, 254, 255, 273, 284,
- 285, 286, 287, 290, 291, 292, 295, 296, 297, 301,
- 260, 259, 262, 273, 261, 76, 193, 195, 213, 196,
- 236, 249, 253, 273, 113, 279, 76, 281, 282, 216,
- 280, 214, 213, 194, 198, 214, 214, 285, 193, 193,
- 214, 214, 252, 193, 252, 212, 193, 236, 236, 252,
- 216, 290, 84, 85, 195, 197, 194, 194, 198, 74,
- 250, 193, 93, 94, 95, 96, 97, 98, 99, 100,
- 101, 102, 213, 251, 236, 203, 204, 205, 199, 200,
- 82, 83, 86, 87, 206, 207, 88, 89, 208, 209,
- 210, 90, 92, 91, 211, 198, 214, 216, 285, 76,
- 259, 262, 195, 213, 196, 253, 250, 283, 196, 216,
- 195, 198, 214, 78, 268, 75, 284, 291, 298, 252,
- 214, 252, 212, 103, 252, 265, 294, 194, 216, 228,
- 252, 76, 231, 250, 250, 236, 236, 236, 238, 238,
- 239, 239, 240, 240, 240, 240, 241, 241, 242, 243,
- 244, 245, 246, 247, 252, 250, 195, 196, 253, 283,
- 213, 196, 253, 282, 193, 294, 299, 300, 194, 194,
- 76, 194, 196, 212, 253, 213, 196, 283, 213, 196,
- 252, 214, 194, 285, 293, 287, 213, 286, 288, 289,
- 250, 196, 283, 213, 283, 194, 252, 288, 12, 283,
- 283, 214, 285
+ 118, 119, 120, 121, 155, 157, 222, 225, 255, 256,
+ 257, 258, 259, 264, 265, 266, 267, 270, 272, 273,
+ 274, 275, 276, 277, 278, 279, 303, 304, 112, 33,
+ 34, 37, 76, 216, 76, 270, 273, 278, 113, 113,
+ 113, 113, 113, 194, 303, 215, 216, 290, 195, 199,
+ 4, 33, 34, 35, 261, 262, 271, 199, 215, 76,
+ 273, 273, 274, 196, 275, 76, 216, 274, 280, 281,
+ 273, 275, 76, 268, 269, 9, 10, 11, 13, 14,
+ 15, 16, 17, 18, 19, 75, 76, 77, 78, 79,
+ 80, 81, 84, 85, 194, 200, 201, 202, 203, 215,
+ 216, 217, 226, 227, 228, 230, 231, 232, 233, 234,
+ 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+ 245, 246, 247, 248, 249, 250, 251, 253, 255, 256,
+ 274, 285, 286, 287, 288, 291, 292, 293, 296, 297,
+ 298, 302, 261, 260, 263, 274, 262, 76, 194, 196,
+ 214, 197, 237, 250, 254, 274, 113, 280, 76, 282,
+ 283, 217, 281, 215, 214, 195, 199, 215, 215, 286,
+ 194, 194, 215, 215, 253, 194, 253, 213, 194, 237,
+ 237, 253, 217, 291, 84, 85, 196, 198, 195, 195,
+ 199, 74, 251, 194, 93, 94, 95, 96, 97, 98,
+ 99, 100, 101, 102, 214, 252, 237, 204, 205, 206,
+ 200, 201, 82, 83, 86, 87, 207, 208, 88, 89,
+ 209, 210, 211, 90, 92, 91, 212, 199, 215, 217,
+ 286, 76, 260, 263, 196, 214, 197, 254, 251, 284,
+ 197, 217, 196, 199, 215, 78, 269, 75, 285, 292,
+ 299, 253, 215, 253, 213, 103, 253, 266, 295, 195,
+ 217, 229, 253, 76, 232, 251, 251, 237, 237, 237,
+ 239, 239, 240, 240, 241, 241, 241, 241, 242, 242,
+ 243, 244, 245, 246, 247, 248, 253, 251, 196, 197,
+ 254, 284, 214, 197, 254, 283, 194, 295, 300, 301,
+ 195, 195, 76, 195, 197, 213, 254, 214, 197, 284,
+ 214, 197, 253, 215, 195, 286, 294, 288, 214, 287,
+ 289, 290, 251, 197, 284, 214, 284, 195, 253, 289,
+ 12, 284, 284, 215, 286
};
#define yyerrok (yyerrstatus = 0)
@@ -1955,18 +1961,9 @@ static const yytype_uint16 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
+ Once GCC version 2 has supplanted version 1, this can go. */
#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -2023,7 +2020,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -2565,7 +2562,7 @@ YYLTYPE yylloc; YYLTYPE *yylsp;
/* The locations where the error started and ended. */
- YYLTYPE yyerror_range[3];
+ YYLTYPE yyerror_range[2];
YYSIZE_T yystacksize;
@@ -2612,7 +2609,7 @@ YYLTYPE yylloc; yyvsp = yyvs;
yylsp = yyls;
-#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#if YYLTYPE_IS_TRIVIAL
/* Initialize the default location before parsing starts. */
yylloc.first_line = yylloc.last_line = 1;
yylloc.first_column = yylloc.last_column = 1;
@@ -2620,7 +2617,7 @@ YYLTYPE yylloc; /* User initialization code. */
-/* Line 1251 of yacc.c */
+/* Line 1242 of yacc.c */
#line 41 "glsl_parser.ypp"
{
yylloc.first_line = 1;
@@ -2630,8 +2627,8 @@ YYLTYPE yylloc; yylloc.source = 0;
}
-/* Line 1251 of yacc.c */
-#line 2635 "glsl_parser.cpp"
+/* Line 1242 of yacc.c */
+#line 2632 "glsl_parser.cpp"
yylsp[0] = yylloc;
goto yysetstate;
@@ -2818,8 +2815,8 @@ yyreduce: {
case 2:
-/* Line 1464 of yacc.c */
-#line 212 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 213 "glsl_parser.ypp"
{
_mesa_glsl_initialize_types(state);
;}
@@ -2827,8 +2824,8 @@ yyreduce: case 5:
-/* Line 1464 of yacc.c */
-#line 221 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 222 "glsl_parser.ypp"
{
switch ((yyvsp[(2) - (3)].n)) {
case 100:
@@ -2847,10 +2844,28 @@ yyreduce: ;}
break;
- case 12:
+ case 10:
-/* Line 1464 of yacc.c */
-#line 253 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 246 "glsl_parser.ypp"
+ {
+ if (state->language_version < 120) {
+ _mesa_glsl_warning(& (yylsp[(1) - (2)]), state,
+ "pragma `invariant(all)' not supported in "
+ "GLSL%s %d.%02d",
+ state->es_shader ? " ES" : "",
+ state->language_version / 100,
+ state->language_version % 100);
+ } else {
+ state->all_invariant = true;
+ }
+ ;}
+ break;
+
+ case 13:
+
+/* Line 1455 of yacc.c */
+#line 267 "glsl_parser.ypp"
{
if (!_mesa_glsl_process_extension((yyvsp[(2) - (5)].identifier), & (yylsp[(2) - (5)]), (yyvsp[(4) - (5)].identifier), & (yylsp[(4) - (5)]), state)) {
YYERROR;
@@ -2858,10 +2873,10 @@ yyreduce: ;}
break;
- case 13:
+ case 14:
-/* Line 1464 of yacc.c */
-#line 262 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 276 "glsl_parser.ypp"
{
/* FINISHME: The NULL test is only required because 'precision'
* FINISHME: statements are not yet supported.
@@ -2871,10 +2886,10 @@ yyreduce: ;}
break;
- case 14:
+ case 15:
-/* Line 1464 of yacc.c */
-#line 270 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 284 "glsl_parser.ypp"
{
/* FINISHME: The NULL test is only required because 'precision'
* FINISHME: statements are not yet supported.
@@ -2884,10 +2899,10 @@ yyreduce: ;}
break;
- case 16:
+ case 17:
-/* Line 1464 of yacc.c */
-#line 285 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 299 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_identifier, NULL, NULL, NULL);
@@ -2896,10 +2911,10 @@ yyreduce: ;}
break;
- case 17:
+ case 18:
-/* Line 1464 of yacc.c */
-#line 292 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 306 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_int_constant, NULL, NULL, NULL);
@@ -2908,10 +2923,10 @@ yyreduce: ;}
break;
- case 18:
+ case 19:
-/* Line 1464 of yacc.c */
-#line 299 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 313 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_uint_constant, NULL, NULL, NULL);
@@ -2920,10 +2935,10 @@ yyreduce: ;}
break;
- case 19:
+ case 20:
-/* Line 1464 of yacc.c */
-#line 306 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 320 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_float_constant, NULL, NULL, NULL);
@@ -2932,10 +2947,10 @@ yyreduce: ;}
break;
- case 20:
+ case 21:
-/* Line 1464 of yacc.c */
-#line 313 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 327 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_bool_constant, NULL, NULL, NULL);
@@ -2944,19 +2959,19 @@ yyreduce: ;}
break;
- case 21:
+ case 22:
-/* Line 1464 of yacc.c */
-#line 320 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 334 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(2) - (3)].expression);
;}
break;
- case 23:
+ case 24:
-/* Line 1464 of yacc.c */
-#line 328 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 342 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_array_index, (yyvsp[(1) - (4)].expression), (yyvsp[(3) - (4)].expression), NULL);
@@ -2964,19 +2979,19 @@ yyreduce: ;}
break;
- case 24:
+ case 25:
-/* Line 1464 of yacc.c */
-#line 334 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 348 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(1) - (1)].expression);
;}
break;
- case 25:
+ case 26:
-/* Line 1464 of yacc.c */
-#line 338 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 352 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_field_selection, (yyvsp[(1) - (3)].expression), NULL, NULL);
@@ -2985,10 +3000,10 @@ yyreduce: ;}
break;
- case 26:
+ case 27:
-/* Line 1464 of yacc.c */
-#line 345 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 359 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_post_inc, (yyvsp[(1) - (2)].expression), NULL, NULL);
@@ -2996,10 +3011,10 @@ yyreduce: ;}
break;
- case 27:
+ case 28:
-/* Line 1464 of yacc.c */
-#line 351 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 365 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_post_dec, (yyvsp[(1) - (2)].expression), NULL, NULL);
@@ -3007,10 +3022,10 @@ yyreduce: ;}
break;
- case 31:
+ case 32:
-/* Line 1464 of yacc.c */
-#line 369 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 383 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_field_selection, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression), NULL);
@@ -3018,10 +3033,10 @@ yyreduce: ;}
break;
- case 36:
+ case 37:
-/* Line 1464 of yacc.c */
-#line 388 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 402 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(1) - (2)].expression);
(yyval.expression)->set_location(yylloc);
@@ -3029,10 +3044,10 @@ yyreduce: ;}
break;
- case 37:
+ case 38:
-/* Line 1464 of yacc.c */
-#line 394 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 408 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(1) - (3)].expression);
(yyval.expression)->set_location(yylloc);
@@ -3040,10 +3055,10 @@ yyreduce: ;}
break;
- case 39:
+ case 40:
-/* Line 1464 of yacc.c */
-#line 410 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 424 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_function_expression((yyvsp[(1) - (1)].type_specifier));
@@ -3051,10 +3066,10 @@ yyreduce: ;}
break;
- case 40:
+ case 41:
-/* Line 1464 of yacc.c */
-#line 416 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 430 "glsl_parser.ypp"
{
void *ctx = state;
ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (1)].identifier));
@@ -3063,10 +3078,10 @@ yyreduce: ;}
break;
- case 41:
+ case 42:
-/* Line 1464 of yacc.c */
-#line 423 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 437 "glsl_parser.ypp"
{
void *ctx = state;
ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (1)].identifier));
@@ -3075,10 +3090,10 @@ yyreduce: ;}
break;
- case 43:
+ case 44:
-/* Line 1464 of yacc.c */
-#line 435 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 449 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_pre_inc, (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3086,10 +3101,10 @@ yyreduce: ;}
break;
- case 44:
+ case 45:
-/* Line 1464 of yacc.c */
-#line 441 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 455 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_pre_dec, (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3097,10 +3112,10 @@ yyreduce: ;}
break;
- case 45:
+ case 46:
-/* Line 1464 of yacc.c */
-#line 447 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 461 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression((yyvsp[(1) - (2)].n), (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3108,38 +3123,38 @@ yyreduce: ;}
break;
- case 46:
+ case 47:
-/* Line 1464 of yacc.c */
-#line 456 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 470 "glsl_parser.ypp"
{ (yyval.n) = ast_plus; ;}
break;
- case 47:
+ case 48:
-/* Line 1464 of yacc.c */
-#line 457 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 471 "glsl_parser.ypp"
{ (yyval.n) = ast_neg; ;}
break;
- case 48:
+ case 49:
-/* Line 1464 of yacc.c */
-#line 458 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 472 "glsl_parser.ypp"
{ (yyval.n) = ast_logic_not; ;}
break;
- case 49:
+ case 50:
-/* Line 1464 of yacc.c */
-#line 459 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 473 "glsl_parser.ypp"
{ (yyval.n) = ast_bit_not; ;}
break;
- case 51:
+ case 52:
-/* Line 1464 of yacc.c */
-#line 465 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 479 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_mul, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3147,10 +3162,10 @@ yyreduce: ;}
break;
- case 52:
+ case 53:
-/* Line 1464 of yacc.c */
-#line 471 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 485 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_div, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3158,10 +3173,10 @@ yyreduce: ;}
break;
- case 53:
+ case 54:
-/* Line 1464 of yacc.c */
-#line 477 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 491 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_mod, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3169,10 +3184,10 @@ yyreduce: ;}
break;
- case 55:
+ case 56:
-/* Line 1464 of yacc.c */
-#line 487 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 501 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_add, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3180,10 +3195,10 @@ yyreduce: ;}
break;
- case 56:
+ case 57:
-/* Line 1464 of yacc.c */
-#line 493 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 507 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_sub, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3191,10 +3206,10 @@ yyreduce: ;}
break;
- case 58:
+ case 59:
-/* Line 1464 of yacc.c */
-#line 503 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 517 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_lshift, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3202,10 +3217,10 @@ yyreduce: ;}
break;
- case 59:
+ case 60:
-/* Line 1464 of yacc.c */
-#line 509 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 523 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_rshift, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3213,10 +3228,10 @@ yyreduce: ;}
break;
- case 61:
+ case 62:
-/* Line 1464 of yacc.c */
-#line 519 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 533 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_less, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3224,10 +3239,10 @@ yyreduce: ;}
break;
- case 62:
+ case 63:
-/* Line 1464 of yacc.c */
-#line 525 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 539 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_greater, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3235,10 +3250,10 @@ yyreduce: ;}
break;
- case 63:
+ case 64:
-/* Line 1464 of yacc.c */
-#line 531 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 545 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_lequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3246,10 +3261,10 @@ yyreduce: ;}
break;
- case 64:
+ case 65:
-/* Line 1464 of yacc.c */
-#line 537 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 551 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_gequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3257,10 +3272,10 @@ yyreduce: ;}
break;
- case 66:
+ case 67:
-/* Line 1464 of yacc.c */
-#line 547 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 561 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_equal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3268,10 +3283,10 @@ yyreduce: ;}
break;
- case 67:
+ case 68:
-/* Line 1464 of yacc.c */
-#line 553 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 567 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_nequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3279,10 +3294,10 @@ yyreduce: ;}
break;
- case 69:
+ case 70:
-/* Line 1464 of yacc.c */
-#line 563 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 577 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_and, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3290,10 +3305,10 @@ yyreduce: ;}
break;
- case 71:
+ case 72:
-/* Line 1464 of yacc.c */
-#line 573 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 587 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_xor, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3301,10 +3316,10 @@ yyreduce: ;}
break;
- case 73:
+ case 74:
-/* Line 1464 of yacc.c */
-#line 583 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 597 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3312,10 +3327,10 @@ yyreduce: ;}
break;
- case 75:
+ case 76:
-/* Line 1464 of yacc.c */
-#line 593 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 607 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_and, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3323,10 +3338,10 @@ yyreduce: ;}
break;
- case 77:
+ case 78:
-/* Line 1464 of yacc.c */
-#line 603 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 617 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_xor, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3334,10 +3349,10 @@ yyreduce: ;}
break;
- case 79:
+ case 80:
-/* Line 1464 of yacc.c */
-#line 613 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 627 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3345,10 +3360,10 @@ yyreduce: ;}
break;
- case 81:
+ case 82:
-/* Line 1464 of yacc.c */
-#line 623 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 637 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_conditional, (yyvsp[(1) - (5)].expression), (yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].expression));
@@ -3356,10 +3371,10 @@ yyreduce: ;}
break;
- case 83:
+ case 84:
-/* Line 1464 of yacc.c */
-#line 633 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 647 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression((yyvsp[(2) - (3)].n), (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression), NULL);
@@ -3367,96 +3382,96 @@ yyreduce: ;}
break;
- case 84:
+ case 85:
-/* Line 1464 of yacc.c */
-#line 641 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 655 "glsl_parser.ypp"
{ (yyval.n) = ast_assign; ;}
break;
- case 85:
+ case 86:
-/* Line 1464 of yacc.c */
-#line 642 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 656 "glsl_parser.ypp"
{ (yyval.n) = ast_mul_assign; ;}
break;
- case 86:
+ case 87:
-/* Line 1464 of yacc.c */
-#line 643 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 657 "glsl_parser.ypp"
{ (yyval.n) = ast_div_assign; ;}
break;
- case 87:
+ case 88:
-/* Line 1464 of yacc.c */
-#line 644 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 658 "glsl_parser.ypp"
{ (yyval.n) = ast_mod_assign; ;}
break;
- case 88:
+ case 89:
-/* Line 1464 of yacc.c */
-#line 645 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 659 "glsl_parser.ypp"
{ (yyval.n) = ast_add_assign; ;}
break;
- case 89:
+ case 90:
-/* Line 1464 of yacc.c */
-#line 646 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 660 "glsl_parser.ypp"
{ (yyval.n) = ast_sub_assign; ;}
break;
- case 90:
+ case 91:
-/* Line 1464 of yacc.c */
-#line 647 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 661 "glsl_parser.ypp"
{ (yyval.n) = ast_ls_assign; ;}
break;
- case 91:
+ case 92:
-/* Line 1464 of yacc.c */
-#line 648 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 662 "glsl_parser.ypp"
{ (yyval.n) = ast_rs_assign; ;}
break;
- case 92:
+ case 93:
-/* Line 1464 of yacc.c */
-#line 649 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 663 "glsl_parser.ypp"
{ (yyval.n) = ast_and_assign; ;}
break;
- case 93:
+ case 94:
-/* Line 1464 of yacc.c */
-#line 650 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 664 "glsl_parser.ypp"
{ (yyval.n) = ast_xor_assign; ;}
break;
- case 94:
+ case 95:
-/* Line 1464 of yacc.c */
-#line 651 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 665 "glsl_parser.ypp"
{ (yyval.n) = ast_or_assign; ;}
break;
- case 95:
+ case 96:
-/* Line 1464 of yacc.c */
-#line 656 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 670 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(1) - (1)].expression);
;}
break;
- case 96:
+ case 97:
-/* Line 1464 of yacc.c */
-#line 660 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 674 "glsl_parser.ypp"
{
void *ctx = state;
if ((yyvsp[(1) - (3)].expression)->oper != ast_sequence) {
@@ -3471,28 +3486,28 @@ yyreduce: ;}
break;
- case 98:
+ case 99:
-/* Line 1464 of yacc.c */
-#line 680 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 694 "glsl_parser.ypp"
{
(yyval.node) = (yyvsp[(1) - (2)].function);
;}
break;
- case 99:
+ case 100:
-/* Line 1464 of yacc.c */
-#line 684 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 698 "glsl_parser.ypp"
{
(yyval.node) = (yyvsp[(1) - (2)].declarator_list);
;}
break;
- case 100:
+ case 101:
-/* Line 1464 of yacc.c */
-#line 688 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 702 "glsl_parser.ypp"
{
if (((yyvsp[(3) - (4)].type_specifier)->type_specifier != ast_float)
&& ((yyvsp[(3) - (4)].type_specifier)->type_specifier != ast_int)) {
@@ -3505,30 +3520,30 @@ yyreduce: ;}
break;
- case 104:
+ case 105:
-/* Line 1464 of yacc.c */
-#line 711 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 725 "glsl_parser.ypp"
{
(yyval.function) = (yyvsp[(1) - (2)].function);
(yyval.function)->parameters.push_tail(& (yyvsp[(2) - (2)].parameter_declarator)->link);
;}
break;
- case 105:
+ case 106:
-/* Line 1464 of yacc.c */
-#line 716 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 730 "glsl_parser.ypp"
{
(yyval.function) = (yyvsp[(1) - (3)].function);
(yyval.function)->parameters.push_tail(& (yyvsp[(3) - (3)].parameter_declarator)->link);
;}
break;
- case 106:
+ case 107:
-/* Line 1464 of yacc.c */
-#line 724 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 738 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.function) = new(ctx) ast_function();
@@ -3538,10 +3553,10 @@ yyreduce: ;}
break;
- case 107:
+ case 108:
-/* Line 1464 of yacc.c */
-#line 735 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 749 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3553,10 +3568,10 @@ yyreduce: ;}
break;
- case 108:
+ case 109:
-/* Line 1464 of yacc.c */
-#line 745 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 759 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3570,10 +3585,10 @@ yyreduce: ;}
break;
- case 109:
+ case 110:
-/* Line 1464 of yacc.c */
-#line 760 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 774 "glsl_parser.ypp"
{
(yyvsp[(1) - (3)].type_qualifier).flags.i |= (yyvsp[(2) - (3)].type_qualifier).flags.i;
@@ -3582,20 +3597,20 @@ yyreduce: ;}
break;
- case 110:
+ case 111:
-/* Line 1464 of yacc.c */
-#line 767 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 781 "glsl_parser.ypp"
{
(yyval.parameter_declarator) = (yyvsp[(2) - (2)].parameter_declarator);
(yyval.parameter_declarator)->type->qualifier = (yyvsp[(1) - (2)].type_qualifier);
;}
break;
- case 111:
+ case 112:
-/* Line 1464 of yacc.c */
-#line 772 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 786 "glsl_parser.ypp"
{
void *ctx = state;
(yyvsp[(1) - (3)].type_qualifier).flags.i |= (yyvsp[(2) - (3)].type_qualifier).flags.i;
@@ -3608,10 +3623,10 @@ yyreduce: ;}
break;
- case 112:
+ case 113:
-/* Line 1464 of yacc.c */
-#line 783 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 797 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3622,39 +3637,39 @@ yyreduce: ;}
break;
- case 113:
+ case 114:
-/* Line 1464 of yacc.c */
-#line 795 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 809 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
;}
break;
- case 114:
+ case 115:
-/* Line 1464 of yacc.c */
-#line 799 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 813 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.in = 1;
;}
break;
- case 115:
+ case 116:
-/* Line 1464 of yacc.c */
-#line 804 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 818 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.out = 1;
;}
break;
- case 116:
+ case 117:
-/* Line 1464 of yacc.c */
-#line 809 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 823 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.in = 1;
@@ -3662,10 +3677,10 @@ yyreduce: ;}
break;
- case 119:
+ case 120:
-/* Line 1464 of yacc.c */
-#line 823 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 837 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (3)].identifier), false, NULL, NULL);
@@ -3676,10 +3691,10 @@ yyreduce: ;}
break;
- case 120:
+ case 121:
-/* Line 1464 of yacc.c */
-#line 832 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 846 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (5)].identifier), true, NULL, NULL);
@@ -3690,10 +3705,10 @@ yyreduce: ;}
break;
- case 121:
+ case 122:
-/* Line 1464 of yacc.c */
-#line 841 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 855 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (6)].identifier), true, (yyvsp[(5) - (6)].expression), NULL);
@@ -3704,10 +3719,10 @@ yyreduce: ;}
break;
- case 122:
+ case 123:
-/* Line 1464 of yacc.c */
-#line 850 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 864 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (7)].identifier), true, NULL, (yyvsp[(7) - (7)].expression));
@@ -3718,10 +3733,10 @@ yyreduce: ;}
break;
- case 123:
+ case 124:
-/* Line 1464 of yacc.c */
-#line 859 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 873 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (8)].identifier), true, (yyvsp[(5) - (8)].expression), (yyvsp[(8) - (8)].expression));
@@ -3732,10 +3747,10 @@ yyreduce: ;}
break;
- case 124:
+ case 125:
-/* Line 1464 of yacc.c */
-#line 868 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 882 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (5)].identifier), false, NULL, (yyvsp[(5) - (5)].expression));
@@ -3746,10 +3761,10 @@ yyreduce: ;}
break;
- case 125:
+ case 126:
-/* Line 1464 of yacc.c */
-#line 881 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 895 "glsl_parser.ypp"
{
void *ctx = state;
if ((yyvsp[(1) - (1)].fully_specified_type)->specifier->type_specifier != ast_struct) {
@@ -3762,10 +3777,10 @@ yyreduce: ;}
break;
- case 126:
+ case 127:
-/* Line 1464 of yacc.c */
-#line 892 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 906 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (2)].identifier), false, NULL, NULL);
@@ -3776,10 +3791,10 @@ yyreduce: ;}
break;
- case 127:
+ case 128:
-/* Line 1464 of yacc.c */
-#line 901 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 915 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), true, NULL, NULL);
@@ -3790,10 +3805,10 @@ yyreduce: ;}
break;
- case 128:
+ case 129:
-/* Line 1464 of yacc.c */
-#line 910 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 924 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (5)].identifier), true, (yyvsp[(4) - (5)].expression), NULL);
@@ -3804,10 +3819,10 @@ yyreduce: ;}
break;
- case 129:
+ case 130:
-/* Line 1464 of yacc.c */
-#line 919 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 933 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (6)].identifier), true, NULL, (yyvsp[(6) - (6)].expression));
@@ -3818,10 +3833,10 @@ yyreduce: ;}
break;
- case 130:
+ case 131:
-/* Line 1464 of yacc.c */
-#line 928 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 942 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (7)].identifier), true, (yyvsp[(4) - (7)].expression), (yyvsp[(7) - (7)].expression));
@@ -3832,10 +3847,10 @@ yyreduce: ;}
break;
- case 131:
+ case 132:
-/* Line 1464 of yacc.c */
-#line 937 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 951 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), false, NULL, (yyvsp[(4) - (4)].expression));
@@ -3846,10 +3861,10 @@ yyreduce: ;}
break;
- case 132:
+ case 133:
-/* Line 1464 of yacc.c */
-#line 946 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 960 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (2)].identifier), false, NULL, NULL);
@@ -3862,10 +3877,10 @@ yyreduce: ;}
break;
- case 133:
+ case 134:
-/* Line 1464 of yacc.c */
-#line 960 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 974 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.fully_specified_type) = new(ctx) ast_fully_specified_type();
@@ -3874,10 +3889,10 @@ yyreduce: ;}
break;
- case 134:
+ case 135:
-/* Line 1464 of yacc.c */
-#line 967 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 981 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.fully_specified_type) = new(ctx) ast_fully_specified_type();
@@ -3887,19 +3902,19 @@ yyreduce: ;}
break;
- case 135:
+ case 136:
-/* Line 1464 of yacc.c */
-#line 978 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 992 "glsl_parser.ypp"
{
(yyval.type_qualifier) = (yyvsp[(3) - (4)].type_qualifier);
;}
break;
- case 137:
+ case 138:
-/* Line 1464 of yacc.c */
-#line 986 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1000 "glsl_parser.ypp"
{
if (((yyvsp[(1) - (3)].type_qualifier).flags.i & (yyvsp[(3) - (3)].type_qualifier).flags.i) != 0) {
_mesa_glsl_error(& (yylsp[(3) - (3)]), state,
@@ -3917,10 +3932,10 @@ yyreduce: ;}
break;
- case 138:
+ case 139:
-/* Line 1464 of yacc.c */
-#line 1005 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1019 "glsl_parser.ypp"
{
bool got_one = false;
@@ -3951,10 +3966,10 @@ yyreduce: ;}
break;
- case 139:
+ case 140:
-/* Line 1464 of yacc.c */
-#line 1034 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1048 "glsl_parser.ypp"
{
bool got_one = false;
@@ -3994,80 +4009,80 @@ yyreduce: ;}
break;
- case 140:
+ case 141:
-/* Line 1464 of yacc.c */
-#line 1075 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1089 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.smooth = 1;
;}
break;
- case 141:
+ case 142:
-/* Line 1464 of yacc.c */
-#line 1080 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1094 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.flat = 1;
;}
break;
- case 142:
+ case 143:
-/* Line 1464 of yacc.c */
-#line 1085 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1099 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.noperspective = 1;
;}
break;
- case 143:
+ case 144:
-/* Line 1464 of yacc.c */
-#line 1093 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1107 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.constant = 1;
;}
break;
- case 146:
+ case 147:
-/* Line 1464 of yacc.c */
-#line 1103 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1117 "glsl_parser.ypp"
{
(yyval.type_qualifier) = (yyvsp[(1) - (2)].type_qualifier);
(yyval.type_qualifier).flags.i |= (yyvsp[(2) - (2)].type_qualifier).flags.i;
;}
break;
- case 148:
+ case 149:
-/* Line 1464 of yacc.c */
-#line 1109 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1123 "glsl_parser.ypp"
{
(yyval.type_qualifier) = (yyvsp[(1) - (2)].type_qualifier);
(yyval.type_qualifier).flags.i |= (yyvsp[(2) - (2)].type_qualifier).flags.i;
;}
break;
- case 149:
+ case 150:
-/* Line 1464 of yacc.c */
-#line 1114 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1128 "glsl_parser.ypp"
{
(yyval.type_qualifier) = (yyvsp[(2) - (2)].type_qualifier);
(yyval.type_qualifier).flags.q.invariant = 1;
;}
break;
- case 150:
+ case 151:
-/* Line 1464 of yacc.c */
-#line 1119 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1133 "glsl_parser.ypp"
{
(yyval.type_qualifier) = (yyvsp[(2) - (3)].type_qualifier);
(yyval.type_qualifier).flags.i |= (yyvsp[(3) - (3)].type_qualifier).flags.i;
@@ -4075,50 +4090,50 @@ yyreduce: ;}
break;
- case 151:
+ case 152:
-/* Line 1464 of yacc.c */
-#line 1125 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1139 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.invariant = 1;
;}
break;
- case 152:
+ case 153:
-/* Line 1464 of yacc.c */
-#line 1133 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1147 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.constant = 1;
;}
break;
- case 153:
+ case 154:
-/* Line 1464 of yacc.c */
-#line 1138 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1152 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.attribute = 1;
;}
break;
- case 154:
+ case 155:
-/* Line 1464 of yacc.c */
-#line 1143 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1157 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.varying = 1;
;}
break;
- case 155:
+ case 156:
-/* Line 1464 of yacc.c */
-#line 1148 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1162 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.centroid = 1;
@@ -4126,70 +4141,70 @@ yyreduce: ;}
break;
- case 156:
+ case 157:
-/* Line 1464 of yacc.c */
-#line 1154 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1168 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.in = 1;
;}
break;
- case 157:
+ case 158:
-/* Line 1464 of yacc.c */
-#line 1159 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1173 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.out = 1;
;}
break;
- case 158:
+ case 159:
-/* Line 1464 of yacc.c */
-#line 1164 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1178 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.centroid = 1; (yyval.type_qualifier).flags.q.in = 1;
;}
break;
- case 159:
+ case 160:
-/* Line 1464 of yacc.c */
-#line 1169 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1183 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.centroid = 1; (yyval.type_qualifier).flags.q.out = 1;
;}
break;
- case 160:
+ case 161:
-/* Line 1464 of yacc.c */
-#line 1174 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1188 "glsl_parser.ypp"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.uniform = 1;
;}
break;
- case 162:
+ case 163:
-/* Line 1464 of yacc.c */
-#line 1183 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1197 "glsl_parser.ypp"
{
(yyval.type_specifier) = (yyvsp[(2) - (2)].type_specifier);
(yyval.type_specifier)->precision = (yyvsp[(1) - (2)].n);
;}
break;
- case 164:
+ case 165:
-/* Line 1464 of yacc.c */
-#line 1192 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1206 "glsl_parser.ypp"
{
(yyval.type_specifier) = (yyvsp[(1) - (3)].type_specifier);
(yyval.type_specifier)->is_array = true;
@@ -4197,10 +4212,10 @@ yyreduce: ;}
break;
- case 165:
+ case 166:
-/* Line 1464 of yacc.c */
-#line 1198 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1212 "glsl_parser.ypp"
{
(yyval.type_specifier) = (yyvsp[(1) - (4)].type_specifier);
(yyval.type_specifier)->is_array = true;
@@ -4208,10 +4223,10 @@ yyreduce: ;}
break;
- case 166:
+ case 167:
-/* Line 1464 of yacc.c */
-#line 1207 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1221 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].n));
@@ -4219,10 +4234,10 @@ yyreduce: ;}
break;
- case 167:
+ case 168:
-/* Line 1464 of yacc.c */
-#line 1213 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1227 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].struct_specifier));
@@ -4230,10 +4245,10 @@ yyreduce: ;}
break;
- case 168:
+ case 169:
-/* Line 1464 of yacc.c */
-#line 1219 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1233 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].identifier));
@@ -4241,367 +4256,367 @@ yyreduce: ;}
break;
- case 169:
+ case 170:
-/* Line 1464 of yacc.c */
-#line 1227 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1241 "glsl_parser.ypp"
{ (yyval.n) = ast_void; ;}
break;
- case 170:
+ case 171:
-/* Line 1464 of yacc.c */
-#line 1228 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1242 "glsl_parser.ypp"
{ (yyval.n) = ast_float; ;}
break;
- case 171:
+ case 172:
-/* Line 1464 of yacc.c */
-#line 1229 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1243 "glsl_parser.ypp"
{ (yyval.n) = ast_int; ;}
break;
- case 172:
+ case 173:
-/* Line 1464 of yacc.c */
-#line 1230 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1244 "glsl_parser.ypp"
{ (yyval.n) = ast_uint; ;}
break;
- case 173:
+ case 174:
-/* Line 1464 of yacc.c */
-#line 1231 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1245 "glsl_parser.ypp"
{ (yyval.n) = ast_bool; ;}
break;
- case 174:
+ case 175:
-/* Line 1464 of yacc.c */
-#line 1232 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1246 "glsl_parser.ypp"
{ (yyval.n) = ast_vec2; ;}
break;
- case 175:
+ case 176:
-/* Line 1464 of yacc.c */
-#line 1233 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1247 "glsl_parser.ypp"
{ (yyval.n) = ast_vec3; ;}
break;
- case 176:
+ case 177:
-/* Line 1464 of yacc.c */
-#line 1234 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1248 "glsl_parser.ypp"
{ (yyval.n) = ast_vec4; ;}
break;
- case 177:
+ case 178:
-/* Line 1464 of yacc.c */
-#line 1235 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1249 "glsl_parser.ypp"
{ (yyval.n) = ast_bvec2; ;}
break;
- case 178:
+ case 179:
-/* Line 1464 of yacc.c */
-#line 1236 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1250 "glsl_parser.ypp"
{ (yyval.n) = ast_bvec3; ;}
break;
- case 179:
+ case 180:
-/* Line 1464 of yacc.c */
-#line 1237 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1251 "glsl_parser.ypp"
{ (yyval.n) = ast_bvec4; ;}
break;
- case 180:
+ case 181:
-/* Line 1464 of yacc.c */
-#line 1238 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1252 "glsl_parser.ypp"
{ (yyval.n) = ast_ivec2; ;}
break;
- case 181:
+ case 182:
-/* Line 1464 of yacc.c */
-#line 1239 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1253 "glsl_parser.ypp"
{ (yyval.n) = ast_ivec3; ;}
break;
- case 182:
+ case 183:
-/* Line 1464 of yacc.c */
-#line 1240 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1254 "glsl_parser.ypp"
{ (yyval.n) = ast_ivec4; ;}
break;
- case 183:
+ case 184:
-/* Line 1464 of yacc.c */
-#line 1241 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1255 "glsl_parser.ypp"
{ (yyval.n) = ast_uvec2; ;}
break;
- case 184:
+ case 185:
-/* Line 1464 of yacc.c */
-#line 1242 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1256 "glsl_parser.ypp"
{ (yyval.n) = ast_uvec3; ;}
break;
- case 185:
+ case 186:
-/* Line 1464 of yacc.c */
-#line 1243 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1257 "glsl_parser.ypp"
{ (yyval.n) = ast_uvec4; ;}
break;
- case 186:
+ case 187:
-/* Line 1464 of yacc.c */
-#line 1244 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1258 "glsl_parser.ypp"
{ (yyval.n) = ast_mat2; ;}
break;
- case 187:
+ case 188:
-/* Line 1464 of yacc.c */
-#line 1245 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1259 "glsl_parser.ypp"
{ (yyval.n) = ast_mat2x3; ;}
break;
- case 188:
+ case 189:
-/* Line 1464 of yacc.c */
-#line 1246 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1260 "glsl_parser.ypp"
{ (yyval.n) = ast_mat2x4; ;}
break;
- case 189:
+ case 190:
-/* Line 1464 of yacc.c */
-#line 1247 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1261 "glsl_parser.ypp"
{ (yyval.n) = ast_mat3x2; ;}
break;
- case 190:
+ case 191:
-/* Line 1464 of yacc.c */
-#line 1248 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1262 "glsl_parser.ypp"
{ (yyval.n) = ast_mat3; ;}
break;
- case 191:
+ case 192:
-/* Line 1464 of yacc.c */
-#line 1249 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1263 "glsl_parser.ypp"
{ (yyval.n) = ast_mat3x4; ;}
break;
- case 192:
+ case 193:
-/* Line 1464 of yacc.c */
-#line 1250 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1264 "glsl_parser.ypp"
{ (yyval.n) = ast_mat4x2; ;}
break;
- case 193:
+ case 194:
-/* Line 1464 of yacc.c */
-#line 1251 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1265 "glsl_parser.ypp"
{ (yyval.n) = ast_mat4x3; ;}
break;
- case 194:
+ case 195:
-/* Line 1464 of yacc.c */
-#line 1252 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1266 "glsl_parser.ypp"
{ (yyval.n) = ast_mat4; ;}
break;
- case 195:
+ case 196:
-/* Line 1464 of yacc.c */
-#line 1253 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1267 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler1d; ;}
break;
- case 196:
+ case 197:
-/* Line 1464 of yacc.c */
-#line 1254 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1268 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2d; ;}
break;
- case 197:
+ case 198:
-/* Line 1464 of yacc.c */
-#line 1255 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1269 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2drect; ;}
break;
- case 198:
+ case 199:
-/* Line 1464 of yacc.c */
-#line 1256 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1270 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler3d; ;}
break;
- case 199:
+ case 200:
-/* Line 1464 of yacc.c */
-#line 1257 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1271 "glsl_parser.ypp"
{ (yyval.n) = ast_samplercube; ;}
break;
- case 200:
+ case 201:
-/* Line 1464 of yacc.c */
-#line 1258 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1272 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler1dshadow; ;}
break;
- case 201:
+ case 202:
-/* Line 1464 of yacc.c */
-#line 1259 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1273 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2dshadow; ;}
break;
- case 202:
+ case 203:
-/* Line 1464 of yacc.c */
-#line 1260 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1274 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2drectshadow; ;}
break;
- case 203:
+ case 204:
-/* Line 1464 of yacc.c */
-#line 1261 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1275 "glsl_parser.ypp"
{ (yyval.n) = ast_samplercubeshadow; ;}
break;
- case 204:
+ case 205:
-/* Line 1464 of yacc.c */
-#line 1262 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1276 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler1darray; ;}
break;
- case 205:
+ case 206:
-/* Line 1464 of yacc.c */
-#line 1263 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1277 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2darray; ;}
break;
- case 206:
+ case 207:
-/* Line 1464 of yacc.c */
-#line 1264 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1278 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler1darrayshadow; ;}
break;
- case 207:
+ case 208:
-/* Line 1464 of yacc.c */
-#line 1265 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1279 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2darrayshadow; ;}
break;
- case 208:
+ case 209:
-/* Line 1464 of yacc.c */
-#line 1266 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1280 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler1d; ;}
break;
- case 209:
+ case 210:
-/* Line 1464 of yacc.c */
-#line 1267 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1281 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler2d; ;}
break;
- case 210:
+ case 211:
-/* Line 1464 of yacc.c */
-#line 1268 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1282 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler3d; ;}
break;
- case 211:
+ case 212:
-/* Line 1464 of yacc.c */
-#line 1269 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1283 "glsl_parser.ypp"
{ (yyval.n) = ast_isamplercube; ;}
break;
- case 212:
+ case 213:
-/* Line 1464 of yacc.c */
-#line 1270 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1284 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler1darray; ;}
break;
- case 213:
+ case 214:
-/* Line 1464 of yacc.c */
-#line 1271 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1285 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler2darray; ;}
break;
- case 214:
+ case 215:
-/* Line 1464 of yacc.c */
-#line 1272 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1286 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler1d; ;}
break;
- case 215:
+ case 216:
-/* Line 1464 of yacc.c */
-#line 1273 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1287 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler2d; ;}
break;
- case 216:
+ case 217:
-/* Line 1464 of yacc.c */
-#line 1274 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1288 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler3d; ;}
break;
- case 217:
+ case 218:
-/* Line 1464 of yacc.c */
-#line 1275 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1289 "glsl_parser.ypp"
{ (yyval.n) = ast_usamplercube; ;}
break;
- case 218:
+ case 219:
-/* Line 1464 of yacc.c */
-#line 1276 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1290 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler1darray; ;}
break;
- case 219:
+ case 220:
-/* Line 1464 of yacc.c */
-#line 1277 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1291 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler2darray; ;}
break;
- case 220:
+ case 221:
-/* Line 1464 of yacc.c */
-#line 1281 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1295 "glsl_parser.ypp"
{
if (!state->es_shader && state->language_version < 130)
_mesa_glsl_error(& (yylsp[(1) - (1)]), state,
@@ -4615,10 +4630,10 @@ yyreduce: ;}
break;
- case 221:
+ case 222:
-/* Line 1464 of yacc.c */
-#line 1292 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1306 "glsl_parser.ypp"
{
if (!state->es_shader && state->language_version < 130)
_mesa_glsl_error(& (yylsp[(1) - (1)]), state,
@@ -4632,10 +4647,10 @@ yyreduce: ;}
break;
- case 222:
+ case 223:
-/* Line 1464 of yacc.c */
-#line 1303 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1317 "glsl_parser.ypp"
{
if (!state->es_shader && state->language_version < 130)
_mesa_glsl_error(& (yylsp[(1) - (1)]), state,
@@ -4649,10 +4664,10 @@ yyreduce: ;}
break;
- case 223:
+ case 224:
-/* Line 1464 of yacc.c */
-#line 1318 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1332 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.struct_specifier) = new(ctx) ast_struct_specifier((yyvsp[(2) - (5)].identifier), (yyvsp[(4) - (5)].node));
@@ -4660,10 +4675,10 @@ yyreduce: ;}
break;
- case 224:
+ case 225:
-/* Line 1464 of yacc.c */
-#line 1324 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1338 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.struct_specifier) = new(ctx) ast_struct_specifier(NULL, (yyvsp[(3) - (4)].node));
@@ -4671,30 +4686,30 @@ yyreduce: ;}
break;
- case 225:
+ case 226:
-/* Line 1464 of yacc.c */
-#line 1333 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1347 "glsl_parser.ypp"
{
(yyval.node) = (ast_node *) (yyvsp[(1) - (1)].declarator_list);
(yyvsp[(1) - (1)].declarator_list)->link.self_link();
;}
break;
- case 226:
+ case 227:
-/* Line 1464 of yacc.c */
-#line 1338 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1352 "glsl_parser.ypp"
{
(yyval.node) = (ast_node *) (yyvsp[(1) - (2)].node);
(yyval.node)->link.insert_before(& (yyvsp[(2) - (2)].declarator_list)->link);
;}
break;
- case 227:
+ case 228:
-/* Line 1464 of yacc.c */
-#line 1346 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1360 "glsl_parser.ypp"
{
void *ctx = state;
ast_fully_specified_type *type = new(ctx) ast_fully_specified_type();
@@ -4708,30 +4723,30 @@ yyreduce: ;}
break;
- case 228:
+ case 229:
-/* Line 1464 of yacc.c */
-#line 1361 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1375 "glsl_parser.ypp"
{
(yyval.declaration) = (yyvsp[(1) - (1)].declaration);
(yyvsp[(1) - (1)].declaration)->link.self_link();
;}
break;
- case 229:
+ case 230:
-/* Line 1464 of yacc.c */
-#line 1366 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1380 "glsl_parser.ypp"
{
(yyval.declaration) = (yyvsp[(1) - (3)].declaration);
(yyval.declaration)->link.insert_before(& (yyvsp[(3) - (3)].declaration)->link);
;}
break;
- case 230:
+ case 231:
-/* Line 1464 of yacc.c */
-#line 1374 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1388 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.declaration) = new(ctx) ast_declaration((yyvsp[(1) - (1)].identifier), false, NULL, NULL);
@@ -4739,10 +4754,10 @@ yyreduce: ;}
break;
- case 231:
+ case 232:
-/* Line 1464 of yacc.c */
-#line 1380 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1394 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.declaration) = new(ctx) ast_declaration((yyvsp[(1) - (4)].identifier), true, (yyvsp[(3) - (4)].expression), NULL);
@@ -4750,31 +4765,31 @@ yyreduce: ;}
break;
- case 234:
+ case 235:
-/* Line 1464 of yacc.c */
-#line 1398 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1412 "glsl_parser.ypp"
{ (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].compound_statement); ;}
break;
- case 239:
+ case 240:
-/* Line 1464 of yacc.c */
-#line 1406 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1420 "glsl_parser.ypp"
{ (yyval.node) = NULL; ;}
break;
- case 240:
+ case 241:
-/* Line 1464 of yacc.c */
-#line 1407 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1421 "glsl_parser.ypp"
{ (yyval.node) = NULL; ;}
break;
- case 243:
+ case 244:
-/* Line 1464 of yacc.c */
-#line 1414 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1428 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(true, NULL);
@@ -4782,10 +4797,10 @@ yyreduce: ;}
break;
- case 244:
+ case 245:
-/* Line 1464 of yacc.c */
-#line 1420 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1434 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(true, (yyvsp[(2) - (3)].node));
@@ -4793,17 +4808,17 @@ yyreduce: ;}
break;
- case 245:
+ case 246:
-/* Line 1464 of yacc.c */
-#line 1428 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1442 "glsl_parser.ypp"
{ (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].compound_statement); ;}
break;
- case 247:
+ case 248:
-/* Line 1464 of yacc.c */
-#line 1434 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1448 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(false, NULL);
@@ -4811,10 +4826,10 @@ yyreduce: ;}
break;
- case 248:
+ case 249:
-/* Line 1464 of yacc.c */
-#line 1440 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1454 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(false, (yyvsp[(2) - (3)].node));
@@ -4822,10 +4837,10 @@ yyreduce: ;}
break;
- case 249:
+ case 250:
-/* Line 1464 of yacc.c */
-#line 1449 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1463 "glsl_parser.ypp"
{
if ((yyvsp[(1) - (1)].node) == NULL) {
_mesa_glsl_error(& (yylsp[(1) - (1)]), state, "<nil> statement\n");
@@ -4837,10 +4852,10 @@ yyreduce: ;}
break;
- case 250:
+ case 251:
-/* Line 1464 of yacc.c */
-#line 1459 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1473 "glsl_parser.ypp"
{
if ((yyvsp[(2) - (2)].node) == NULL) {
_mesa_glsl_error(& (yylsp[(2) - (2)]), state, "<nil> statement\n");
@@ -4851,10 +4866,10 @@ yyreduce: ;}
break;
- case 251:
+ case 252:
-/* Line 1464 of yacc.c */
-#line 1471 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1485 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_expression_statement(NULL);
@@ -4862,10 +4877,10 @@ yyreduce: ;}
break;
- case 252:
+ case 253:
-/* Line 1464 of yacc.c */
-#line 1477 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1491 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_expression_statement((yyvsp[(1) - (2)].expression));
@@ -4873,10 +4888,10 @@ yyreduce: ;}
break;
- case 253:
+ case 254:
-/* Line 1464 of yacc.c */
-#line 1486 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1500 "glsl_parser.ypp"
{
(yyval.node) = new(state) ast_selection_statement((yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].selection_rest_statement).then_statement,
(yyvsp[(5) - (5)].selection_rest_statement).else_statement);
@@ -4884,39 +4899,39 @@ yyreduce: ;}
break;
- case 254:
+ case 255:
-/* Line 1464 of yacc.c */
-#line 1495 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1509 "glsl_parser.ypp"
{
(yyval.selection_rest_statement).then_statement = (yyvsp[(1) - (3)].node);
(yyval.selection_rest_statement).else_statement = (yyvsp[(3) - (3)].node);
;}
break;
- case 255:
+ case 256:
-/* Line 1464 of yacc.c */
-#line 1500 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1514 "glsl_parser.ypp"
{
(yyval.selection_rest_statement).then_statement = (yyvsp[(1) - (1)].node);
(yyval.selection_rest_statement).else_statement = NULL;
;}
break;
- case 256:
+ case 257:
-/* Line 1464 of yacc.c */
-#line 1508 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1522 "glsl_parser.ypp"
{
(yyval.node) = (ast_node *) (yyvsp[(1) - (1)].expression);
;}
break;
- case 257:
+ case 258:
-/* Line 1464 of yacc.c */
-#line 1512 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1526 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), false, NULL, (yyvsp[(4) - (4)].expression));
@@ -4929,10 +4944,10 @@ yyreduce: ;}
break;
- case 261:
+ case 262:
-/* Line 1464 of yacc.c */
-#line 1535 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1549 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_while,
@@ -4941,10 +4956,10 @@ yyreduce: ;}
break;
- case 262:
+ case 263:
-/* Line 1464 of yacc.c */
-#line 1542 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1556 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_do_while,
@@ -4953,10 +4968,10 @@ yyreduce: ;}
break;
- case 263:
+ case 264:
-/* Line 1464 of yacc.c */
-#line 1549 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1563 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_for,
@@ -4965,39 +4980,39 @@ yyreduce: ;}
break;
- case 267:
+ case 268:
-/* Line 1464 of yacc.c */
-#line 1565 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1579 "glsl_parser.ypp"
{
(yyval.node) = NULL;
;}
break;
- case 268:
+ case 269:
-/* Line 1464 of yacc.c */
-#line 1572 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1586 "glsl_parser.ypp"
{
(yyval.for_rest_statement).cond = (yyvsp[(1) - (2)].node);
(yyval.for_rest_statement).rest = NULL;
;}
break;
- case 269:
+ case 270:
-/* Line 1464 of yacc.c */
-#line 1577 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1591 "glsl_parser.ypp"
{
(yyval.for_rest_statement).cond = (yyvsp[(1) - (3)].node);
(yyval.for_rest_statement).rest = (yyvsp[(3) - (3)].expression);
;}
break;
- case 270:
+ case 271:
-/* Line 1464 of yacc.c */
-#line 1586 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1600 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_continue, NULL);
@@ -5005,10 +5020,10 @@ yyreduce: ;}
break;
- case 271:
+ case 272:
-/* Line 1464 of yacc.c */
-#line 1592 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1606 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_break, NULL);
@@ -5016,10 +5031,10 @@ yyreduce: ;}
break;
- case 272:
+ case 273:
-/* Line 1464 of yacc.c */
-#line 1598 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1612 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, NULL);
@@ -5027,10 +5042,10 @@ yyreduce: ;}
break;
- case 273:
+ case 274:
-/* Line 1464 of yacc.c */
-#line 1604 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1618 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, (yyvsp[(2) - (3)].expression));
@@ -5038,10 +5053,10 @@ yyreduce: ;}
break;
- case 274:
+ case 275:
-/* Line 1464 of yacc.c */
-#line 1610 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1624 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_discard, NULL);
@@ -5049,31 +5064,31 @@ yyreduce: ;}
break;
- case 275:
+ case 276:
-/* Line 1464 of yacc.c */
-#line 1618 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1632 "glsl_parser.ypp"
{ (yyval.node) = (yyvsp[(1) - (1)].function_definition); ;}
break;
- case 276:
+ case 277:
-/* Line 1464 of yacc.c */
-#line 1619 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1633 "glsl_parser.ypp"
{ (yyval.node) = (yyvsp[(1) - (1)].node); ;}
break;
- case 277:
+ case 278:
-/* Line 1464 of yacc.c */
-#line 1620 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1634 "glsl_parser.ypp"
{ (yyval.node) = NULL; ;}
break;
- case 278:
+ case 279:
-/* Line 1464 of yacc.c */
-#line 1625 "glsl_parser.ypp"
+/* Line 1455 of yacc.c */
+#line 1639 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.function_definition) = new(ctx) ast_function_definition();
@@ -5085,8 +5100,8 @@ yyreduce: -/* Line 1464 of yacc.c */
-#line 5090 "glsl_parser.cpp"
+/* Line 1455 of yacc.c */
+#line 5105 "glsl_parser.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -5158,7 +5173,7 @@ yyerrlab: #endif
}
- yyerror_range[1] = yylloc;
+ yyerror_range[0] = yylloc;
if (yyerrstatus == 3)
{
@@ -5195,7 +5210,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0)
goto yyerrorlab;
- yyerror_range[1] = yylsp[1-yylen];
+ yyerror_range[0] = yylsp[1-yylen];
/* Do not reclaim the symbols of the rule which action triggered
this YYERROR. */
YYPOPSTACK (yylen);
@@ -5229,7 +5244,7 @@ yyerrlab1: if (yyssp == yyss)
YYABORT;
- yyerror_range[1] = *yylsp;
+ yyerror_range[0] = *yylsp;
yydestruct ("Error: popping",
yystos[yystate], yyvsp, yylsp, state);
YYPOPSTACK (1);
@@ -5239,10 +5254,10 @@ yyerrlab1: *++yyvsp = yylval;
- yyerror_range[2] = yylloc;
+ yyerror_range[1] = yylloc;
/* Using YYLLOC is tempting, but would change the location of
the lookahead. YYLOC is available though. */
- YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
+ YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
*++yylsp = yyloc;
/* Shift the error token. */
diff --git a/mesalib/src/glsl/glsl_parser.h b/mesalib/src/glsl/glsl_parser.h index 6fd70d4cb..d1f555d09 100644 --- a/mesalib/src/glsl/glsl_parser.h +++ b/mesalib/src/glsl/glsl_parser.h @@ -1,9 +1,10 @@ -/* A Bison parser, made by GNU Bison 2.4.3. */
+
+/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -155,79 +156,80 @@ PRAGMA_DEBUG_OFF = 372,
PRAGMA_OPTIMIZE_ON = 373,
PRAGMA_OPTIMIZE_OFF = 374,
- LAYOUT_TOK = 375,
- ASM = 376,
- CLASS = 377,
- UNION = 378,
- ENUM = 379,
- TYPEDEF = 380,
- TEMPLATE = 381,
- THIS = 382,
- PACKED_TOK = 383,
- GOTO = 384,
- INLINE_TOK = 385,
- NOINLINE = 386,
- VOLATILE = 387,
- PUBLIC_TOK = 388,
- STATIC = 389,
- EXTERN = 390,
- EXTERNAL = 391,
- LONG_TOK = 392,
- SHORT_TOK = 393,
- DOUBLE_TOK = 394,
- HALF = 395,
- FIXED_TOK = 396,
- UNSIGNED = 397,
- INPUT_TOK = 398,
- OUPTUT = 399,
- HVEC2 = 400,
- HVEC3 = 401,
- HVEC4 = 402,
- DVEC2 = 403,
- DVEC3 = 404,
- DVEC4 = 405,
- FVEC2 = 406,
- FVEC3 = 407,
- FVEC4 = 408,
- SAMPLER2DRECT = 409,
- SAMPLER3DRECT = 410,
- SAMPLER2DRECTSHADOW = 411,
- SIZEOF = 412,
- CAST = 413,
- NAMESPACE = 414,
- USING = 415,
- ERROR_TOK = 416,
- COMMON = 417,
- PARTITION = 418,
- ACTIVE = 419,
- SAMPLERBUFFER = 420,
- FILTER = 421,
- IMAGE1D = 422,
- IMAGE2D = 423,
- IMAGE3D = 424,
- IMAGECUBE = 425,
- IMAGE1DARRAY = 426,
- IMAGE2DARRAY = 427,
- IIMAGE1D = 428,
- IIMAGE2D = 429,
- IIMAGE3D = 430,
- IIMAGECUBE = 431,
- IIMAGE1DARRAY = 432,
- IIMAGE2DARRAY = 433,
- UIMAGE1D = 434,
- UIMAGE2D = 435,
- UIMAGE3D = 436,
- UIMAGECUBE = 437,
- UIMAGE1DARRAY = 438,
- UIMAGE2DARRAY = 439,
- IMAGE1DSHADOW = 440,
- IMAGE2DSHADOW = 441,
- IMAGEBUFFER = 442,
- IIMAGEBUFFER = 443,
- UIMAGEBUFFER = 444,
- IMAGE1DARRAYSHADOW = 445,
- IMAGE2DARRAYSHADOW = 446,
- ROW_MAJOR = 447
+ PRAGMA_INVARIANT_ALL = 375,
+ LAYOUT_TOK = 376,
+ ASM = 377,
+ CLASS = 378,
+ UNION = 379,
+ ENUM = 380,
+ TYPEDEF = 381,
+ TEMPLATE = 382,
+ THIS = 383,
+ PACKED_TOK = 384,
+ GOTO = 385,
+ INLINE_TOK = 386,
+ NOINLINE = 387,
+ VOLATILE = 388,
+ PUBLIC_TOK = 389,
+ STATIC = 390,
+ EXTERN = 391,
+ EXTERNAL = 392,
+ LONG_TOK = 393,
+ SHORT_TOK = 394,
+ DOUBLE_TOK = 395,
+ HALF = 396,
+ FIXED_TOK = 397,
+ UNSIGNED = 398,
+ INPUT_TOK = 399,
+ OUPTUT = 400,
+ HVEC2 = 401,
+ HVEC3 = 402,
+ HVEC4 = 403,
+ DVEC2 = 404,
+ DVEC3 = 405,
+ DVEC4 = 406,
+ FVEC2 = 407,
+ FVEC3 = 408,
+ FVEC4 = 409,
+ SAMPLER2DRECT = 410,
+ SAMPLER3DRECT = 411,
+ SAMPLER2DRECTSHADOW = 412,
+ SIZEOF = 413,
+ CAST = 414,
+ NAMESPACE = 415,
+ USING = 416,
+ ERROR_TOK = 417,
+ COMMON = 418,
+ PARTITION = 419,
+ ACTIVE = 420,
+ SAMPLERBUFFER = 421,
+ FILTER = 422,
+ IMAGE1D = 423,
+ IMAGE2D = 424,
+ IMAGE3D = 425,
+ IMAGECUBE = 426,
+ IMAGE1DARRAY = 427,
+ IMAGE2DARRAY = 428,
+ IIMAGE1D = 429,
+ IIMAGE2D = 430,
+ IIMAGE3D = 431,
+ IIMAGECUBE = 432,
+ IIMAGE1DARRAY = 433,
+ IIMAGE2DARRAY = 434,
+ UIMAGE1D = 435,
+ UIMAGE2D = 436,
+ UIMAGE3D = 437,
+ UIMAGECUBE = 438,
+ UIMAGE1DARRAY = 439,
+ UIMAGE2DARRAY = 440,
+ IMAGE1DSHADOW = 441,
+ IMAGE2DSHADOW = 442,
+ IMAGEBUFFER = 443,
+ IIMAGEBUFFER = 444,
+ UIMAGEBUFFER = 445,
+ IMAGE1DARRAYSHADOW = 446,
+ IMAGE2DARRAYSHADOW = 447,
+ ROW_MAJOR = 448
};
#endif
@@ -237,7 +239,7 @@ typedef union YYSTYPE
{
-/* Line 1685 of yacc.c */
+/* Line 1676 of yacc.c */
#line 52 "glsl_parser.ypp"
int n;
@@ -270,8 +272,8 @@ typedef union YYSTYPE -/* Line 1685 of yacc.c */
-#line 275 "glsl_parser.h"
+/* Line 1676 of yacc.c */
+#line 277 "glsl_parser.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/mesalib/src/glsl/glsl_parser.ypp b/mesalib/src/glsl/glsl_parser.ypp index c72da6116..e0c5fc1c7 100644 --- a/mesalib/src/glsl/glsl_parser.ypp +++ b/mesalib/src/glsl/glsl_parser.ypp @@ -108,6 +108,7 @@ %token VERSION EXTENSION LINE COLON EOL INTERFACE OUTPUT
%token PRAGMA_DEBUG_ON PRAGMA_DEBUG_OFF
%token PRAGMA_OPTIMIZE_ON PRAGMA_OPTIMIZE_OFF
+%token PRAGMA_INVARIANT_ALL
%token LAYOUT_TOK
/* Reserved words that are not actually used in the grammar.
@@ -241,6 +242,19 @@ pragma_statement: | PRAGMA_DEBUG_OFF EOL
| PRAGMA_OPTIMIZE_ON EOL
| PRAGMA_OPTIMIZE_OFF EOL
+ | PRAGMA_INVARIANT_ALL EOL
+ {
+ if (state->language_version < 120) {
+ _mesa_glsl_warning(& @1, state,
+ "pragma `invariant(all)' not supported in "
+ "GLSL%s %d.%02d",
+ state->es_shader ? " ES" : "",
+ state->language_version / 100,
+ state->language_version % 100);
+ } else {
+ state->all_invariant = true;
+ }
+ }
;
extension_statement_list:
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 50a09f16a..20637918f 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -108,6 +108,13 @@ struct _mesa_glsl_parse_state { /** Was there an error during compilation? */
bool error;
+ /**
+ * Are all shader inputs / outputs invariant?
+ *
+ * This is set when the 'STDGL invariant(all)' pragma is used.
+ */
+ bool all_invariant;
+
/** Loop or switch statement containing the current instructions. */
class ir_instruction *loop_or_switch_nesting;
class ast_iteration_statement *loop_or_switch_nesting_ast;
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index b143827a7..d11047f1d 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -1582,8 +1582,7 @@ _mesa_glsl_initialize_variables(exec_list *instructions, struct _mesa_glsl_parse_state *state);
extern void
-_mesa_glsl_initialize_functions(exec_list *instructions,
- struct _mesa_glsl_parse_state *state);
+_mesa_glsl_initialize_functions(_mesa_glsl_parse_state *state);
extern void
_mesa_glsl_release_functions(void);
diff --git a/mesalib/src/mapi/mapi/table.c b/mesalib/src/mapi/mapi/table.c index ca47d4e04..df2272c98 100644 --- a/mesalib/src/mapi/mapi/table.c +++ b/mesalib/src/mapi/mapi/table.c @@ -40,7 +40,7 @@ noop_warn(const char *name) debug = (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"));
if (debug)
- fprintf(stderr, "%s is no-op", name);
+ fprintf(stderr, "%s is no-op\n", name);
}
static int
diff --git a/mesalib/src/mesa/main/accum.c b/mesalib/src/mesa/main/accum.c index 1e001ab42..752ef70b8 100644 --- a/mesalib/src/mesa/main/accum.c +++ b/mesalib/src/mesa/main/accum.c @@ -27,6 +27,7 @@ #include "context.h"
#include "imports.h"
#include "macros.h"
+#include "mfeatures.h"
#include "state.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c index 98ae3cff7..080c20606 100644 --- a/mesalib/src/mesa/main/api_arrayelt.c +++ b/mesalib/src/mesa/main/api_arrayelt.c @@ -40,6 +40,8 @@ #include "context.h"
#include "imports.h"
#include "macros.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "main/dispatch.h"
typedef void (GLAPIENTRY *array_func)( const void * );
diff --git a/mesalib/src/mesa/main/api_arrayelt.h b/mesalib/src/mesa/main/api_arrayelt.h index 1e5c6dee0..16e938fd0 100644 --- a/mesalib/src/mesa/main/api_arrayelt.h +++ b/mesalib/src/mesa/main/api_arrayelt.h @@ -28,6 +28,7 @@ #define API_ARRAYELT_H
+#include "main/mfeatures.h"
#include "main/mtypes.h"
#if FEATURE_arrayelt
diff --git a/mesalib/src/mesa/main/api_noop.c b/mesalib/src/mesa/main/api_noop.c index f13d3641b..beffa88e4 100644 --- a/mesalib/src/mesa/main/api_noop.c +++ b/mesalib/src/mesa/main/api_noop.c @@ -30,6 +30,7 @@ #include "context.h"
#include "light.h"
#include "macros.h"
+#include "mfeatures.h"
#include "dlist.h"
#include "eval.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/api_noop.h b/mesalib/src/mesa/main/api_noop.h index e7fd49baf..4af2cde6b 100644 --- a/mesalib/src/mesa/main/api_noop.h +++ b/mesalib/src/mesa/main/api_noop.h @@ -1,60 +1,61 @@ -/* - * Mesa 3-D graphics library - * Version: 6.5.1 - * - * Copyright (C) 1999-2006 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"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef _API_NOOP_H -#define _API_NOOP_H - -#include "main/mtypes.h" - -#if FEATURE_beginend - -extern void GLAPIENTRY -_mesa_noop_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); - -extern void GLAPIENTRY -_mesa_noop_EvalMesh1(GLenum mode, GLint i1, GLint i2); - -extern void GLAPIENTRY -_mesa_noop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); - -extern void GLAPIENTRY -_mesa_noop_Materialfv(GLenum face, GLenum pname, const GLfloat *param); - -extern void GLAPIENTRY -_mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, - const GLvoid **indices, GLsizei primcount); - -extern void GLAPIENTRY -_mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, - GLenum type, - const GLvoid **indices, - GLsizei primcount, - const GLint *basevertex); - -extern void -_mesa_noop_vtxfmt_init(GLvertexformat *vfmt); - -#endif /* FEATURE_beginend */ - -#endif /* _API_NOOP_H */ +/*
+ * Mesa 3-D graphics library
+ * Version: 6.5.1
+ *
+ * Copyright (C) 1999-2006 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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _API_NOOP_H
+#define _API_NOOP_H
+
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+
+#if FEATURE_beginend
+
+extern void GLAPIENTRY
+_mesa_noop_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
+
+extern void GLAPIENTRY
+_mesa_noop_EvalMesh1(GLenum mode, GLint i1, GLint i2);
+
+extern void GLAPIENTRY
+_mesa_noop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
+
+extern void GLAPIENTRY
+_mesa_noop_Materialfv(GLenum face, GLenum pname, const GLfloat *param);
+
+extern void GLAPIENTRY
+_mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
+ const GLvoid **indices, GLsizei primcount);
+
+extern void GLAPIENTRY
+_mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
+ GLenum type,
+ const GLvoid **indices,
+ GLsizei primcount,
+ const GLint *basevertex);
+
+extern void
+_mesa_noop_vtxfmt_init(GLvertexformat *vfmt);
+
+#endif /* FEATURE_beginend */
+
+#endif /* _API_NOOP_H */
diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c index 37ecb6b97..2d85b88ae 100644 --- a/mesalib/src/mesa/main/arrayobj.c +++ b/mesalib/src/mesa/main/arrayobj.c @@ -43,11 +43,13 @@ #include "hash.h"
#include "imports.h"
#include "context.h"
+#include "mfeatures.h"
#if FEATURE_ARB_vertex_buffer_object
#include "bufferobj.h"
#endif
#include "arrayobj.h"
#include "macros.h"
+#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/atifragshader.c b/mesalib/src/mesa/main/atifragshader.c index f2a41e30b..1707f0b95 100644 --- a/mesalib/src/mesa/main/atifragshader.c +++ b/mesalib/src/mesa/main/atifragshader.c @@ -26,6 +26,7 @@ #include "main/hash.h"
#include "main/imports.h"
#include "main/macros.h"
+#include "main/mfeatures.h"
#include "main/enums.h"
#include "main/mtypes.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index 23ba36fba..4404c9b30 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -43,6 +43,7 @@ #include "lines.h"
#include "macros.h"
#include "matrix.h"
+#include "mfeatures.h"
#include "multisample.h"
#include "points.h"
#include "polygon.h"
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index a70c75750..31475529e 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -39,6 +39,8 @@ #include "context.h"
#include "bufferobj.h"
#include "fbobject.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "texobj.h"
diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h index 57aa82eda..cf43ad9a2 100644 --- a/mesalib/src/mesa/main/bufferobj.h +++ b/mesalib/src/mesa/main/bufferobj.h @@ -29,6 +29,7 @@ #define BUFFEROBJ_H
+#include "mfeatures.h"
#include "mtypes.h"
diff --git a/mesalib/src/mesa/main/buffers.c b/mesalib/src/mesa/main/buffers.c index cdc174454..1ddf5b2c8 100644 --- a/mesalib/src/mesa/main/buffers.c +++ b/mesalib/src/mesa/main/buffers.c @@ -35,6 +35,7 @@ #include "colormac.h"
#include "context.h"
#include "enums.h"
+#include "mtypes.h"
#define BAD_MASK ~0u
diff --git a/mesalib/src/mesa/main/clear.c b/mesalib/src/mesa/main/clear.c index 3edcbe884..ca831476b 100644 --- a/mesalib/src/mesa/main/clear.c +++ b/mesalib/src/mesa/main/clear.c @@ -36,6 +36,7 @@ #include "colormac.h"
#include "enums.h"
#include "macros.h"
+#include "mtypes.h"
#include "state.h"
diff --git a/mesalib/src/mesa/main/colormac.h b/mesalib/src/mesa/main/colormac.h index 995183aeb..ebad20fc4 100644 --- a/mesalib/src/mesa/main/colormac.h +++ b/mesalib/src/mesa/main/colormac.h @@ -198,10 +198,14 @@ do { \ ((((B) & 0xf8) >> 1) | (((G) & 0xc0) >> 6) | (((G) & 0x38) << 10) | (((R) & 0xf8) << 5) | \
((A) ? 0x80 : 0))
-#define PACK_COLOR_2101010( A, B, G, R ) \
+#define PACK_COLOR_2101010_UB( A, B, G, R ) \
(((B) << 22) | ((G) << 12) | ((R) << 2) | \
(((A) & 0xc0) << 24))
+#define PACK_COLOR_2101010_US( A, B, G, R ) \
+ ((((B) >> 6) << 20) | (((G) >> 6) << 10) | ((R) >> 6) | \
+ (((A) >> 14) << 30))
+
#define PACK_COLOR_4444( R, G, B, A ) \
((((R) & 0xf0) << 8) | (((G) & 0xf0) << 4) | ((B) & 0xf0) | ((A) >> 4))
diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c index a18a67ce2..9c23e253b 100644 --- a/mesalib/src/mesa/main/colortab.c +++ b/mesalib/src/mesa/main/colortab.c @@ -29,6 +29,8 @@ #include "context.h"
#include "image.h"
#include "macros.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "pack.h"
#include "state.h"
#include "teximage.h"
diff --git a/mesalib/src/mesa/main/condrender.c b/mesalib/src/mesa/main/condrender.c index 250397854..2c5ed0269 100644 --- a/mesalib/src/mesa/main/condrender.c +++ b/mesalib/src/mesa/main/condrender.c @@ -34,6 +34,7 @@ #include "glheader.h"
#include "condrender.h"
#include "enums.h"
+#include "mtypes.h"
#include "queryobj.h"
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index a18af86a3..8a4041f68 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -955,6 +955,14 @@ _mesa_initialize_context_for_api(struct gl_context *ctx, ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
}
+ /* Mesa core handles all the formats that mesa core knows about.
+ * Drivers will want to override this list with just the formats
+ * they can handle, and confirm that appropriate fallbacks exist in
+ * _mesa_choose_tex_format().
+ */
+ memset(&ctx->TextureFormatSupported, GL_TRUE,
+ sizeof(ctx->TextureFormatSupported));
+
switch (ctx->API) {
case API_OPENGL:
#if FEATURE_dlist
diff --git a/mesalib/src/mesa/main/convolve.c b/mesalib/src/mesa/main/convolve.c index cd725bb01..1e789dd8c 100644 --- a/mesalib/src/mesa/main/convolve.c +++ b/mesalib/src/mesa/main/convolve.c @@ -36,6 +36,7 @@ #include "colormac.h"
#include "convolve.h"
#include "macros.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/cpuinfo.c b/mesalib/src/mesa/main/cpuinfo.c index 35de69b18..d19aef91b 100644 --- a/mesalib/src/mesa/main/cpuinfo.c +++ b/mesalib/src/mesa/main/cpuinfo.c @@ -1,109 +1,109 @@ -/* - * Mesa 3-D graphics library - * Version: 7.5 - * - * Copyright (C) 2009 VMware, Inc. 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"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - -#include "main/imports.h" -#include "main/cpuinfo.h" - - -/** - * This function should be called before the various "cpu_has_foo" macros - * are used. - */ -void -_mesa_get_cpu_features(void) -{ -#ifdef USE_X86_ASM - _mesa_get_x86_features(); -#endif -} - - -/** - * Return a string describing the CPU architexture and extensions that - * Mesa is using (such as SSE or Altivec). - * \return information string, free it with free() - */ -char * -_mesa_get_cpu_string(void) -{ -#define MAX_STRING 50 - char *buffer; - - buffer = (char *) malloc(MAX_STRING); - if (!buffer) - return NULL; - - buffer[0] = 0; - -#ifdef USE_X86_ASM - - if (_mesa_x86_cpu_features) { - strcat(buffer, "x86"); - } - -# ifdef USE_MMX_ASM - if (cpu_has_mmx) { - strcat(buffer, (cpu_has_mmxext) ? "/MMX+" : "/MMX"); - } -# endif -# ifdef USE_3DNOW_ASM - if (cpu_has_3dnow) { - strcat(buffer, (cpu_has_3dnowext) ? "/3DNow!+" : "/3DNow!"); - } -# endif -# ifdef USE_SSE_ASM - if (cpu_has_xmm) { - strcat(buffer, (cpu_has_xmm2) ? "/SSE2" : "/SSE"); - } -# endif - -#elif defined(USE_SPARC_ASM) - - strcat(buffer, "SPARC"); - -#elif defined(USE_PPC_ASM) - - if (_mesa_ppc_cpu_features) { - strcat(buffer, (cpu_has_64) ? "PowerPC 64" : "PowerPC"); - } - -# ifdef USE_VMX_ASM - - if (cpu_has_vmx) { - strcat(buffer, "/Altivec"); - } - -# endif - - if (! cpu_has_fpu) { - strcat(buffer, "/No FPU"); - } - -#endif - - assert(strlen(buffer) < MAX_STRING); - - return buffer; -} +/*
+ * Mesa 3-D graphics library
+ * Version: 7.5
+ *
+ * Copyright (C) 2009 VMware, Inc. 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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "main/compiler.h"
+#include "main/cpuinfo.h"
+
+
+/**
+ * This function should be called before the various "cpu_has_foo" macros
+ * are used.
+ */
+void
+_mesa_get_cpu_features(void)
+{
+#ifdef USE_X86_ASM
+ _mesa_get_x86_features();
+#endif
+}
+
+
+/**
+ * Return a string describing the CPU architexture and extensions that
+ * Mesa is using (such as SSE or Altivec).
+ * \return information string, free it with free()
+ */
+char *
+_mesa_get_cpu_string(void)
+{
+#define MAX_STRING 50
+ char *buffer;
+
+ buffer = (char *) malloc(MAX_STRING);
+ if (!buffer)
+ return NULL;
+
+ buffer[0] = 0;
+
+#ifdef USE_X86_ASM
+
+ if (_mesa_x86_cpu_features) {
+ strcat(buffer, "x86");
+ }
+
+# ifdef USE_MMX_ASM
+ if (cpu_has_mmx) {
+ strcat(buffer, (cpu_has_mmxext) ? "/MMX+" : "/MMX");
+ }
+# endif
+# ifdef USE_3DNOW_ASM
+ if (cpu_has_3dnow) {
+ strcat(buffer, (cpu_has_3dnowext) ? "/3DNow!+" : "/3DNow!");
+ }
+# endif
+# ifdef USE_SSE_ASM
+ if (cpu_has_xmm) {
+ strcat(buffer, (cpu_has_xmm2) ? "/SSE2" : "/SSE");
+ }
+# endif
+
+#elif defined(USE_SPARC_ASM)
+
+ strcat(buffer, "SPARC");
+
+#elif defined(USE_PPC_ASM)
+
+ if (_mesa_ppc_cpu_features) {
+ strcat(buffer, (cpu_has_64) ? "PowerPC 64" : "PowerPC");
+ }
+
+# ifdef USE_VMX_ASM
+
+ if (cpu_has_vmx) {
+ strcat(buffer, "/Altivec");
+ }
+
+# endif
+
+ if (! cpu_has_fpu) {
+ strcat(buffer, "/No FPU");
+ }
+
+#endif
+
+ assert(strlen(buffer) < MAX_STRING);
+
+ return buffer;
+}
diff --git a/mesalib/src/mesa/main/dlist.h b/mesalib/src/mesa/main/dlist.h index 784368d1a..b954e06df 100644 --- a/mesalib/src/mesa/main/dlist.h +++ b/mesalib/src/mesa/main/dlist.h @@ -33,6 +33,7 @@ #define DLIST_H
+#include "main/mfeatures.h"
#include "main/mtypes.h"
diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c index 40a1cb5df..d7628c8f7 100644 --- a/mesalib/src/mesa/main/drawpix.c +++ b/mesalib/src/mesa/main/drawpix.c @@ -30,6 +30,7 @@ #include "enums.h"
#include "feedback.h"
#include "framebuffer.h"
+#include "mfeatures.h"
#include "readpix.h"
#include "state.h"
#include "dispatch.h"
diff --git a/mesalib/src/mesa/main/drawtex.c b/mesalib/src/mesa/main/drawtex.c index 3e91f15bc..e386e90f6 100644 --- a/mesalib/src/mesa/main/drawtex.c +++ b/mesalib/src/mesa/main/drawtex.c @@ -24,6 +24,8 @@ #include "main/drawtex.h"
#include "main/state.h"
#include "main/imports.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
#if FEATURE_OES_draw_texture
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c index c3dbd4a29..c91337355 100644 --- a/mesalib/src/mesa/main/enable.c +++ b/mesalib/src/mesa/main/enable.c @@ -33,6 +33,7 @@ #include "enable.h"
#include "light.h"
#include "simple_list.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "enums.h"
#include "api_arrayelt.h"
diff --git a/mesalib/src/mesa/main/eval.c b/mesalib/src/mesa/main/eval.c index d7666a630..8eeeb2aea 100644 --- a/mesalib/src/mesa/main/eval.c +++ b/mesalib/src/mesa/main/eval.c @@ -43,6 +43,7 @@ #include "context.h"
#include "eval.h"
#include "macros.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/eval.h b/mesalib/src/mesa/main/eval.h index b92e41e9f..c6a37c135 100644 --- a/mesalib/src/mesa/main/eval.h +++ b/mesalib/src/mesa/main/eval.h @@ -37,6 +37,7 @@ #define EVAL_H
+#include "main/mfeatures.h"
#include "main/mtypes.h"
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index 81978b3c1..4b656a70f 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -28,6 +28,7 @@ #include "imports.h"
#include "context.h"
#include "extensions.h"
+#include "mfeatures.h"
#include "mtypes.h"
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index fce9e5bba..4f7a527c3 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -40,6 +40,8 @@ #include "framebuffer.h"
#include "hash.h"
#include "macros.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "renderbuffer.h"
#include "state.h"
#include "teximage.h"
@@ -402,8 +404,8 @@ fbo_incomplete(const char *msg, int index) /**
* Is the given base format a legal format for a color renderbuffer?
*/
-static GLboolean
-is_legal_color_format(const struct gl_context *ctx, GLenum baseFormat)
+GLboolean
+_mesa_is_legal_color_format(const struct gl_context *ctx, GLenum baseFormat)
{
switch (baseFormat) {
case GL_RGB:
@@ -488,7 +490,7 @@ test_attachment_completeness(const struct gl_context *ctx, GLenum format, baseFormat = _mesa_get_format_base_format(texImage->TexFormat);
if (format == GL_COLOR) {
- if (!is_legal_color_format(ctx, baseFormat)) {
+ if (!_mesa_is_legal_color_format(ctx, baseFormat)) {
att_incomplete("bad format");
att->Complete = GL_FALSE;
return;
@@ -542,8 +544,7 @@ test_attachment_completeness(const struct gl_context *ctx, GLenum format, return;
}
if (format == GL_COLOR) {
- if (baseFormat != GL_RGB &&
- baseFormat != GL_RGBA) {
+ if (!_mesa_is_legal_color_format(ctx, baseFormat)) {
att_incomplete("bad renderbuffer color format");
att->Complete = GL_FALSE;
return;
@@ -669,7 +670,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, f = texImg->_BaseFormat;
mesaFormat = texImg->TexFormat;
numImages++;
- if (!is_legal_color_format(ctx, f) &&
+ if (!_mesa_is_legal_color_format(ctx, f) &&
!is_legal_depth_format(ctx, f)) {
fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;
fbo_incomplete("texture attachment incomplete", -1);
@@ -793,7 +794,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, fb->Height = minHeight;
/* finally, update the visual info for the framebuffer */
- _mesa_update_framebuffer_visual(fb);
+ _mesa_update_framebuffer_visual(ctx, fb);
}
}
@@ -1172,8 +1173,17 @@ get_component_bits(GLenum pname, GLenum baseFormat, gl_format format) switch (pname) {
case GL_RENDERBUFFER_RED_SIZE_EXT:
case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
+ if (baseFormat == GL_RGB || baseFormat == GL_RGBA ||
+ baseFormat == GL_RG || baseFormat == GL_RED)
+ return _mesa_get_format_bits(format, pname);
+ else
+ return 0;
case GL_RENDERBUFFER_GREEN_SIZE_EXT:
case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
+ if (baseFormat == GL_RGB || baseFormat == GL_RGBA || baseFormat == GL_RG)
+ return _mesa_get_format_bits(format, pname);
+ else
+ return 0;
case GL_RENDERBUFFER_BLUE_SIZE_EXT:
case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
if (baseFormat == GL_RGB || baseFormat == GL_RGBA)
@@ -1182,7 +1192,8 @@ get_component_bits(GLenum pname, GLenum baseFormat, gl_format format) return 0;
case GL_RENDERBUFFER_ALPHA_SIZE_EXT:
case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:
- if (baseFormat == GL_RGBA || baseFormat == GL_ALPHA)
+ if (baseFormat == GL_RGBA || baseFormat == GL_ALPHA ||
+ baseFormat == GL_LUMINANCE_ALPHA)
return _mesa_get_format_bits(format, pname);
else
return 0;
@@ -1940,7 +1951,7 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, /* Some subsequent GL commands may depend on the framebuffer's visual
* after the binding is updated. Update visual info now.
*/
- _mesa_update_framebuffer_visual(fb);
+ _mesa_update_framebuffer_visual(ctx, fb);
}
diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h index 5d250fba1..0e0e348a6 100644 --- a/mesalib/src/mesa/main/fbobject.h +++ b/mesalib/src/mesa/main/fbobject.h @@ -71,6 +71,9 @@ _mesa_framebuffer_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb extern void
_mesa_test_framebuffer_completeness(struct gl_context *ctx, struct gl_framebuffer *fb);
+extern GLboolean
+_mesa_is_legal_color_format(const struct gl_context *ctx, GLenum baseFormat);
+
extern GLenum
_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat);
diff --git a/mesalib/src/mesa/main/feedback.c b/mesalib/src/mesa/main/feedback.c index 5ce0880c2..80565c62c 100644 --- a/mesalib/src/mesa/main/feedback.c +++ b/mesalib/src/mesa/main/feedback.c @@ -35,6 +35,7 @@ #include "enums.h"
#include "feedback.h"
#include "macros.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/feedback.h b/mesalib/src/mesa/main/feedback.h index 06a07725d..24ce53af4 100644 --- a/mesalib/src/mesa/main/feedback.h +++ b/mesalib/src/mesa/main/feedback.h @@ -27,6 +27,7 @@ #define FEEDBACK_H
+#include "main/mfeatures.h"
#include "main/mtypes.h"
diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c index 60b200419..281229e34 100644 --- a/mesalib/src/mesa/main/ffvertex_prog.c +++ b/mesalib/src/mesa/main/ffvertex_prog.c @@ -36,6 +36,7 @@ #include "main/glheader.h"
#include "main/mtypes.h"
#include "main/macros.h"
+#include "main/mfeatures.h"
#include "main/enums.h"
#include "main/ffvertex_prog.h"
#include "program/program.h"
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c index b7aecb396..d17619ef1 100644 --- a/mesalib/src/mesa/main/formats.c +++ b/mesalib/src/mesa/main/formats.c @@ -40,9 +40,10 @@ struct gl_format_info const char *StrName;
/**
- * Base format is one of GL_RGB, GL_RGBA, GL_ALPHA, GL_LUMINANCE,
- * GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_YCBCR_MESA, GL_COLOR_INDEX,
- * GL_DEPTH_COMPONENT, GL_STENCIL_INDEX, GL_DEPTH_STENCIL.
+ * Base format is one of GL_RED, GL_RG, GL_RGB, GL_RGBA, GL_ALPHA,
+ * GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_YCBCR_MESA,
+ * GL_COLOR_INDEX, GL_DEPTH_COMPONENT, GL_STENCIL_INDEX,
+ * GL_DEPTH_STENCIL, GL_DUDV_ATI.
*/
GLenum BaseFormat;
diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c index f8c0c6379..5833e5d58 100644 --- a/mesalib/src/mesa/main/framebuffer.c +++ b/mesalib/src/mesa/main/framebuffer.c @@ -522,7 +522,8 @@ _mesa_update_draw_buffer_bounds(struct gl_context *ctx) * integer Z values.
*/
void
-_mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
+_mesa_update_framebuffer_visual(struct gl_context *ctx,
+ struct gl_framebuffer *fb)
{
GLuint i;
@@ -542,9 +543,8 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb) const struct gl_renderbuffer *rb = fb->Attachment[i].Renderbuffer;
const GLenum baseFormat = _mesa_get_format_base_format(rb->Format);
const gl_format fmt = rb->Format;
-
- if (baseFormat == GL_RGBA || baseFormat == GL_RGB ||
- baseFormat == GL_ALPHA) {
+
+ if (_mesa_is_legal_color_format(ctx, baseFormat)) {
fb->Visual.redBits = _mesa_get_format_bits(fmt, GL_RED_BITS);
fb->Visual.greenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS);
fb->Visual.blueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS);
diff --git a/mesalib/src/mesa/main/framebuffer.h b/mesalib/src/mesa/main/framebuffer.h index 6b705146a..261f84515 100644 --- a/mesalib/src/mesa/main/framebuffer.h +++ b/mesalib/src/mesa/main/framebuffer.h @@ -70,7 +70,8 @@ extern void _mesa_update_draw_buffer_bounds(struct gl_context *ctx);
extern void
-_mesa_update_framebuffer_visual(struct gl_framebuffer *fb);
+_mesa_update_framebuffer_visual(struct gl_context *ctx,
+ struct gl_framebuffer *fb);
extern void
_mesa_update_depth_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index cb6880a6f..f13f6572a 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -29,6 +29,7 @@ #include "extensions.h"
#include "get.h"
#include "macros.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "state.h"
#include "texcompress.h"
diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c index 103a4942a..e55584afc 100644 --- a/mesalib/src/mesa/main/getstring.c +++ b/mesalib/src/mesa/main/getstring.c @@ -29,6 +29,8 @@ #include "get.h"
#include "enums.h"
#include "extensions.h"
+#include "mfeatures.h"
+#include "mtypes.h"
/**
diff --git a/mesalib/src/mesa/main/hint.c b/mesalib/src/mesa/main/hint.c index ccec1d285..96f5f4d6b 100644 --- a/mesalib/src/mesa/main/hint.c +++ b/mesalib/src/mesa/main/hint.c @@ -29,6 +29,7 @@ #include "context.h"
#include "hint.h"
#include "imports.h"
+#include "mtypes.h"
diff --git a/mesalib/src/mesa/main/histogram.c b/mesalib/src/mesa/main/histogram.c index f12428121..fc79feb68 100644 --- a/mesalib/src/mesa/main/histogram.c +++ b/mesalib/src/mesa/main/histogram.c @@ -28,6 +28,7 @@ #include "colormac.h"
#include "histogram.h"
#include "macros.h"
+#include "mfeatures.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c index 08d25c8d1..fa9e8b9bb 100644 --- a/mesalib/src/mesa/main/image.c +++ b/mesalib/src/mesa/main/image.c @@ -35,6 +35,8 @@ #include "image.h"
#include "imports.h"
#include "macros.h"
+#include "mfeatures.h"
+#include "mtypes.h"
/**
diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c index 6bfa734b8..dcd8cf537 100644 --- a/mesalib/src/mesa/main/imports.c +++ b/mesalib/src/mesa/main/imports.c @@ -46,6 +46,7 @@ #include "imports.h"
#include "context.h"
+#include "mtypes.h"
#include "version.h"
#ifdef _GNU_SOURCE
diff --git a/mesalib/src/mesa/main/matrix.c b/mesalib/src/mesa/main/matrix.c index 3fae85cad..5ac6f8108 100644 --- a/mesalib/src/mesa/main/matrix.c +++ b/mesalib/src/mesa/main/matrix.c @@ -40,6 +40,7 @@ #include "context.h"
#include "enums.h"
#include "macros.h"
+#include "mfeatures.h"
#include "matrix.h"
#include "mtypes.h"
#include "math/m_matrix.h"
diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c index cf85782bc..d27179e86 100644 --- a/mesalib/src/mesa/main/mipmap.c +++ b/mesalib/src/mesa/main/mipmap.c @@ -30,6 +30,7 @@ #include "imports.h"
#include "formats.h"
#include "mipmap.h"
+#include "mtypes.h"
#include "teximage.h"
#include "texstore.h"
#include "image.h"
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 7cac96c1d..df84db93f 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -40,6 +40,7 @@ #include "glapi/glapi.h"
#include "math/m_matrix.h" /* GLmatrix */
#include "main/simple_list.h" /* struct simple_node */
+#include "main/formats.h" /* MESA_FORMAT_COUNT */
/**
@@ -3240,6 +3241,8 @@ struct gl_context /** software compression/decompression supported or not */
GLboolean Mesa_DXTn;
+ GLboolean TextureFormatSupported[MESA_FORMAT_COUNT];
+
/**
* Use dp4 (rather than mul/mad) instructions for position
* transformation?
diff --git a/mesalib/src/mesa/main/multisample.c b/mesalib/src/mesa/main/multisample.c index 824778195..4eb1ab3a3 100644 --- a/mesalib/src/mesa/main/multisample.c +++ b/mesalib/src/mesa/main/multisample.c @@ -27,6 +27,7 @@ #include "main/context.h"
#include "main/macros.h"
#include "main/multisample.h"
+#include "main/mtypes.h"
/**
diff --git a/mesalib/src/mesa/main/nvprogram.c b/mesalib/src/mesa/main/nvprogram.c index 89b9bc426..6b20fdae6 100644 --- a/mesalib/src/mesa/main/nvprogram.c +++ b/mesalib/src/mesa/main/nvprogram.c @@ -42,6 +42,7 @@ #include "main/hash.h"
#include "main/imports.h"
#include "main/macros.h"
+#include "main/mtypes.h"
#include "main/nvprogram.h"
#include "program/arbprogparse.h"
#include "program/nvfragparse.h"
diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c index f323c51f1..6463ddfbd 100644 --- a/mesalib/src/mesa/main/pack.c +++ b/mesalib/src/mesa/main/pack.c @@ -34,6 +34,7 @@ #include "enums.h"
#include "image.h"
#include "imports.h"
+#include "mtypes.h"
#include "pack.h"
#include "pixeltransfer.h"
#include "imports.h"
diff --git a/mesalib/src/mesa/main/pixel.c b/mesalib/src/mesa/main/pixel.c index db1f05a58..2b4934fd3 100644 --- a/mesalib/src/mesa/main/pixel.c +++ b/mesalib/src/mesa/main/pixel.c @@ -33,6 +33,7 @@ #include "colormac.h"
#include "context.h"
#include "macros.h"
+#include "mfeatures.h"
#include "pixel.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/pixelstore.c b/mesalib/src/mesa/main/pixelstore.c index 5d90391ca..f07115e6d 100644 --- a/mesalib/src/mesa/main/pixelstore.c +++ b/mesalib/src/mesa/main/pixelstore.c @@ -32,6 +32,7 @@ #include "bufferobj.h"
#include "context.h"
#include "pixelstore.h"
+#include "mfeatures.h"
#include "mtypes.h"
diff --git a/mesalib/src/mesa/main/pixeltransfer.c b/mesalib/src/mesa/main/pixeltransfer.c index 67173ce3e..092ee3a14 100644 --- a/mesalib/src/mesa/main/pixeltransfer.c +++ b/mesalib/src/mesa/main/pixeltransfer.c @@ -33,6 +33,7 @@ #include "colormac.h"
#include "pixeltransfer.h"
#include "imports.h"
+#include "mtypes.h"
/*
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c index a8e1e8101..1c45c38b9 100644 --- a/mesalib/src/mesa/main/queryobj.c +++ b/mesalib/src/mesa/main/queryobj.c @@ -28,6 +28,7 @@ #include "hash.h"
#include "imports.h"
#include "queryobj.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h index 71a93de85..4e8a1455b 100644 --- a/mesalib/src/mesa/main/queryobj.h +++ b/mesalib/src/mesa/main/queryobj.h @@ -27,6 +27,7 @@ #define QUERYOBJ_H
+#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/hash.h"
diff --git a/mesalib/src/mesa/main/rastpos.c b/mesalib/src/mesa/main/rastpos.c index 372b177c4..70f67d398 100644 --- a/mesalib/src/mesa/main/rastpos.c +++ b/mesalib/src/mesa/main/rastpos.c @@ -32,6 +32,8 @@ #include "context.h"
#include "feedback.h"
#include "macros.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "rastpos.h"
#include "state.h"
#include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c index 986dbb60a..9887fd816 100644 --- a/mesalib/src/mesa/main/readpix.c +++ b/mesalib/src/mesa/main/readpix.c @@ -30,6 +30,7 @@ #include "framebuffer.h"
#include "formats.h"
#include "image.h"
+#include "mtypes.h"
#include "state.h"
diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c index ddc2fe30d..0b51ac123 100644 --- a/mesalib/src/mesa/main/renderbuffer.c +++ b/mesalib/src/mesa/main/renderbuffer.c @@ -1481,7 +1481,7 @@ _mesa_add_color_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb, GLboolean frontLeft, GLboolean backLeft,
GLboolean frontRight, GLboolean backRight)
{
- GLuint b;
+ gl_buffer_index b;
if (rgbBits > 16 || alphaBits > 16) {
_mesa_problem(ctx,
@@ -1545,7 +1545,7 @@ _mesa_add_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb, GLboolean frontLeft, GLboolean backLeft,
GLboolean frontRight, GLboolean backRight)
{
- GLuint b;
+ gl_buffer_index b;
/* for window system framebuffers only! */
assert(fb->Name == 0);
@@ -1883,10 +1883,11 @@ _mesa_add_soft_renderbuffers(struct gl_framebuffer *fb, /**
* Attach a renderbuffer to a framebuffer.
+ * \param bufferName one of the BUFFER_x tokens
*/
void
_mesa_add_renderbuffer(struct gl_framebuffer *fb,
- GLuint bufferName, struct gl_renderbuffer *rb)
+ gl_buffer_index bufferName, struct gl_renderbuffer *rb)
{
assert(fb);
assert(rb);
@@ -1916,9 +1917,11 @@ _mesa_add_renderbuffer(struct gl_framebuffer *fb, /**
* Remove the named renderbuffer from the given framebuffer.
+ * \param bufferName one of the BUFFER_x tokens
*/
void
-_mesa_remove_renderbuffer(struct gl_framebuffer *fb, GLuint bufferName)
+_mesa_remove_renderbuffer(struct gl_framebuffer *fb,
+ gl_buffer_index bufferName)
{
struct gl_renderbuffer *rb;
diff --git a/mesalib/src/mesa/main/renderbuffer.h b/mesalib/src/mesa/main/renderbuffer.h index c93eef4b8..12a06a58a 100644 --- a/mesalib/src/mesa/main/renderbuffer.h +++ b/mesalib/src/mesa/main/renderbuffer.h @@ -27,6 +27,7 @@ #define RENDERBUFFER_H
#include "glheader.h"
+#include "mtypes.h"
struct gl_context;
struct gl_framebuffer;
@@ -95,10 +96,11 @@ _mesa_add_soft_renderbuffers(struct gl_framebuffer *fb, extern void
_mesa_add_renderbuffer(struct gl_framebuffer *fb,
- GLuint bufferName, struct gl_renderbuffer *rb);
+ gl_buffer_index bufferName, struct gl_renderbuffer *rb);
extern void
-_mesa_remove_renderbuffer(struct gl_framebuffer *fb, GLuint bufferName);
+_mesa_remove_renderbuffer(struct gl_framebuffer *fb,
+ gl_buffer_index bufferName);
extern void
_mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
diff --git a/mesalib/src/mesa/main/scissor.c b/mesalib/src/mesa/main/scissor.c index 716b16b80..16e8438c5 100644 --- a/mesalib/src/mesa/main/scissor.c +++ b/mesalib/src/mesa/main/scissor.c @@ -25,6 +25,7 @@ #include "main/glheader.h"
#include "main/context.h"
+#include "main/mtypes.h"
#include "main/scissor.h"
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c index d84273263..bcc7ec019 100644 --- a/mesalib/src/mesa/main/shaderapi.c +++ b/mesalib/src/mesa/main/shaderapi.c @@ -41,6 +41,8 @@ #include "main/dispatch.h"
#include "main/enums.h"
#include "main/hash.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "program/program.h"
diff --git a/mesalib/src/mesa/main/shaderobj.c b/mesalib/src/mesa/main/shaderobj.c index 60f133691..efee05ac6 100644 --- a/mesalib/src/mesa/main/shaderobj.c +++ b/mesalib/src/mesa/main/shaderobj.c @@ -32,6 +32,8 @@ #include "main/glheader.h"
#include "main/context.h"
#include "main/hash.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
#include "main/shaderobj.h"
#include "program/program.h"
#include "program/prog_parameter.h"
diff --git a/mesalib/src/mesa/main/shared.c b/mesalib/src/mesa/main/shared.c index bfbddaaa0..9a2b90c8e 100644 --- a/mesalib/src/mesa/main/shared.c +++ b/mesalib/src/mesa/main/shared.c @@ -30,6 +30,7 @@ #include "imports.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "hash.h"
#if FEATURE_ATI_fragment_shader
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c index eaffbfb9d..676038430 100644 --- a/mesalib/src/mesa/main/syncobj.c +++ b/mesalib/src/mesa/main/syncobj.c @@ -59,8 +59,10 @@ #include "imports.h"
#include "context.h"
#include "macros.h"
+#include "mfeatures.h"
#include "get.h"
#include "dispatch.h"
+#include "mtypes.h"
#if FEATURE_ARB_sync
#include "syncobj.h"
diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c index 52954ece4..eaebb06d3 100644 --- a/mesalib/src/mesa/main/texcompress.c +++ b/mesalib/src/mesa/main/texcompress.c @@ -34,6 +34,8 @@ #include "imports.h"
#include "colormac.h"
#include "formats.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "texcompress.h"
diff --git a/mesalib/src/mesa/main/texcompress_fxt1.c b/mesalib/src/mesa/main/texcompress_fxt1.c index e6dd7f364..261014d63 100644 --- a/mesalib/src/mesa/main/texcompress_fxt1.c +++ b/mesalib/src/mesa/main/texcompress_fxt1.c @@ -34,6 +34,7 @@ #include "colormac.h"
#include "image.h"
#include "macros.h"
+#include "mfeatures.h"
#include "mipmap.h"
#include "texcompress.h"
#include "texcompress_fxt1.h"
diff --git a/mesalib/src/mesa/main/texcompress_fxt1.h b/mesalib/src/mesa/main/texcompress_fxt1.h index 38048b26c..a6beb07e5 100644 --- a/mesalib/src/mesa/main/texcompress_fxt1.h +++ b/mesalib/src/mesa/main/texcompress_fxt1.h @@ -1,61 +1,62 @@ -/* - * Mesa 3-D graphics library - * Version: 7.1 - * - * Copyright (C) 1999-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"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef TEXCOMPRESS_FXT1_H -#define TEXCOMPRESS_FXT1_H - -#include "glheader.h" -#include "texstore.h" - -struct gl_texture_image; - -#if FEATURE_texture_fxt1 - -extern GLboolean -_mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS); - -extern GLboolean -_mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS); - -extern void -_mesa_fetch_texel_2d_f_rgba_fxt1(const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -extern void -_mesa_fetch_texel_2d_f_rgb_fxt1(const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -#else /* FEATURE_texture_fxt1 */ - -/* these are used only in texstore_funcs[] */ -#define _mesa_texstore_rgb_fxt1 NULL -#define _mesa_texstore_rgba_fxt1 NULL - -/* these are used only in texfetch_funcs[] */ -#define _mesa_fetch_texel_2d_f_rgba_fxt1 NULL -#define _mesa_fetch_texel_2d_f_rgb_fxt1 NULL - -#endif /* FEATURE_texture_fxt1 */ - -#endif /* TEXCOMPRESS_FXT1_H */ +/*
+ * Mesa 3-D graphics library
+ * Version: 7.1
+ *
+ * Copyright (C) 1999-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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef TEXCOMPRESS_FXT1_H
+#define TEXCOMPRESS_FXT1_H
+
+#include "glheader.h"
+#include "mfeatures.h"
+#include "texstore.h"
+
+struct gl_texture_image;
+
+#if FEATURE_texture_fxt1
+
+extern GLboolean
+_mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS);
+
+extern GLboolean
+_mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS);
+
+extern void
+_mesa_fetch_texel_2d_f_rgba_fxt1(const struct gl_texture_image *texImage,
+ GLint i, GLint j, GLint k, GLfloat *texel);
+
+extern void
+_mesa_fetch_texel_2d_f_rgb_fxt1(const struct gl_texture_image *texImage,
+ GLint i, GLint j, GLint k, GLfloat *texel);
+
+#else /* FEATURE_texture_fxt1 */
+
+/* these are used only in texstore_funcs[] */
+#define _mesa_texstore_rgb_fxt1 NULL
+#define _mesa_texstore_rgba_fxt1 NULL
+
+/* these are used only in texfetch_funcs[] */
+#define _mesa_fetch_texel_2d_f_rgba_fxt1 NULL
+#define _mesa_fetch_texel_2d_f_rgb_fxt1 NULL
+
+#endif /* FEATURE_texture_fxt1 */
+
+#endif /* TEXCOMPRESS_FXT1_H */
diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c index 307ca9436..90be6c0a8 100644 --- a/mesalib/src/mesa/main/texcompress_s3tc.c +++ b/mesalib/src/mesa/main/texcompress_s3tc.c @@ -39,6 +39,8 @@ #include "dlopen.h"
#include "image.h"
#include "macros.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "texcompress.h"
#include "texcompress_s3tc.h"
#include "texstore.h"
diff --git a/mesalib/src/mesa/main/texenv.c b/mesalib/src/mesa/main/texenv.c index 5669cc4bc..c802f6f3b 100644 --- a/mesalib/src/mesa/main/texenv.c +++ b/mesalib/src/mesa/main/texenv.c @@ -34,6 +34,7 @@ #include "main/context.h"
#include "main/enums.h"
#include "main/macros.h"
+#include "main/mtypes.h"
#include "main/texenv.h"
#include "main/texstate.h"
diff --git a/mesalib/src/mesa/main/texenvprogram.c b/mesalib/src/mesa/main/texenvprogram.c index aa318f7de..af631af14 100644 --- a/mesalib/src/mesa/main/texenvprogram.c +++ b/mesalib/src/mesa/main/texenvprogram.c @@ -28,6 +28,7 @@ #include "glheader.h"
#include "imports.h"
+#include "mtypes.h"
#include "program/program.h"
#include "program/prog_parameter.h"
#include "program/prog_cache.h"
diff --git a/mesalib/src/mesa/main/texfetch_tmp.h b/mesalib/src/mesa/main/texfetch_tmp.h index 40f56209f..9c2b36a02 100644 --- a/mesalib/src/mesa/main/texfetch_tmp.h +++ b/mesalib/src/mesa/main/texfetch_tmp.h @@ -837,7 +837,7 @@ static void store_texel_argb2101010(struct gl_texture_image *texImage, {
const GLubyte *rgba = (const GLubyte *) texel;
GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
- *dst = PACK_COLOR_2101010(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
+ *dst = PACK_COLOR_2101010_UB(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
}
#endif
@@ -899,8 +899,8 @@ static void FETCH(f_al44)( const struct gl_texture_image *texImage, const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
texel[RCOMP] =
texel[GCOMP] =
- texel[BCOMP] = UBYTE_TO_FLOAT( (s & 0x0f) << 4 );
- texel[ACOMP] = UBYTE_TO_FLOAT( s & 0xf0 );
+ texel[BCOMP] = (s & 0xf) * (1.0F / 15.0F);
+ texel[ACOMP] = ((s >> 4) & 0xf) * (1.0F / 15.0F);
}
#if DIM == 3
diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c index 7b0b17b25..325fb9ebc 100644 --- a/mesalib/src/mesa/main/texformat.c +++ b/mesalib/src/mesa/main/texformat.c @@ -34,9 +34,15 @@ #include "context.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "texcompress.h"
#include "texformat.h"
+#define RETURN_IF_SUPPORTED(f) do { \
+ if (ctx->TextureFormatSupported[f]) \
+ return f; \
+} while (0)
/**
* Choose an appropriate texture format given the format, type and
@@ -64,85 +70,132 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, /* shallow RGBA formats */
case 4:
case GL_RGBA:
+ if (type == GL_UNSIGNED_SHORT_4_4_4_4_REV) {
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
+ } else if (type == GL_UNSIGNED_SHORT_1_5_5_5_REV) {
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);
+ }
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
+
case GL_RGBA8:
- return MESA_FORMAT_RGBA8888;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
case GL_RGB5_A1:
- return MESA_FORMAT_ARGB1555;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);
+ break;
case GL_RGBA2:
- return MESA_FORMAT_ARGB4444_REV; /* just to test another format*/
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444_REV); /* just to test another format*/
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
+ break;
case GL_RGBA4:
- return MESA_FORMAT_ARGB4444;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
+ break;
/* deep RGBA formats */
case GL_RGB10_A2:
- return MESA_FORMAT_ARGB2101010;
-
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
case GL_RGBA12:
case GL_RGBA16:
- return MESA_FORMAT_RGBA_16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
/* shallow RGB formats */
case 3:
case GL_RGB:
case GL_RGB8:
- return MESA_FORMAT_RGB888;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
case GL_R3_G3_B2:
- return MESA_FORMAT_RGB332;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB332);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
case GL_RGB4:
- return MESA_FORMAT_RGB565_REV; /* just to test another format */
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565_REV); /* just to test another format */
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
+ break;
case GL_RGB5:
- return MESA_FORMAT_RGB565;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
+ break;
/* deep RGB formats */
case GL_RGB10:
case GL_RGB12:
case GL_RGB16:
- return MESA_FORMAT_RGBA_16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
/* Alpha formats */
case GL_ALPHA:
case GL_ALPHA4:
case GL_ALPHA8:
- return MESA_FORMAT_A8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
+ break;
case GL_ALPHA12:
case GL_ALPHA16:
- return MESA_FORMAT_A16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_A16);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
+ break;
/* Luminance formats */
case 1:
case GL_LUMINANCE:
case GL_LUMINANCE4:
case GL_LUMINANCE8:
- return MESA_FORMAT_L8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
+ break;
case GL_LUMINANCE12:
case GL_LUMINANCE16:
- return MESA_FORMAT_L16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_L16);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
+ break;
/* Luminance/Alpha formats */
case GL_LUMINANCE4_ALPHA4:
- return MESA_FORMAT_AL44;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_AL44);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
+ break;
case 2:
case GL_LUMINANCE_ALPHA:
case GL_LUMINANCE6_ALPHA2:
case GL_LUMINANCE8_ALPHA8:
- return MESA_FORMAT_AL88;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
+ break;
case GL_LUMINANCE12_ALPHA4:
case GL_LUMINANCE12_ALPHA12:
case GL_LUMINANCE16_ALPHA16:
- return MESA_FORMAT_AL1616;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_AL1616);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
+ break;
case GL_INTENSITY:
case GL_INTENSITY4:
case GL_INTENSITY8:
- return MESA_FORMAT_I8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
+ break;
case GL_INTENSITY12:
case GL_INTENSITY16:
- return MESA_FORMAT_I16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_I16);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
+ break;
case GL_COLOR_INDEX:
case GL_COLOR_INDEX1_EXT:
@@ -151,7 +204,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, case GL_COLOR_INDEX12_EXT:
case GL_COLOR_INDEX16_EXT:
case GL_COLOR_INDEX8_EXT:
- return MESA_FORMAT_CI8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_CI8);
+ break;
default:
; /* fallthrough */
@@ -162,9 +216,12 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, case GL_DEPTH_COMPONENT:
case GL_DEPTH_COMPONENT24:
case GL_DEPTH_COMPONENT32:
- return MESA_FORMAT_Z32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
+ break;
case GL_DEPTH_COMPONENT16:
- return MESA_FORMAT_Z16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
default:
; /* fallthrough */
}
@@ -172,27 +229,36 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, switch (internalFormat) {
case GL_COMPRESSED_ALPHA_ARB:
- return MESA_FORMAT_A8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
+ break;
case GL_COMPRESSED_LUMINANCE_ARB:
- return MESA_FORMAT_L8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
+ break;
case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
- return MESA_FORMAT_AL88;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
+ break;
case GL_COMPRESSED_INTENSITY_ARB:
- return MESA_FORMAT_I8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
+ break;
case GL_COMPRESSED_RGB_ARB:
if (ctx->Extensions.EXT_texture_compression_s3tc ||
ctx->Extensions.S3_s3tc)
- return MESA_FORMAT_RGB_DXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
if (ctx->Extensions.TDFX_texture_compression_FXT1)
- return MESA_FORMAT_RGB_FXT1;
- return MESA_FORMAT_RGB888;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
case GL_COMPRESSED_RGBA_ARB:
if (ctx->Extensions.EXT_texture_compression_s3tc ||
ctx->Extensions.S3_s3tc)
- return MESA_FORMAT_RGBA_DXT3; /* Not rgba_dxt1, see spec */
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */
if (ctx->Extensions.TDFX_texture_compression_FXT1)
- return MESA_FORMAT_RGBA_FXT1;
- return MESA_FORMAT_RGBA8888;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+ break;
default:
; /* fallthrough */
}
@@ -200,9 +266,9 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, if (ctx->Extensions.MESA_ycbcr_texture) {
if (internalFormat == GL_YCBCR_MESA) {
if (type == GL_UNSIGNED_SHORT_8_8_MESA)
- return MESA_FORMAT_YCBCR;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR);
else
- return MESA_FORMAT_YCBCR_REV;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR_REV);
}
}
@@ -210,9 +276,11 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, if (ctx->Extensions.TDFX_texture_compression_FXT1) {
switch (internalFormat) {
case GL_COMPRESSED_RGB_FXT1_3DFX:
- return MESA_FORMAT_RGB_FXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
+ break;
case GL_COMPRESSED_RGBA_FXT1_3DFX:
- return MESA_FORMAT_RGBA_FXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
+ break;
default:
; /* fallthrough */
}
@@ -223,13 +291,17 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, if (ctx->Extensions.EXT_texture_compression_s3tc) {
switch (internalFormat) {
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
- return MESA_FORMAT_RGB_DXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
+ break;
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
- return MESA_FORMAT_RGBA_DXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT1);
+ break;
case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
- return MESA_FORMAT_RGBA_DXT3;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);
+ break;
case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
- return MESA_FORMAT_RGBA_DXT5;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT5);
+ break;
default:
; /* fallthrough */
}
@@ -239,10 +311,12 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, switch (internalFormat) {
case GL_RGB_S3TC:
case GL_RGB4_S3TC:
- return MESA_FORMAT_RGB_DXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
+ break;
case GL_RGBA_S3TC:
case GL_RGBA4_S3TC:
- return MESA_FORMAT_RGBA_DXT3;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);
+ break;
default:
; /* fallthrough */
}
@@ -252,29 +326,41 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, if (ctx->Extensions.ARB_texture_float) {
switch (internalFormat) {
case GL_ALPHA16F_ARB:
- return MESA_FORMAT_ALPHA_FLOAT16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
+ break;
case GL_ALPHA32F_ARB:
- return MESA_FORMAT_ALPHA_FLOAT32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);
+ break;
case GL_LUMINANCE16F_ARB:
- return MESA_FORMAT_LUMINANCE_FLOAT16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);
+ break;
case GL_LUMINANCE32F_ARB:
- return MESA_FORMAT_LUMINANCE_FLOAT32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);
+ break;
case GL_LUMINANCE_ALPHA16F_ARB:
- return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);
+ break;
case GL_LUMINANCE_ALPHA32F_ARB:
- return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);
+ break;
case GL_INTENSITY16F_ARB:
- return MESA_FORMAT_INTENSITY_FLOAT16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
+ break;
case GL_INTENSITY32F_ARB:
- return MESA_FORMAT_INTENSITY_FLOAT32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);
+ break;
case GL_RGB16F_ARB:
- return MESA_FORMAT_RGB_FLOAT16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
+ break;
case GL_RGB32F_ARB:
- return MESA_FORMAT_RGB_FLOAT32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT32);
+ break;
case GL_RGBA16F_ARB:
- return MESA_FORMAT_RGBA_FLOAT16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+ break;
case GL_RGBA32F_ARB:
- return MESA_FORMAT_RGBA_FLOAT32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
+ break;
default:
; /* fallthrough */
}
@@ -284,7 +370,9 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, switch (internalFormat) {
case GL_DEPTH_STENCIL_EXT:
case GL_DEPTH24_STENCIL8_EXT:
- return MESA_FORMAT_Z24_S8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_S8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
+ break;
default:
; /* fallthrough */
}
@@ -294,7 +382,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, switch (internalFormat) {
case GL_DUDV_ATI:
case GL_DU8DV8_ATI:
- return MESA_FORMAT_DUDV8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_DUDV8);
+ break;
default:
; /* fallthrough */
}
@@ -304,7 +393,9 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, switch (internalFormat) {
case GL_RGBA_SNORM:
case GL_RGBA8_SNORM:
- return MESA_FORMAT_SIGNED_RGBA8888;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+ break;
default:
; /* fallthrough */
}
@@ -314,24 +405,32 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, switch (internalFormat) {
case GL_RED_SNORM:
case GL_R8_SNORM:
- return MESA_FORMAT_SIGNED_R8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R8);
+ break;
case GL_RG_SNORM:
case GL_RG8_SNORM:
- return MESA_FORMAT_SIGNED_RG88;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88);
+ break;
case GL_RGB_SNORM:
case GL_RGB8_SNORM:
- return MESA_FORMAT_SIGNED_RGBX8888;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);
+ break;
case GL_RGBA_SNORM:
case GL_RGBA8_SNORM:
- return MESA_FORMAT_SIGNED_RGBA8888;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
+ break;
case GL_R16_SNORM:
- return MESA_FORMAT_SIGNED_R_16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R_16);
+ break;
case GL_RG16_SNORM:
- return MESA_FORMAT_SIGNED_RG_16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG_16);
+ break;
case GL_RGB16_SNORM:
- return MESA_FORMAT_SIGNED_RGB_16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);
+ break;
case GL_RGBA16_SNORM:
- return MESA_FORMAT_SIGNED_RGBA_16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
+ break;
default:
; /* fall-through */
}
@@ -342,48 +441,68 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, switch (internalFormat) {
case GL_SRGB_EXT:
case GL_SRGB8_EXT:
- return MESA_FORMAT_SRGB8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+ break;
case GL_SRGB_ALPHA_EXT:
case GL_SRGB8_ALPHA8_EXT:
- return MESA_FORMAT_SRGBA8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+ break;
case GL_SLUMINANCE_EXT:
case GL_SLUMINANCE8_EXT:
- return MESA_FORMAT_SL8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+ break;
case GL_SLUMINANCE_ALPHA_EXT:
case GL_SLUMINANCE8_ALPHA8_EXT:
- return MESA_FORMAT_SLA8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+ break;
case GL_COMPRESSED_SLUMINANCE_EXT:
- return MESA_FORMAT_SL8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+ break;
case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
- return MESA_FORMAT_SLA8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+ break;
case GL_COMPRESSED_SRGB_EXT:
#if FEATURE_texture_s3tc
if (ctx->Extensions.EXT_texture_compression_s3tc)
- return MESA_FORMAT_SRGB_DXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
#endif
- return MESA_FORMAT_SRGB8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+ break;
case GL_COMPRESSED_SRGB_ALPHA_EXT:
#if FEATURE_texture_s3tc
if (ctx->Extensions.EXT_texture_compression_s3tc)
- return MESA_FORMAT_SRGBA_DXT3; /* Not srgba_dxt1, see spec */
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */
#endif
- return MESA_FORMAT_SRGBA8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+ break;
#if FEATURE_texture_s3tc
case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
if (ctx->Extensions.EXT_texture_compression_s3tc)
- return MESA_FORMAT_SRGB_DXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
break;
case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
if (ctx->Extensions.EXT_texture_compression_s3tc)
- return MESA_FORMAT_SRGBA_DXT1;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT1);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
break;
case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
if (ctx->Extensions.EXT_texture_compression_s3tc)
- return MESA_FORMAT_SRGBA_DXT3;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
break;
case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
if (ctx->Extensions.EXT_texture_compression_s3tc)
- return MESA_FORMAT_SRGBA_DXT5;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
break;
#endif
default:
@@ -400,42 +519,48 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, case GL_INTENSITY32UI_EXT:
case GL_LUMINANCE32UI_EXT:
case GL_LUMINANCE_ALPHA32UI_EXT:
- return MESA_FORMAT_RGBA_UINT32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
+ break;
case GL_RGBA16UI_EXT:
case GL_RGB16UI_EXT:
case GL_ALPHA16UI_EXT:
case GL_INTENSITY16UI_EXT:
case GL_LUMINANCE16UI_EXT:
case GL_LUMINANCE_ALPHA16UI_EXT:
- return MESA_FORMAT_RGBA_UINT16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
+ break;
case GL_RGBA8UI_EXT:
case GL_RGB8UI_EXT:
case GL_ALPHA8UI_EXT:
case GL_INTENSITY8UI_EXT:
case GL_LUMINANCE8UI_EXT:
case GL_LUMINANCE_ALPHA8UI_EXT:
- return MESA_FORMAT_RGBA_UINT8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
+ break;
case GL_RGBA32I_EXT:
case GL_RGB32I_EXT:
case GL_ALPHA32I_EXT:
case GL_INTENSITY32I_EXT:
case GL_LUMINANCE32I_EXT:
case GL_LUMINANCE_ALPHA32I_EXT:
- return MESA_FORMAT_RGBA_INT32;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+ break;
case GL_RGBA16I_EXT:
case GL_RGB16I_EXT:
case GL_ALPHA16I_EXT:
case GL_INTENSITY16I_EXT:
case GL_LUMINANCE16I_EXT:
case GL_LUMINANCE_ALPHA16I_EXT:
- return MESA_FORMAT_RGBA_INT16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+ break;
case GL_RGBA8I_EXT:
case GL_RGB8I_EXT:
case GL_ALPHA8I_EXT:
case GL_INTENSITY8I_EXT:
case GL_LUMINANCE8I_EXT:
case GL_LUMINANCE_ALPHA8I_EXT:
- return MESA_FORMAT_RGBA_INT8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+ break;
}
}
@@ -444,18 +569,22 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, case GL_R8:
case GL_RED:
case GL_COMPRESSED_RED:
- return MESA_FORMAT_R8;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_R8);
+ break;
case GL_R16:
- return MESA_FORMAT_R16;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_R16);
+ break;
case GL_RG:
case GL_RG8:
case GL_COMPRESSED_RG:
- return MESA_FORMAT_RG88;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RG88);
+ break;
case GL_RG16:
- return MESA_FORMAT_RG1616;
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RG1616);
+ break;
default:
; /* fallthrough */
diff --git a/mesalib/src/mesa/main/texgen.c b/mesalib/src/mesa/main/texgen.c index 108ea4cd4..10eaa89ad 100644 --- a/mesalib/src/mesa/main/texgen.c +++ b/mesalib/src/mesa/main/texgen.c @@ -1,400 +1,401 @@ -/* - * Mesa 3-D graphics library - * Version: 7.5 - * - * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. - * Copyright (C) 2009 VMware, Inc. 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"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/** - * \file texgen.c - * - * glTexGen-related functions - */ - - -#include "main/glheader.h" -#include "main/context.h" -#include "main/enums.h" -#include "main/macros.h" -#include "main/texgen.h" -#include "main/texstate.h" -#include "math/m_matrix.h" -#include "main/dispatch.h" - - -#if FEATURE_texgen - - -/** - * Return texgen state for given coordinate - */ -static struct gl_texgen * -get_texgen(struct gl_texture_unit *texUnit, GLenum coord) -{ - switch (coord) { - case GL_S: - return &texUnit->GenS; - case GL_T: - return &texUnit->GenT; - case GL_R: - return &texUnit->GenR; - case GL_Q: - return &texUnit->GenQ; - default: - return NULL; - } -} - - -void GLAPIENTRY -_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) -{ - struct gl_texture_unit *texUnit; - struct gl_texgen *texgen; - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); - - if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE)) - _mesa_debug(ctx, "glTexGen %s %s %.1f(%s)...\n", - _mesa_lookup_enum_by_nr(coord), - _mesa_lookup_enum_by_nr(pname), - *params, - _mesa_lookup_enum_by_nr((GLenum) (GLint) *params)); - - if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glTexGen(current unit)"); - return; - } - - texUnit = _mesa_get_current_tex_unit(ctx); - - texgen = get_texgen(texUnit, coord); - if (!texgen) { - _mesa_error(ctx, GL_INVALID_ENUM, "glTexGen(coord)"); - return; - } - - switch (pname) { - case GL_TEXTURE_GEN_MODE: - { - GLenum mode = (GLenum) (GLint) params[0]; - GLbitfield bit = 0x0; - if (texgen->Mode == mode) - return; - switch (mode) { - case GL_OBJECT_LINEAR: - bit = TEXGEN_OBJ_LINEAR; - break; - case GL_EYE_LINEAR: - bit = TEXGEN_EYE_LINEAR; - break; - case GL_SPHERE_MAP: - if (coord == GL_S || coord == GL_T) - bit = TEXGEN_SPHERE_MAP; - break; - case GL_REFLECTION_MAP_NV: - if (coord != GL_Q) - bit = TEXGEN_REFLECTION_MAP_NV; - break; - case GL_NORMAL_MAP_NV: - if (coord != GL_Q) - bit = TEXGEN_NORMAL_MAP_NV; - break; - default: - ; /* nop */ - } - if (!bit) { - _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" ); - return; - } - FLUSH_VERTICES(ctx, _NEW_TEXTURE); - texgen->Mode = mode; - texgen->_ModeBit = bit; - } - break; - - case GL_OBJECT_PLANE: - { - if (TEST_EQ_4V(texgen->ObjectPlane, params)) - return; - FLUSH_VERTICES(ctx, _NEW_TEXTURE); - COPY_4FV(texgen->ObjectPlane, params); - } - break; - - case GL_EYE_PLANE: - { - GLfloat tmp[4]; - /* Transform plane equation by the inverse modelview matrix */ - if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) { - _math_matrix_analyse(ctx->ModelviewMatrixStack.Top); - } - _mesa_transform_vector(tmp, params, - ctx->ModelviewMatrixStack.Top->inv); - if (TEST_EQ_4V(texgen->EyePlane, tmp)) - return; - FLUSH_VERTICES(ctx, _NEW_TEXTURE); - COPY_4FV(texgen->EyePlane, tmp); - } - break; - - default: - _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" ); - return; - } - - if (ctx->Driver.TexGen) - ctx->Driver.TexGen( ctx, coord, pname, params ); -} - - -static void GLAPIENTRY -_mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params ) -{ - GLfloat p[4]; - p[0] = (GLfloat) params[0]; - if (pname == GL_TEXTURE_GEN_MODE) { - p[1] = p[2] = p[3] = 0.0F; - } - else { - p[1] = (GLfloat) params[1]; - p[2] = (GLfloat) params[2]; - p[3] = (GLfloat) params[3]; - } - _mesa_TexGenfv(coord, pname, p); -} - - -static void GLAPIENTRY -_mesa_TexGend(GLenum coord, GLenum pname, GLdouble param ) -{ - GLfloat p[4]; - p[0] = (GLfloat) param; - p[1] = p[2] = p[3] = 0.0F; - _mesa_TexGenfv( coord, pname, p ); -} - -#if FEATURE_ES1 - -void GLAPIENTRY -_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params) -{ - ASSERT(coord == GL_TEXTURE_GEN_STR_OES); - _mesa_GetTexGenfv(GL_S, pname, params); -} - - -void GLAPIENTRY -_es_TexGenf(GLenum coord, GLenum pname, GLfloat param) -{ - ASSERT(coord == GL_TEXTURE_GEN_STR_OES); - /* set S, T, and R at the same time */ - _mesa_TexGenf(GL_S, pname, param); - _mesa_TexGenf(GL_T, pname, param); - _mesa_TexGenf(GL_R, pname, param); -} - - -void GLAPIENTRY -_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params) -{ - ASSERT(coord == GL_TEXTURE_GEN_STR_OES); - /* set S, T, and R at the same time */ - _mesa_TexGenfv(GL_S, pname, params); - _mesa_TexGenfv(GL_T, pname, params); - _mesa_TexGenfv(GL_R, pname, params); -} - -#endif - -static void GLAPIENTRY -_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params ) -{ - GLfloat p[4]; - p[0] = (GLfloat) params[0]; - if (pname == GL_TEXTURE_GEN_MODE) { - p[1] = p[2] = p[3] = 0.0F; - } - else { - p[1] = (GLfloat) params[1]; - p[2] = (GLfloat) params[2]; - p[3] = (GLfloat) params[3]; - } - _mesa_TexGenfv( coord, pname, p ); -} - - -void GLAPIENTRY -_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param ) -{ - GLfloat p[4]; - p[0] = param; - p[1] = p[2] = p[3] = 0.0F; - _mesa_TexGenfv(coord, pname, p); -} - - -void GLAPIENTRY -_mesa_TexGeni( GLenum coord, GLenum pname, GLint param ) -{ - GLint p[4]; - p[0] = param; - p[1] = p[2] = p[3] = 0; - _mesa_TexGeniv( coord, pname, p ); -} - - - -static void GLAPIENTRY -_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params ) -{ - struct gl_texture_unit *texUnit; - struct gl_texgen *texgen; - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); - - if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGendv(current unit)"); - return; - } - - texUnit = _mesa_get_current_tex_unit(ctx); - - texgen = get_texgen(texUnit, coord); - if (!texgen) { - _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGendv(coord)"); - return; - } - - switch (pname) { - case GL_TEXTURE_GEN_MODE: - params[0] = ENUM_TO_DOUBLE(texgen->Mode); - break; - case GL_OBJECT_PLANE: - COPY_4V(params, texgen->ObjectPlane); - break; - case GL_EYE_PLANE: - COPY_4V(params, texgen->EyePlane); - break; - default: - _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" ); - } -} - - - -void GLAPIENTRY -_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ) -{ - struct gl_texture_unit *texUnit; - struct gl_texgen *texgen; - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); - - if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGenfv(current unit)"); - return; - } - - texUnit = _mesa_get_current_tex_unit(ctx); - - texgen = get_texgen(texUnit, coord); - if (!texgen) { - _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGenfv(coord)"); - return; - } - - switch (pname) { - case GL_TEXTURE_GEN_MODE: - params[0] = ENUM_TO_FLOAT(texgen->Mode); - break; - case GL_OBJECT_PLANE: - COPY_4V(params, texgen->ObjectPlane); - break; - case GL_EYE_PLANE: - COPY_4V(params, texgen->EyePlane); - break; - default: - _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" ); - } -} - - - -static void GLAPIENTRY -_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params ) -{ - struct gl_texture_unit *texUnit; - struct gl_texgen *texgen; - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); - - if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGeniv(current unit)"); - return; - } - - texUnit = _mesa_get_current_tex_unit(ctx); - - texgen = get_texgen(texUnit, coord); - if (!texgen) { - _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGeniv(coord)"); - return; - } - - switch (pname) { - case GL_TEXTURE_GEN_MODE: - params[0] = texgen->Mode; - break; - case GL_OBJECT_PLANE: - params[0] = (GLint) texgen->ObjectPlane[0]; - params[1] = (GLint) texgen->ObjectPlane[1]; - params[2] = (GLint) texgen->ObjectPlane[2]; - params[3] = (GLint) texgen->ObjectPlane[3]; - break; - case GL_EYE_PLANE: - params[0] = (GLint) texgen->EyePlane[0]; - params[1] = (GLint) texgen->EyePlane[1]; - params[2] = (GLint) texgen->EyePlane[2]; - params[3] = (GLint) texgen->EyePlane[3]; - break; - default: - _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" ); - } -} - - -void -_mesa_init_texgen_dispatch(struct _glapi_table *disp) -{ - SET_GetTexGendv(disp, _mesa_GetTexGendv); - SET_GetTexGenfv(disp, _mesa_GetTexGenfv); - SET_GetTexGeniv(disp, _mesa_GetTexGeniv); - SET_TexGend(disp, _mesa_TexGend); - SET_TexGendv(disp, _mesa_TexGendv); - SET_TexGenf(disp, _mesa_TexGenf); - SET_TexGenfv(disp, _mesa_TexGenfv); - SET_TexGeni(disp, _mesa_TexGeni); - SET_TexGeniv(disp, _mesa_TexGeniv); -} - - -#endif /* FEATURE_texgen */ +/*
+ * Mesa 3-D graphics library
+ * Version: 7.5
+ *
+ * Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
+ * Copyright (C) 2009 VMware, Inc. 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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file texgen.c
+ *
+ * glTexGen-related functions
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/enums.h"
+#include "main/macros.h"
+#include "main/mfeatures.h"
+#include "main/texgen.h"
+#include "main/texstate.h"
+#include "math/m_matrix.h"
+#include "main/dispatch.h"
+
+
+#if FEATURE_texgen
+
+
+/**
+ * Return texgen state for given coordinate
+ */
+static struct gl_texgen *
+get_texgen(struct gl_texture_unit *texUnit, GLenum coord)
+{
+ switch (coord) {
+ case GL_S:
+ return &texUnit->GenS;
+ case GL_T:
+ return &texUnit->GenT;
+ case GL_R:
+ return &texUnit->GenR;
+ case GL_Q:
+ return &texUnit->GenQ;
+ default:
+ return NULL;
+ }
+}
+
+
+void GLAPIENTRY
+_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
+{
+ struct gl_texture_unit *texUnit;
+ struct gl_texgen *texgen;
+ GET_CURRENT_CONTEXT(ctx);
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+ if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
+ _mesa_debug(ctx, "glTexGen %s %s %.1f(%s)...\n",
+ _mesa_lookup_enum_by_nr(coord),
+ _mesa_lookup_enum_by_nr(pname),
+ *params,
+ _mesa_lookup_enum_by_nr((GLenum) (GLint) *params));
+
+ if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glTexGen(current unit)");
+ return;
+ }
+
+ texUnit = _mesa_get_current_tex_unit(ctx);
+
+ texgen = get_texgen(texUnit, coord);
+ if (!texgen) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glTexGen(coord)");
+ return;
+ }
+
+ switch (pname) {
+ case GL_TEXTURE_GEN_MODE:
+ {
+ GLenum mode = (GLenum) (GLint) params[0];
+ GLbitfield bit = 0x0;
+ if (texgen->Mode == mode)
+ return;
+ switch (mode) {
+ case GL_OBJECT_LINEAR:
+ bit = TEXGEN_OBJ_LINEAR;
+ break;
+ case GL_EYE_LINEAR:
+ bit = TEXGEN_EYE_LINEAR;
+ break;
+ case GL_SPHERE_MAP:
+ if (coord == GL_S || coord == GL_T)
+ bit = TEXGEN_SPHERE_MAP;
+ break;
+ case GL_REFLECTION_MAP_NV:
+ if (coord != GL_Q)
+ bit = TEXGEN_REFLECTION_MAP_NV;
+ break;
+ case GL_NORMAL_MAP_NV:
+ if (coord != GL_Q)
+ bit = TEXGEN_NORMAL_MAP_NV;
+ break;
+ default:
+ ; /* nop */
+ }
+ if (!bit) {
+ _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+ return;
+ }
+ FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+ texgen->Mode = mode;
+ texgen->_ModeBit = bit;
+ }
+ break;
+
+ case GL_OBJECT_PLANE:
+ {
+ if (TEST_EQ_4V(texgen->ObjectPlane, params))
+ return;
+ FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+ COPY_4FV(texgen->ObjectPlane, params);
+ }
+ break;
+
+ case GL_EYE_PLANE:
+ {
+ GLfloat tmp[4];
+ /* Transform plane equation by the inverse modelview matrix */
+ if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
+ _math_matrix_analyse(ctx->ModelviewMatrixStack.Top);
+ }
+ _mesa_transform_vector(tmp, params,
+ ctx->ModelviewMatrixStack.Top->inv);
+ if (TEST_EQ_4V(texgen->EyePlane, tmp))
+ return;
+ FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+ COPY_4FV(texgen->EyePlane, tmp);
+ }
+ break;
+
+ default:
+ _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+ return;
+ }
+
+ if (ctx->Driver.TexGen)
+ ctx->Driver.TexGen( ctx, coord, pname, params );
+}
+
+
+static void GLAPIENTRY
+_mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
+{
+ GLfloat p[4];
+ p[0] = (GLfloat) params[0];
+ if (pname == GL_TEXTURE_GEN_MODE) {
+ p[1] = p[2] = p[3] = 0.0F;
+ }
+ else {
+ p[1] = (GLfloat) params[1];
+ p[2] = (GLfloat) params[2];
+ p[3] = (GLfloat) params[3];
+ }
+ _mesa_TexGenfv(coord, pname, p);
+}
+
+
+static void GLAPIENTRY
+_mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
+{
+ GLfloat p[4];
+ p[0] = (GLfloat) param;
+ p[1] = p[2] = p[3] = 0.0F;
+ _mesa_TexGenfv( coord, pname, p );
+}
+
+#if FEATURE_ES1
+
+void GLAPIENTRY
+_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
+{
+ ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+ _mesa_GetTexGenfv(GL_S, pname, params);
+}
+
+
+void GLAPIENTRY
+_es_TexGenf(GLenum coord, GLenum pname, GLfloat param)
+{
+ ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+ /* set S, T, and R at the same time */
+ _mesa_TexGenf(GL_S, pname, param);
+ _mesa_TexGenf(GL_T, pname, param);
+ _mesa_TexGenf(GL_R, pname, param);
+}
+
+
+void GLAPIENTRY
+_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
+{
+ ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+ /* set S, T, and R at the same time */
+ _mesa_TexGenfv(GL_S, pname, params);
+ _mesa_TexGenfv(GL_T, pname, params);
+ _mesa_TexGenfv(GL_R, pname, params);
+}
+
+#endif
+
+static void GLAPIENTRY
+_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
+{
+ GLfloat p[4];
+ p[0] = (GLfloat) params[0];
+ if (pname == GL_TEXTURE_GEN_MODE) {
+ p[1] = p[2] = p[3] = 0.0F;
+ }
+ else {
+ p[1] = (GLfloat) params[1];
+ p[2] = (GLfloat) params[2];
+ p[3] = (GLfloat) params[3];
+ }
+ _mesa_TexGenfv( coord, pname, p );
+}
+
+
+void GLAPIENTRY
+_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param )
+{
+ GLfloat p[4];
+ p[0] = param;
+ p[1] = p[2] = p[3] = 0.0F;
+ _mesa_TexGenfv(coord, pname, p);
+}
+
+
+void GLAPIENTRY
+_mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
+{
+ GLint p[4];
+ p[0] = param;
+ p[1] = p[2] = p[3] = 0;
+ _mesa_TexGeniv( coord, pname, p );
+}
+
+
+
+static void GLAPIENTRY
+_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
+{
+ struct gl_texture_unit *texUnit;
+ struct gl_texgen *texgen;
+ GET_CURRENT_CONTEXT(ctx);
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+ if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGendv(current unit)");
+ return;
+ }
+
+ texUnit = _mesa_get_current_tex_unit(ctx);
+
+ texgen = get_texgen(texUnit, coord);
+ if (!texgen) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGendv(coord)");
+ return;
+ }
+
+ switch (pname) {
+ case GL_TEXTURE_GEN_MODE:
+ params[0] = ENUM_TO_DOUBLE(texgen->Mode);
+ break;
+ case GL_OBJECT_PLANE:
+ COPY_4V(params, texgen->ObjectPlane);
+ break;
+ case GL_EYE_PLANE:
+ COPY_4V(params, texgen->EyePlane);
+ break;
+ default:
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+ }
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
+{
+ struct gl_texture_unit *texUnit;
+ struct gl_texgen *texgen;
+ GET_CURRENT_CONTEXT(ctx);
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+ if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGenfv(current unit)");
+ return;
+ }
+
+ texUnit = _mesa_get_current_tex_unit(ctx);
+
+ texgen = get_texgen(texUnit, coord);
+ if (!texgen) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGenfv(coord)");
+ return;
+ }
+
+ switch (pname) {
+ case GL_TEXTURE_GEN_MODE:
+ params[0] = ENUM_TO_FLOAT(texgen->Mode);
+ break;
+ case GL_OBJECT_PLANE:
+ COPY_4V(params, texgen->ObjectPlane);
+ break;
+ case GL_EYE_PLANE:
+ COPY_4V(params, texgen->EyePlane);
+ break;
+ default:
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+ }
+}
+
+
+
+static void GLAPIENTRY
+_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
+{
+ struct gl_texture_unit *texUnit;
+ struct gl_texgen *texgen;
+ GET_CURRENT_CONTEXT(ctx);
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+ if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexGeniv(current unit)");
+ return;
+ }
+
+ texUnit = _mesa_get_current_tex_unit(ctx);
+
+ texgen = get_texgen(texUnit, coord);
+ if (!texgen) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexGeniv(coord)");
+ return;
+ }
+
+ switch (pname) {
+ case GL_TEXTURE_GEN_MODE:
+ params[0] = texgen->Mode;
+ break;
+ case GL_OBJECT_PLANE:
+ params[0] = (GLint) texgen->ObjectPlane[0];
+ params[1] = (GLint) texgen->ObjectPlane[1];
+ params[2] = (GLint) texgen->ObjectPlane[2];
+ params[3] = (GLint) texgen->ObjectPlane[3];
+ break;
+ case GL_EYE_PLANE:
+ params[0] = (GLint) texgen->EyePlane[0];
+ params[1] = (GLint) texgen->EyePlane[1];
+ params[2] = (GLint) texgen->EyePlane[2];
+ params[3] = (GLint) texgen->EyePlane[3];
+ break;
+ default:
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+ }
+}
+
+
+void
+_mesa_init_texgen_dispatch(struct _glapi_table *disp)
+{
+ SET_GetTexGendv(disp, _mesa_GetTexGendv);
+ SET_GetTexGenfv(disp, _mesa_GetTexGenfv);
+ SET_GetTexGeniv(disp, _mesa_GetTexGeniv);
+ SET_TexGend(disp, _mesa_TexGend);
+ SET_TexGendv(disp, _mesa_TexGendv);
+ SET_TexGenf(disp, _mesa_TexGenf);
+ SET_TexGenfv(disp, _mesa_TexGenfv);
+ SET_TexGeni(disp, _mesa_TexGeni);
+ SET_TexGeniv(disp, _mesa_TexGeniv);
+}
+
+
+#endif /* FEATURE_texgen */
diff --git a/mesalib/src/mesa/main/texgen.h b/mesalib/src/mesa/main/texgen.h index 9ed802383..9160af002 100644 --- a/mesalib/src/mesa/main/texgen.h +++ b/mesalib/src/mesa/main/texgen.h @@ -1,84 +1,85 @@ -/* - * Mesa 3-D graphics library - * Version: 7.1 - * - * Copyright (C) 1999-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"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - -#ifndef TEXGEN_H -#define TEXGEN_H - - -#include "compiler.h" -#include "glheader.h" - -struct _glapi_table; - - -#if FEATURE_texgen - -extern void GLAPIENTRY -_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ); - -extern void GLAPIENTRY -_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param ); - -extern void GLAPIENTRY -_mesa_TexGeni( GLenum coord, GLenum pname, GLint param ); - -extern void GLAPIENTRY -_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ); - -extern void -_mesa_init_texgen_dispatch(struct _glapi_table *disp); - - -extern void GLAPIENTRY -_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params); - -extern void GLAPIENTRY -_es_TexGenf(GLenum coord, GLenum pname, GLfloat param); - -extern void GLAPIENTRY -_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params); - - -#else /* FEATURE_texgen */ - -static void -_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) -{ -} - -static void INLINE -_mesa_TexGeni( GLenum coord, GLenum pname, GLint param ) -{ -} - -static INLINE void -_mesa_init_texgen_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_texgen */ - - -#endif /* TEXGEN_H */ +/*
+ * Mesa 3-D graphics library
+ * Version: 7.1
+ *
+ * Copyright (C) 1999-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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXGEN_H
+#define TEXGEN_H
+
+
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
+
+struct _glapi_table;
+
+
+#if FEATURE_texgen
+
+extern void GLAPIENTRY
+_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_TexGeni( GLenum coord, GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
+
+extern void
+_mesa_init_texgen_dispatch(struct _glapi_table *disp);
+
+
+extern void GLAPIENTRY
+_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params);
+
+extern void GLAPIENTRY
+_es_TexGenf(GLenum coord, GLenum pname, GLfloat param);
+
+extern void GLAPIENTRY
+_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params);
+
+
+#else /* FEATURE_texgen */
+
+static void
+_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
+{
+}
+
+static void INLINE
+_mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
+{
+}
+
+static INLINE void
+_mesa_init_texgen_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_texgen */
+
+
+#endif /* TEXGEN_H */
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index 227a670da..36bd02a6c 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -35,6 +35,8 @@ #include "context.h"
#include "formats.h"
#include "image.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "pack.h"
#include "texgetimage.h"
#include "teximage.h"
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index f62074a1b..a4143ba45 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -40,6 +40,7 @@ #include "image.h"
#include "imports.h"
#include "macros.h"
+#include "mfeatures.h"
#include "state.h"
#include "texcompress.h"
#include "texfetch.h"
@@ -340,11 +341,11 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) return GL_RGBA;
case GL_SLUMINANCE_ALPHA_EXT:
case GL_SLUMINANCE8_ALPHA8_EXT:
- case GL_COMPRESSED_SLUMINANCE_EXT:
case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
return GL_LUMINANCE_ALPHA;
case GL_SLUMINANCE_EXT:
case GL_SLUMINANCE8_EXT:
+ case GL_COMPRESSED_SLUMINANCE_EXT:
return GL_LUMINANCE;
default:
; /* fallthrough */
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c index 6a038514b..831dbc5b6 100644 --- a/mesalib/src/mesa/main/texobj.c +++ b/mesalib/src/mesa/main/texobj.c @@ -470,6 +470,12 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, ASSERT(maxLevels > 0);
+ if (t->MaxLevel < t->BaseLevel) {
+ incomplete(t, "MAX_LEVEL (%d) < BASE_LEVEL (%d)",
+ t->MaxLevel, t->BaseLevel);
+ return;
+ }
+
t->_MaxLevel = baseLevel + maxLog2;
t->_MaxLevel = MIN2(t->_MaxLevel, t->MaxLevel);
t->_MaxLevel = MIN2(t->_MaxLevel, maxLevels - 1);
diff --git a/mesalib/src/mesa/main/texpal.c b/mesalib/src/mesa/main/texpal.c index a25e7aa4f..801914462 100644 --- a/mesalib/src/mesa/main/texpal.c +++ b/mesalib/src/mesa/main/texpal.c @@ -1,204 +1,205 @@ -/************************************************************************** - * - * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas. - * All Rights Reserved. - * - **************************************************************************/ - - -/** - * Code to convert compressed/paletted texture images to ordinary images. - * See the GL_OES_compressed_paletted_texture spec at - * http://khronos.org/registry/gles/extensions/OES/OES_compressed_paletted_texture.txt - * - * XXX this makes it impossible to add hardware support... - */ - - -#include "glheader.h" -#include "compiler.h" /* for ASSERT */ -#include "context.h" -#include "mtypes.h" -#include "imports.h" -#include "pixelstore.h" -#include "teximage.h" -#include "texpal.h" - -#if FEATURE_ES - - -static const struct cpal_format_info { - GLenum cpal_format; - GLenum format; - GLenum type; - GLuint palette_size; - GLuint size; -} formats[] = { - { GL_PALETTE4_RGB8_OES, GL_RGB, GL_UNSIGNED_BYTE, 16, 3 }, - { GL_PALETTE4_RGBA8_OES, GL_RGBA, GL_UNSIGNED_BYTE, 16, 4 }, - { GL_PALETTE4_R5_G6_B5_OES, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 16, 2 }, - { GL_PALETTE4_RGBA4_OES, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, 16, 2 }, - { GL_PALETTE4_RGB5_A1_OES, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 16, 2 }, - { GL_PALETTE8_RGB8_OES, GL_RGB, GL_UNSIGNED_BYTE, 256, 3 }, - { GL_PALETTE8_RGBA8_OES, GL_RGBA, GL_UNSIGNED_BYTE, 256, 4 }, - { GL_PALETTE8_R5_G6_B5_OES, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 256, 2 }, - { GL_PALETTE8_RGBA4_OES, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, 256, 2 }, - { GL_PALETTE8_RGB5_A1_OES, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 256, 2 } -}; - - -/** - * Get a color/entry from the palette. - */ -static GLuint -get_palette_entry(const struct cpal_format_info *info, const GLubyte *palette, - GLuint index, GLubyte *pixel) -{ - memcpy(pixel, palette + info->size * index, info->size); - return info->size; -} - - -/** - * Convert paletted texture to color texture. - */ -static void -paletted_to_color(const struct cpal_format_info *info, const GLubyte *palette, - const void *indices, GLuint num_pixels, GLubyte *image) -{ - GLubyte *pix = image; - GLuint remain, i; - - if (info->palette_size == 16) { - /* 4 bits per index */ - const GLubyte *ind = (const GLubyte *) indices; - - /* two pixels per iteration */ - remain = num_pixels % 2; - for (i = 0; i < num_pixels / 2; i++) { - pix += get_palette_entry(info, palette, (ind[i] >> 4) & 0xf, pix); - pix += get_palette_entry(info, palette, ind[i] & 0xf, pix); - } - if (remain) { - get_palette_entry(info, palette, (ind[i] >> 4) & 0xf, pix); - } - } - else { - /* 8 bits per index */ - const GLubyte *ind = (const GLubyte *) indices; - for (i = 0; i < num_pixels; i++) - pix += get_palette_entry(info, palette, ind[i], pix); - } -} - - -static const struct cpal_format_info * -cpal_get_info(GLint level, GLenum internalFormat, - GLsizei width, GLsizei height, GLsizei imageSize) -{ - const struct cpal_format_info *info; - GLint lvl, num_levels; - GLsizei w, h, expect_size; - - info = &formats[internalFormat - GL_PALETTE4_RGB8_OES]; - ASSERT(info->cpal_format == internalFormat); - - if (level > 0) { - _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE, - "glCompressedTexImage2D(level=%d)", level); - return NULL; - } - - num_levels = -level + 1; - expect_size = info->palette_size * info->size; - for (lvl = 0; lvl < num_levels; lvl++) { - w = width >> lvl; - if (!w) - w = 1; - h = height >> lvl; - if (!h) - h = 1; - - if (info->palette_size == 16) - expect_size += (w * h + 1) / 2; - else - expect_size += w * h; - } - if (expect_size > imageSize) { - _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE, - "glCompressedTexImage2D(imageSize=%d)", imageSize); - return NULL; - } - return info; -} - -/** - * Convert a call to glCompressedTexImage2D() where internalFormat is a - * compressed palette format into a regular GLubyte/RGBA glTexImage2D() call. - */ -void -_mesa_cpal_compressed_teximage2d(GLenum target, GLint level, - GLenum internalFormat, - GLsizei width, GLsizei height, - GLsizei imageSize, const void *palette) -{ - const struct cpal_format_info *info; - GLint lvl, num_levels; - const GLubyte *indices; - GLint saved_align, align; - GET_CURRENT_CONTEXT(ctx); - - info = cpal_get_info(level, internalFormat, width, height, imageSize); - if (!info) - return; - - info = &formats[internalFormat - GL_PALETTE4_RGB8_OES]; - ASSERT(info->cpal_format == internalFormat); - num_levels = -level + 1; - - /* first image follows the palette */ - indices = (const GLubyte *) palette + info->palette_size * info->size; - - saved_align = ctx->Unpack.Alignment; - align = saved_align; - - for (lvl = 0; lvl < num_levels; lvl++) { - GLsizei w, h; - GLuint num_texels; - GLubyte *image = NULL; - - w = width >> lvl; - if (!w) - w = 1; - h = height >> lvl; - if (!h) - h = 1; - num_texels = w * h; - if (w * info->size % align) { - _mesa_PixelStorei(GL_UNPACK_ALIGNMENT, 1); - align = 1; - } - - /* allocate and fill dest image buffer */ - if (palette) { - image = (GLubyte *) malloc(num_texels * info->size); - paletted_to_color(info, palette, indices, num_texels, image); - } - - _mesa_TexImage2D(target, lvl, info->format, w, h, 0, - info->format, info->type, image); - if (image) - free(image); - - /* advance index pointer to point to next src mipmap */ - if (info->palette_size == 16) - indices += (num_texels + 1) / 2; - else - indices += num_texels; - } - - if (saved_align != align) - _mesa_PixelStorei(GL_UNPACK_ALIGNMENT, saved_align); -} - -#endif +/**************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ **************************************************************************/
+
+
+/**
+ * Code to convert compressed/paletted texture images to ordinary images.
+ * See the GL_OES_compressed_paletted_texture spec at
+ * http://khronos.org/registry/gles/extensions/OES/OES_compressed_paletted_texture.txt
+ *
+ * XXX this makes it impossible to add hardware support...
+ */
+
+
+#include "glheader.h"
+#include "compiler.h" /* for ASSERT */
+#include "context.h"
+#include "mfeatures.h"
+#include "mtypes.h"
+#include "imports.h"
+#include "pixelstore.h"
+#include "teximage.h"
+#include "texpal.h"
+
+#if FEATURE_ES
+
+
+static const struct cpal_format_info {
+ GLenum cpal_format;
+ GLenum format;
+ GLenum type;
+ GLuint palette_size;
+ GLuint size;
+} formats[] = {
+ { GL_PALETTE4_RGB8_OES, GL_RGB, GL_UNSIGNED_BYTE, 16, 3 },
+ { GL_PALETTE4_RGBA8_OES, GL_RGBA, GL_UNSIGNED_BYTE, 16, 4 },
+ { GL_PALETTE4_R5_G6_B5_OES, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 16, 2 },
+ { GL_PALETTE4_RGBA4_OES, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, 16, 2 },
+ { GL_PALETTE4_RGB5_A1_OES, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 16, 2 },
+ { GL_PALETTE8_RGB8_OES, GL_RGB, GL_UNSIGNED_BYTE, 256, 3 },
+ { GL_PALETTE8_RGBA8_OES, GL_RGBA, GL_UNSIGNED_BYTE, 256, 4 },
+ { GL_PALETTE8_R5_G6_B5_OES, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 256, 2 },
+ { GL_PALETTE8_RGBA4_OES, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, 256, 2 },
+ { GL_PALETTE8_RGB5_A1_OES, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 256, 2 }
+};
+
+
+/**
+ * Get a color/entry from the palette.
+ */
+static GLuint
+get_palette_entry(const struct cpal_format_info *info, const GLubyte *palette,
+ GLuint index, GLubyte *pixel)
+{
+ memcpy(pixel, palette + info->size * index, info->size);
+ return info->size;
+}
+
+
+/**
+ * Convert paletted texture to color texture.
+ */
+static void
+paletted_to_color(const struct cpal_format_info *info, const GLubyte *palette,
+ const void *indices, GLuint num_pixels, GLubyte *image)
+{
+ GLubyte *pix = image;
+ GLuint remain, i;
+
+ if (info->palette_size == 16) {
+ /* 4 bits per index */
+ const GLubyte *ind = (const GLubyte *) indices;
+
+ /* two pixels per iteration */
+ remain = num_pixels % 2;
+ for (i = 0; i < num_pixels / 2; i++) {
+ pix += get_palette_entry(info, palette, (ind[i] >> 4) & 0xf, pix);
+ pix += get_palette_entry(info, palette, ind[i] & 0xf, pix);
+ }
+ if (remain) {
+ get_palette_entry(info, palette, (ind[i] >> 4) & 0xf, pix);
+ }
+ }
+ else {
+ /* 8 bits per index */
+ const GLubyte *ind = (const GLubyte *) indices;
+ for (i = 0; i < num_pixels; i++)
+ pix += get_palette_entry(info, palette, ind[i], pix);
+ }
+}
+
+
+static const struct cpal_format_info *
+cpal_get_info(GLint level, GLenum internalFormat,
+ GLsizei width, GLsizei height, GLsizei imageSize)
+{
+ const struct cpal_format_info *info;
+ GLint lvl, num_levels;
+ GLsizei w, h, expect_size;
+
+ info = &formats[internalFormat - GL_PALETTE4_RGB8_OES];
+ ASSERT(info->cpal_format == internalFormat);
+
+ if (level > 0) {
+ _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE,
+ "glCompressedTexImage2D(level=%d)", level);
+ return NULL;
+ }
+
+ num_levels = -level + 1;
+ expect_size = info->palette_size * info->size;
+ for (lvl = 0; lvl < num_levels; lvl++) {
+ w = width >> lvl;
+ if (!w)
+ w = 1;
+ h = height >> lvl;
+ if (!h)
+ h = 1;
+
+ if (info->palette_size == 16)
+ expect_size += (w * h + 1) / 2;
+ else
+ expect_size += w * h;
+ }
+ if (expect_size > imageSize) {
+ _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE,
+ "glCompressedTexImage2D(imageSize=%d)", imageSize);
+ return NULL;
+ }
+ return info;
+}
+
+/**
+ * Convert a call to glCompressedTexImage2D() where internalFormat is a
+ * compressed palette format into a regular GLubyte/RGBA glTexImage2D() call.
+ */
+void
+_mesa_cpal_compressed_teximage2d(GLenum target, GLint level,
+ GLenum internalFormat,
+ GLsizei width, GLsizei height,
+ GLsizei imageSize, const void *palette)
+{
+ const struct cpal_format_info *info;
+ GLint lvl, num_levels;
+ const GLubyte *indices;
+ GLint saved_align, align;
+ GET_CURRENT_CONTEXT(ctx);
+
+ info = cpal_get_info(level, internalFormat, width, height, imageSize);
+ if (!info)
+ return;
+
+ info = &formats[internalFormat - GL_PALETTE4_RGB8_OES];
+ ASSERT(info->cpal_format == internalFormat);
+ num_levels = -level + 1;
+
+ /* first image follows the palette */
+ indices = (const GLubyte *) palette + info->palette_size * info->size;
+
+ saved_align = ctx->Unpack.Alignment;
+ align = saved_align;
+
+ for (lvl = 0; lvl < num_levels; lvl++) {
+ GLsizei w, h;
+ GLuint num_texels;
+ GLubyte *image = NULL;
+
+ w = width >> lvl;
+ if (!w)
+ w = 1;
+ h = height >> lvl;
+ if (!h)
+ h = 1;
+ num_texels = w * h;
+ if (w * info->size % align) {
+ _mesa_PixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ align = 1;
+ }
+
+ /* allocate and fill dest image buffer */
+ if (palette) {
+ image = (GLubyte *) malloc(num_texels * info->size);
+ paletted_to_color(info, palette, indices, num_texels, image);
+ }
+
+ _mesa_TexImage2D(target, lvl, info->format, w, h, 0,
+ info->format, info->type, image);
+ if (image)
+ free(image);
+
+ /* advance index pointer to point to next src mipmap */
+ if (info->palette_size == 16)
+ indices += (num_texels + 1) / 2;
+ else
+ indices += num_texels;
+ }
+
+ if (saved_align != align)
+ _mesa_PixelStorei(GL_UNPACK_ALIGNMENT, saved_align);
+}
+
+#endif
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index 996218b16..1d567e430 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/src/mesa/main/texparam.c @@ -35,6 +35,8 @@ #include "main/context.h"
#include "main/formats.h"
#include "main/macros.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
#include "main/texcompress.h"
#include "main/texparam.h"
#include "main/teximage.h"
diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c index 8759c33ae..1947d32e6 100644 --- a/mesalib/src/mesa/main/texstore.c +++ b/mesalib/src/mesa/main/texstore.c @@ -58,6 +58,8 @@ #include "image.h"
#include "macros.h"
#include "mipmap.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "pack.h"
#include "imports.h"
#include "pack.h"
@@ -2063,13 +2065,14 @@ _mesa_texstore_argb2101010(TEXSTORE_PARAMS) }
else {
/* general path */
- const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
+ const GLfloat *tempImage = make_temp_float_image(ctx, dims,
baseInternalFormat,
baseFormat,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
- srcPacking);
- const GLchan *src = tempImage;
+ srcPacking,
+ ctx->_ImageTransferState);
+ const GLfloat *src = tempImage;
GLint img, row, col;
if (!tempImage)
return GL_FALSE;
@@ -2080,24 +2083,29 @@ _mesa_texstore_argb2101010(TEXSTORE_PARAMS) + dstXoffset * texelBytes;
if (baseInternalFormat == GL_RGBA) {
for (row = 0; row < srcHeight; row++) {
- GLuint *dstUS = (GLuint *) dstRow;
+ GLuint *dstUI = (GLuint *) dstRow;
for (col = 0; col < srcWidth; col++) {
- dstUS[col] = PACK_COLOR_2101010( CHAN_TO_UBYTE(src[ACOMP]),
- CHAN_TO_UBYTE(src[RCOMP]),
- CHAN_TO_UBYTE(src[GCOMP]),
- CHAN_TO_UBYTE(src[BCOMP]) );
+ GLushort a,r,g,b;
+
+ UNCLAMPED_FLOAT_TO_USHORT(a, src[ACOMP]);
+ UNCLAMPED_FLOAT_TO_USHORT(r, src[RCOMP]);
+ UNCLAMPED_FLOAT_TO_USHORT(g, src[GCOMP]);
+ UNCLAMPED_FLOAT_TO_USHORT(b, src[BCOMP]);
+ dstUI[col] = PACK_COLOR_2101010_US(a, r, g, b);
src += 4;
}
dstRow += dstRowStride;
}
} else if (baseInternalFormat == GL_RGB) {
for (row = 0; row < srcHeight; row++) {
- GLuint *dstUS = (GLuint *) dstRow;
+ GLuint *dstUI = (GLuint *) dstRow;
for (col = 0; col < srcWidth; col++) {
- dstUS[col] = PACK_COLOR_2101010( 0xff,
- CHAN_TO_UBYTE(src[RCOMP]),
- CHAN_TO_UBYTE(src[GCOMP]),
- CHAN_TO_UBYTE(src[BCOMP]) );
+ GLushort r,g,b;
+
+ UNCLAMPED_FLOAT_TO_USHORT(r, src[RCOMP]);
+ UNCLAMPED_FLOAT_TO_USHORT(g, src[GCOMP]);
+ UNCLAMPED_FLOAT_TO_USHORT(b, src[BCOMP]);
+ dstUI[col] = PACK_COLOR_2101010_US(0xffff, r, g, b);
src += 4;
}
dstRow += dstRowStride;
diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c index 6368f9325..2ff262fc6 100644 --- a/mesalib/src/mesa/main/transformfeedback.c +++ b/mesalib/src/mesa/main/transformfeedback.c @@ -34,6 +34,8 @@ #include "bufferobj.h"
#include "context.h"
#include "hash.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "transformfeedback.h"
#include "shaderapi.h"
#include "shaderobj.h"
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c index a6fdabea7..e55f2f1c0 100644 --- a/mesalib/src/mesa/main/uniforms.c +++ b/mesalib/src/mesa/main/uniforms.c @@ -39,6 +39,8 @@ #include "main/glheader.h"
#include "main/context.h"
#include "main/dispatch.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
@@ -511,7 +513,7 @@ get_uniform_rows_cols(const struct gl_program_parameter *p, *cols = p->Size;
}
else {
- *rows = p->Size / 4 + 1;
+ *rows = (p->Size + 3) / 4;
if (p->Size % 4 == 0)
*cols = 4;
else
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c index 92367a842..2d4a6b54b 100644 --- a/mesalib/src/mesa/main/varray.c +++ b/mesalib/src/mesa/main/varray.c @@ -33,6 +33,7 @@ #include "hash.h"
#include "image.h"
#include "macros.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "varray.h"
#include "arrayobj.h"
diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c index 99dc8b350..f18fa5fcc 100644 --- a/mesalib/src/mesa/main/version.c +++ b/mesalib/src/mesa/main/version.c @@ -22,7 +22,8 @@ */
-#include "context.h"
+#include "imports.h"
+#include "mtypes.h"
#include "version.h"
diff --git a/mesalib/src/mesa/main/version.h b/mesalib/src/mesa/main/version.h index 0dff499ef..ffe21fea5 100644 --- a/mesalib/src/mesa/main/version.h +++ b/mesalib/src/mesa/main/version.h @@ -1,6 +1,6 @@ /*
* Mesa 3-D graphics library
- * Version: 7.10
+ * Version: 7.11
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
* Copyright (C) 2009 VMware, Inc. All Rights Reserved.
@@ -33,9 +33,9 @@ struct gl_context; /* Mesa version */
#define MESA_MAJOR 7
-#define MESA_MINOR 10
+#define MESA_MINOR 11
#define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.10-devel"
+#define MESA_VERSION_STRING "7.11-devel"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/mesalib/src/mesa/main/viewport.c b/mesalib/src/mesa/main/viewport.c index 1b4e6c339..3c3b120e4 100644 --- a/mesalib/src/mesa/main/viewport.c +++ b/mesalib/src/mesa/main/viewport.c @@ -31,6 +31,7 @@ #include "context.h"
#include "macros.h"
+#include "mtypes.h"
#include "viewport.h"
diff --git a/mesalib/src/mesa/main/vtxfmt.c b/mesalib/src/mesa/main/vtxfmt.c index 6fec7f09b..f5e10661c 100644 --- a/mesalib/src/mesa/main/vtxfmt.c +++ b/mesalib/src/mesa/main/vtxfmt.c @@ -30,6 +30,7 @@ #include "api_arrayelt.h"
#include "context.h"
#include "imports.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "vtxfmt.h"
#include "eval.h"
diff --git a/mesalib/src/mesa/main/vtxfmt.h b/mesalib/src/mesa/main/vtxfmt.h index 235198747..d403669c2 100644 --- a/mesalib/src/mesa/main/vtxfmt.h +++ b/mesalib/src/mesa/main/vtxfmt.h @@ -34,6 +34,7 @@ #define _VTXFMT_H_
#include "compiler.h"
+#include "mfeatures.h"
#include "mtypes.h"
#if FEATURE_beginend
diff --git a/mesalib/src/mesa/state_tracker/st_atom.c b/mesalib/src/mesa/state_tracker/st_atom.c index ff1f61afe..34dff79e7 100644 --- a/mesalib/src/mesa/state_tracker/st_atom.c +++ b/mesalib/src/mesa/state_tracker/st_atom.c @@ -147,7 +147,11 @@ void st_validate_state( struct st_context *st ) /*printf("%s %x/%x\n", __FUNCTION__, state->mesa, state->st);*/
+#ifdef NDEBUG
+ if (0) {
+#else
if (1) {
+#endif
/* Debug version which enforces various sanity checks on the
* state flags which are generated and checked to help ensure
* state atoms are ordered correctly in the list.
diff --git a/mesalib/src/mesa/state_tracker/st_atom_constbuf.c b/mesalib/src/mesa/state_tracker/st_atom_constbuf.c index 5672215f7..87a479a22 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_constbuf.c +++ b/mesalib/src/mesa/state_tracker/st_atom_constbuf.c @@ -56,7 +56,6 @@ void st_upload_constants( struct st_context *st, unsigned shader_type)
{
struct pipe_context *pipe = st->pipe;
- struct pipe_resource **cbuf = &st->state.constants[shader_type];
assert(shader_type == PIPE_SHADER_VERTEX ||
shader_type == PIPE_SHADER_FRAGMENT ||
@@ -64,6 +63,7 @@ void st_upload_constants( struct st_context *st, /* update constants */
if (params && params->NumParameters) {
+ struct pipe_resource *cbuf;
const uint paramBytes = params->NumParameters * sizeof(GLfloat) * 4;
/* Update the constants which come from fixed-function state, such as
@@ -75,11 +75,12 @@ void st_upload_constants( struct st_context *st, /* We always need to get a new buffer, to keep the drivers simple and
* avoid gratuitous rendering synchronization.
+ * Let's use a user buffer to avoid an unnecessary copy.
*/
- pipe_resource_reference(cbuf, NULL );
- *cbuf = pipe_buffer_create(pipe->screen,
- PIPE_BIND_CONSTANT_BUFFER,
- paramBytes );
+ cbuf = pipe_user_buffer_create(pipe->screen,
+ params->ParameterValues,
+ paramBytes,
+ PIPE_BIND_CONSTANT_BUFFER);
if (ST_DEBUG & DEBUG_CONSTANTS) {
debug_printf("%s(shader=%d, numParams=%d, stateFlags=0x%x)\n",
@@ -88,17 +89,15 @@ void st_upload_constants( struct st_context *st, _mesa_print_parameter_list(params);
}
- /* load Mesa constants into the constant buffer */
- pipe_buffer_write(st->pipe, *cbuf,
- 0, paramBytes,
- params->ParameterValues);
+ st->pipe->set_constant_buffer(st->pipe, shader_type, 0, cbuf);
+ pipe_resource_reference(&cbuf, NULL);
- st->pipe->set_constant_buffer(st->pipe, shader_type, 0, *cbuf);
+ st->state.constants[shader_type].ptr = params->ParameterValues;
+ st->state.constants[shader_type].size = paramBytes;
}
- else if (*cbuf) {
- st->constants.tracked_state[shader_type].dirty.mesa = 0x0;
-
- pipe_resource_reference(cbuf, NULL);
+ else if (st->state.constants[shader_type].ptr) {
+ st->state.constants[shader_type].ptr = NULL;
+ st->state.constants[shader_type].size = 0;
st->pipe->set_constant_buffer(st->pipe, shader_type, 0, NULL);
}
}
diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c index 7dd63798d..3e27be271 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_clear.c +++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c @@ -470,13 +470,9 @@ st_Clear(struct gl_context *ctx, GLbitfield mask) if (mask & (1 << b)) {
struct gl_renderbuffer *rb
= ctx->DrawBuffer->Attachment[b].Renderbuffer;
- struct st_renderbuffer *strb;
+ struct st_renderbuffer *strb = st_renderbuffer(rb);
- assert(rb);
-
- strb = st_renderbuffer(rb);
-
- if (!strb->surface)
+ if (!strb || !strb->surface)
continue;
if (check_clear_color_with_quad( ctx, rb ))
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 8a63192d7..c348dd343 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -34,6 +34,7 @@ #include "main/image.h"
#include "main/bufferobj.h"
#include "main/macros.h"
+#include "main/mtypes.h"
#include "main/pack.h"
#include "main/texformat.h"
#include "main/texstore.h"
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c index 4bc01100a..d6df2a204 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c +++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c @@ -61,7 +61,8 @@ * during window resize.
*/
static GLboolean
-st_renderbuffer_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *rb,
+st_renderbuffer_alloc_storage(struct gl_context * ctx,
+ struct gl_renderbuffer *rb,
GLenum internalFormat,
GLuint width, GLuint height)
{
@@ -75,7 +76,8 @@ st_renderbuffer_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *r if (strb->format != PIPE_FORMAT_NONE)
format = strb->format;
else
- format = st_choose_renderbuffer_format(screen, internalFormat, rb->NumSamples);
+ format = st_choose_renderbuffer_format(screen, internalFormat,
+ rb->NumSamples);
/* init renderbuffer fields */
strb->Base.Width = width;
diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c index 4656930ac..593da8fa6 100644 --- a/mesalib/src/mesa/state_tracker/st_context.c +++ b/mesalib/src/mesa/state_tracker/st_context.c @@ -207,12 +207,6 @@ static void st_destroy_context_priv( struct st_context *st ) pipe_sampler_view_reference(&st->state.sampler_views[i], NULL);
}
- for (i = 0; i < Elements(st->state.constants); i++) {
- if (st->state.constants[i]) {
- pipe_resource_reference(&st->state.constants[i], NULL);
- }
- }
-
if (st->default_texture) {
st->ctx->Driver.DeleteTexture(st->ctx, st->default_texture);
st->default_texture = NULL;
@@ -245,7 +239,6 @@ void st_destroy_context( struct st_context *st ) for (i = 0; i < PIPE_SHADER_TYPES; i++) {
pipe->set_constant_buffer(pipe, i, 0, NULL);
- pipe_resource_reference(&st->state.constants[i], NULL);
}
_mesa_delete_program_cache(st->ctx, st->pixel_xfer.cache);
diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h index 348a5827d..492ee600e 100644 --- a/mesalib/src/mesa/state_tracker/st_context.h +++ b/mesalib/src/mesa/state_tracker/st_context.h @@ -92,7 +92,10 @@ struct st_context struct pipe_sampler_state samplers[PIPE_MAX_SAMPLERS];
struct pipe_sampler_state *sampler_list[PIPE_MAX_SAMPLERS];
struct pipe_clip_state clip;
- struct pipe_resource *constants[PIPE_SHADER_TYPES];
+ struct {
+ void *ptr;
+ unsigned size;
+ } constants[PIPE_SHADER_TYPES];
struct pipe_framebuffer_state framebuffer;
struct pipe_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];
struct pipe_scissor_state scissor;
@@ -105,15 +108,6 @@ struct st_context GLuint poly_stipple[32]; /**< In OpenGL's bottom-to-top order */
} state;
- struct {
- struct st_tracked_state tracked_state[PIPE_SHADER_TYPES];
- } constants;
-
- /* XXX unused: */
- struct {
- struct gl_fragment_program *fragment_program;
- } cb;
-
char vendor[100];
char renderer[100];
diff --git a/mesalib/src/mesa/state_tracker/st_draw_feedback.c b/mesalib/src/mesa/state_tracker/st_draw_feedback.c index b05e660ae..957912221 100644 --- a/mesalib/src/mesa/state_tracker/st_draw_feedback.c +++ b/mesalib/src/mesa/state_tracker/st_draw_feedback.c @@ -109,9 +109,7 @@ st_feedback_draw_vbo(struct gl_context *ctx, struct pipe_index_buffer ibuffer;
struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS];
struct pipe_transfer *ib_transfer = NULL;
- struct pipe_transfer *cb_transfer;
GLuint attr, i;
- ubyte *mapped_constants;
const void *mapped_indices = NULL;
assert(draw);
@@ -242,14 +240,10 @@ st_feedback_draw_vbo(struct gl_context *ctx, draw_set_mapped_index_buffer(draw, mapped_indices);
}
- /* map constant buffers */
- mapped_constants = pipe_buffer_map(pipe,
- st->state.constants[PIPE_SHADER_VERTEX],
- PIPE_TRANSFER_READ,
- &cb_transfer);
+ /* set the constant buffer */
draw_set_mapped_constant_buffer(st->draw, PIPE_SHADER_VERTEX, 0,
- mapped_constants,
- st->state.constants[PIPE_SHADER_VERTEX]->width0);
+ st->state.constants[PIPE_SHADER_VERTEX].ptr,
+ st->state.constants[PIPE_SHADER_VERTEX].size);
/* draw here */
@@ -258,9 +252,6 @@ st_feedback_draw_vbo(struct gl_context *ctx, }
- /* unmap constant buffers */
- pipe_buffer_unmap(pipe, cb_transfer);
-
/*
* unmap vertex/index buffers
*/
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index c80811a07..574730120 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -224,6 +224,7 @@ void st_init_extensions(struct st_context *st) ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
ctx->Extensions.ARB_fragment_program = GL_TRUE;
+ ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
ctx->Extensions.ARB_multisample = GL_TRUE;
ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; /* XXX temp */
diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c index 74d402daa..7952bb6ff 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.c +++ b/mesalib/src/mesa/state_tracker/st_manager.c @@ -513,7 +513,8 @@ st_context_flush(struct st_context_iface *stctxi, unsigned flags, }
static boolean
-st_context_teximage(struct st_context_iface *stctxi, enum st_texture_type target,
+st_context_teximage(struct st_context_iface *stctxi,
+ enum st_texture_type target,
int level, enum pipe_format internal_format,
struct pipe_resource *tex, boolean mipmap)
{
@@ -865,7 +866,8 @@ st_manager_validate_framebuffers(struct st_context *st) * Add a color renderbuffer on demand.
*/
boolean
-st_manager_add_color_renderbuffer(struct st_context *st, struct gl_framebuffer *fb,
+st_manager_add_color_renderbuffer(struct st_context *st,
+ struct gl_framebuffer *fb,
gl_buffer_index idx)
{
struct st_framebuffer *stfb = st_ws_framebuffer(fb);
diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c index 59165be04..50beaa766 100644 --- a/mesalib/src/mesa/state_tracker/st_program.c +++ b/mesalib/src/mesa/state_tracker/st_program.c @@ -409,6 +409,7 @@ st_translate_fragment_program(struct st_context *st, assert(!(key->bitmap && key->drawpixels));
+#if FEATURE_drawpix
if (key->bitmap) {
/* glBitmap drawing */
struct gl_fragment_program *fp;
@@ -434,6 +435,7 @@ st_translate_fragment_program(struct st_context *st, }
stfp = st_fragment_program(fp);
}
+#endif
if (!stfp->tgsi.tokens) {
/* need to translate Mesa instructions to TGSI now */
diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c index f39bd8a38..503f5b732 100644 --- a/mesalib/src/mesa/swrast/s_texfilter.c +++ b/mesalib/src/mesa/swrast/s_texfilter.c @@ -27,7 +27,6 @@ #include "main/context.h"
#include "main/colormac.h"
#include "main/imports.h"
-#include "main/texformat.h"
#include "s_context.h"
#include "s_texfilter.h"
diff --git a/mesalib/src/mesa/swrast/s_triangle.c b/mesalib/src/mesa/swrast/s_triangle.c index 93826b7ce..10a1dc1c1 100644 --- a/mesalib/src/mesa/swrast/s_triangle.c +++ b/mesalib/src/mesa/swrast/s_triangle.c @@ -34,7 +34,7 @@ #include "main/colormac.h"
#include "main/imports.h"
#include "main/macros.h"
-#include "main/texformat.h"
+#include "main/mtypes.h"
#include "program/prog_instruction.h"
#include "s_aatriangle.h"
diff --git a/mesalib/src/mesa/vbo/vbo_context.c b/mesalib/src/mesa/vbo/vbo_context.c index 67a6091ba..bbf422f74 100644 --- a/mesalib/src/mesa/vbo/vbo_context.c +++ b/mesalib/src/mesa/vbo/vbo_context.c @@ -209,7 +209,6 @@ GLboolean _vbo_CreateContext( struct gl_context *ctx ) void _vbo_InvalidateState( struct gl_context *ctx, GLuint new_state )
{
- _ae_invalidate_state(ctx, new_state);
vbo_exec_invalidate_state(ctx, new_state);
}
|