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.cpp | |
| 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.cpp')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 1e4d7c7ab..cac5a18e4 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -517,7 +517,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(ARB_texture_query_lod, true, false, ARB_texture_query_lod), EXT(ARB_gpu_shader5, true, false, ARB_gpu_shader5), EXT(AMD_vertex_shader_layer, true, false, AMD_vertex_shader_layer), - EXT(MESA_shader_integer_mix, true, true, MESA_shader_integer_mix), + EXT(EXT_shader_integer_mix, true, true, EXT_shader_integer_mix), }; #undef EXT |