diff options
author | Paul Berry <[email protected]> | 2012-08-06 10:22:44 -0700 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2012-12-06 12:13:21 -0800 |
commit | 9a93ba306878693d9157d204743a82becbd5d53e (patch) | |
tree | bdc03477bcb42f651a97d2ef456a13445eab64a1 /src/glsl | |
parent | e0f2ffc3d9dfa1c0492370d4d86a310c56a99e90 (diff) |
mesa: Add ARB_ES3_compatibility flag.
Adding this now makes it easier to develop and test GLES3 features, since we
can do initial development and testing using desktop GL. Later GLSL compiler
patches check for either ctx->Extensions.ARB_ES3_compatibility or
_mesa_is_gles3 to allow certain features (i.e., "#version 300 es").
[v2, idr]: Just edits to the commit message.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Acked-by: Carl Worth <[email protected]>
Diffstat (limited to 'src/glsl')
-rwxr-xr-x | src/glsl/builtins/tools/generate_builtins.py | 1 | ||||
-rw-r--r-- | src/glsl/standalone_scaffolding.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py index 0b7f6a04403..14a72fc07a5 100755 --- a/src/glsl/builtins/tools/generate_builtins.py +++ b/src/glsl/builtins/tools/generate_builtins.py @@ -176,6 +176,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne fakeCtx.API = API_OPENGL_COMPAT; fakeCtx.Const.GLSLVersion = 140; fakeCtx.Extensions.ARB_ES2_compatibility = true; + fakeCtx.Extensions.ARB_ES3_compatibility = true; fakeCtx.Const.ForceGLSLExtensionsWarn = false; gl_shader *sh = _mesa_new_shader(NULL, 0, target); struct _mesa_glsl_parse_state *st = diff --git a/src/glsl/standalone_scaffolding.cpp b/src/glsl/standalone_scaffolding.cpp index 120ee953471..33d3804c670 100644 --- a/src/glsl/standalone_scaffolding.cpp +++ b/src/glsl/standalone_scaffolding.cpp @@ -73,6 +73,7 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api) ctx->Extensions.dummy_false = false; ctx->Extensions.dummy_true = true; ctx->Extensions.ARB_ES2_compatibility = true; + ctx->Extensions.ARB_ES3_compatibility = false; ctx->Extensions.ARB_draw_instanced = true; ctx->Extensions.ARB_fragment_coord_conventions = true; ctx->Extensions.EXT_texture_array = true; |