fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glcpp: Define GL_EXT_shader_integer_mix in both GL and ES.

Browse source 
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 66ef8feb4d)

Conflicts:
	src/glsl/glcpp/glcpp-parse.y
This commit is contained in:
Matt Turner 2014-01-17 14:32:19 -08:00 • committed by Carl Worth
parent 31b2e73a2d
commit 0cd3d50f07
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/glsl/glcpp/glcpp-parse.y
View file

@ -1272,9 +1272,6 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
if (extensions->ARB_sample_shading)
add_builtin_define(parser, "GL_ARB_sample_shading", 1);
if (extensions->EXT_shader_integer_mix)
add_builtin_define(parser, "GL_EXT_shader_integer_mix", 1);
if (extensions->ARB_texture_gather)
add_builtin_define(parser, "GL_ARB_texture_gather", 1);
@ -1283,6 +1280,11 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
}
}
if (extensions != NULL) {
if (extensions->EXT_shader_integer_mix)
add_builtin_define(parser, "GL_EXT_shader_integer_mix", 1);
}
language_version = 110;
add_builtin_define(parser, "__VERSION__", language_version);