diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-18 08:09:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-18 08:09:44 +0200 |
| commit | 09bfe74fc7d4a6f97eddb034df371e66e314ea12 (patch) | |
| tree | b63caf666a8c36ddcc9a4202f7cecac49998e98d /mesalib/src/glsl/glsl_parser_extras.h | |
| parent | 5a54fa6e45ee10cf58ee1b6d2eb5522a24bb8745 (diff) | |
| parent | 7f669a708bd35bdf8e842f762ec68f9ad0ec0486 (diff) | |
| download | vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.tar.gz vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.tar.bz2 vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman xserver git update 18 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 72bc9db5e..6e3b0282d 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -319,8 +319,8 @@ struct _mesa_glsl_parse_state { bool AMD_vertex_shader_layer_warn; bool ARB_shading_language_420pack_enable; bool ARB_shading_language_420pack_warn; - bool MESA_shader_integer_mix_enable; - bool MESA_shader_integer_mix_warn; + bool EXT_shader_integer_mix_enable; + bool EXT_shader_integer_mix_warn; /*@}*/ /** Extensions supported by the OpenGL implementation. */ |