diff options
| author | Marek Olšák <[email protected]> | 2013-05-29 17:32:44 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-06-13 03:54:13 +0200 |
| commit | 45595d506646f560ab16af58acdea2fc563e942b (patch) | |
| tree | 554838041f27519cde08e0a146433a43f549d9df /src/glsl/glcpp/glcpp-parse.y | |
| parent | cfa3c5ad828f56559a6cc2de299f993b8e748ea4 (diff) | |
mesa: fix OES_EGL_image_external being partially allowed in the core profile
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/glcpp-parse.y')
| -rw-r--r-- | src/glsl/glcpp/glcpp-parse.y | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y index fe36c124d1c..6cb5009e861 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -1184,14 +1184,14 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api) parser->is_gles = false; /* Add pre-defined macros. */ - if (extensions != NULL) { - if (extensions->OES_EGL_image_external) - add_builtin_define(parser, "GL_OES_EGL_image_external", 1); - } - if (api == API_OPENGLES2) { - parser->is_gles = true; - add_builtin_define(parser, "GL_ES", 1); + parser->is_gles = true; + add_builtin_define(parser, "GL_ES", 1); + + if (extensions != NULL) { + if (extensions->OES_EGL_image_external) + add_builtin_define(parser, "GL_OES_EGL_image_external", 1); + } } else { add_builtin_define(parser, "GL_ARB_draw_buffers", 1); add_builtin_define(parser, "GL_ARB_texture_rectangle", 1); |