OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Add a flag to the parser state to indicate GLES.

Browse Source 
This can be triggered either by creation of a GLES context (with
api == API_OPENGLES2) or else by a #version directive with version
value 100 or with a string of "es" following the version value.

There's no behavioral change with this commit—just preparation for ES-specific
behavior in the preprocessor in the future.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Carl Worth
2012-11-26 14:53:54 -08:00
committed by Ian Romanick
parent 100440d1b1
commit 77e1bc9f1d
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/glsl/glcpp/glcpp-parse.y
View File

@@ -1179,15 +1179,18 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
parser->has_new_source_number = 0; parser->has_new_source_number = 0;
parser->new_source_number = 0; parser->new_source_number = 0;
parser->is_gles = false;
/* Add pre-defined macros. */ /* Add pre-defined macros. */
if (extensions != NULL) { if (extensions != NULL) {
if (extensions->OES_EGL_image_external) if (extensions->OES_EGL_image_external)
add_builtin_define(parser, "GL_OES_EGL_image_external", 1); add_builtin_define(parser, "GL_OES_EGL_image_external", 1);
} }
if (api == API_OPENGLES2) if (api == API_OPENGLES2) {
parser->is_gles = true;
add_builtin_define(parser, "GL_ES", 1); add_builtin_define(parser, "GL_ES", 1);
else { } else {
add_builtin_define(parser, "GL_ARB_draw_buffers", 1); add_builtin_define(parser, "GL_ARB_draw_buffers", 1);
add_builtin_define(parser, "GL_ARB_texture_rectangle", 1); add_builtin_define(parser, "GL_ARB_texture_rectangle", 1);
@@ -2026,11 +2029,6 @@ static void
_glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t version, _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t version,
const char *es_identifier) const char *es_identifier)
{ {
/* Note: We assume that if any identifier is present, it means ES.
* The GLSL parser will double-check that the identifier is correct.
*/
bool is_es = es_identifier != NULL;
macro_t *macro = hash_table_find (parser->defines, "__VERSION__"); macro_t *macro = hash_table_find (parser->defines, "__VERSION__");
if (macro) { if (macro) {
hash_table_remove (parser->defines, "__VERSION__"); hash_table_remove (parser->defines, "__VERSION__");
@@ -2038,17 +2036,23 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
} }
add_builtin_define (parser, "__VERSION__", version); add_builtin_define (parser, "__VERSION__", version);
if (version == 100) /* If we didn't have a GLES context to begin with, (indicated
is_es = true; * by parser->api), then the version declaration here might
if (is_es) * indicate GLES. */
if (! parser->is_gles &&
(version == 100 ||
(es_identifier && (strcmp(es_identifier, "es") == 0))))
{
parser->is_gles = true;
add_builtin_define (parser, "GL_ES", 1); add_builtin_define (parser, "GL_ES", 1);
}
/* Currently, all ES2/ES3 implementations support highp in the /* Currently, all ES2/ES3 implementations support highp in the
* fragment shader, so we always define this macro in ES2/ES3. * fragment shader, so we always define this macro in ES2/ES3.
* If we ever get a driver that doesn't support highp, we'll * If we ever get a driver that doesn't support highp, we'll
* need to add a flag to the gl_context and check that here. * need to add a flag to the gl_context and check that here.
*/ */
if (version >= 130 || is_es) if (version >= 130 || parser->is_gles)
add_builtin_define (parser, "GL_FRAGMENT_PRECISION_HIGH", 1); add_builtin_define (parser, "GL_FRAGMENT_PRECISION_HIGH", 1);
ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length,

1
src/glsl/glcpp/glcpp.h
View File

@@ -182,6 +182,7 @@ struct glcpp_parser {
int new_line_number; int new_line_number;
bool has_new_source_number; bool has_new_source_number;
int new_source_number; int new_source_number;
bool is_gles;
}; };
struct gl_extensions; struct gl_extensions;