diff options
| author | Matt Turner <[email protected]> | 2012-12-08 17:17:19 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-01-10 10:57:51 -0800 |
| commit | 92855727f1e0ce1a9861e8f7b6c3ca2b6ffbe440 (patch) | |
| tree | 37e8ff366e306923ecf89d4bf8211d5da5e002d5 /src/mesa/main | |
| parent | 5bb1827d9537c6fca438baeae68eb097dcb44a65 (diff) | |
mesa: De-duplicate ES2 queries
From GL/GLES/GL_CORE and GLES2 -> GL/GL_CORE/GLES2.
Yes, we really were exposing ES2_compatibility queries on ES 1.
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/get.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 91ba599513e..6490db20da3 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -303,8 +303,12 @@ static const int extra_ARB_uniform_buffer_object_and_geometry_shader[] = { EXTRA_END }; +static const int extra_ARB_ES2_compatibility_api_es2[] = { + EXT(ARB_ES2_compatibility), + EXTRA_API_ES2, + EXTRA_END +}; -EXTRA_EXT(ARB_ES2_compatibility); EXTRA_EXT(ARB_texture_cube_map); EXTRA_EXT(MESA_texture_array); EXTRA_EXT2(EXT_secondary_color, ARB_vertex_program); diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 650fb385470..3ad61d30df7 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -204,12 +204,6 @@ descriptor=[ [ "TEXTURE_COORD_ARRAY_TYPE", "LOC_CUSTOM, TYPE_ENUM, offsetof(struct gl_client_array, Type), NO_EXTRA" ], [ "TEXTURE_COORD_ARRAY_STRIDE", "LOC_CUSTOM, TYPE_INT, offsetof(struct gl_client_array, Stride), NO_EXTRA" ], -# GL_ARB_ES2_compatibility - [ "SHADER_COMPILER", "CONST(1), extra_ARB_ES2_compatibility" ], - [ "MAX_VARYING_VECTORS", "CONTEXT_INT(Const.MaxVarying), extra_ARB_ES2_compatibility" ], - [ "MAX_VERTEX_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility" ], - [ "MAX_FRAGMENT_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility" ], - # GL_ARB_multitexture [ "MAX_TEXTURE_UNITS", "CONTEXT_INT(Const.MaxTextureUnits), NO_EXTRA" ], [ "CLIENT_ACTIVE_TEXTURE", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], @@ -310,6 +304,12 @@ descriptor=[ # GL_NV_read_buffer [ "READ_BUFFER", "LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, extra_NV_read_buffer_api_gl" ], + +# GL_ARB_ES2_compatibility + [ "SHADER_COMPILER", "CONST(1), extra_ARB_ES2_compatibility_api_es2" ], + [ "MAX_VARYING_VECTORS", "CONTEXT_INT(Const.MaxVarying), extra_ARB_ES2_compatibility_api_es2" ], + [ "MAX_VERTEX_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility_api_es2" ], + [ "MAX_FRAGMENT_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility_api_es2" ], ]}, # GLES3 is not a typo. @@ -373,10 +373,6 @@ descriptor=[ # Enums unique to OpenGL ES 2.0 { "apis": ["GLES2"], "params": [ - [ "MAX_FRAGMENT_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], - [ "MAX_VARYING_VECTORS", "CONTEXT_INT(Const.MaxVarying), NO_EXTRA" ], - [ "MAX_VERTEX_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], - [ "SHADER_COMPILER", "CONST(1), NO_EXTRA" ], # OES_get_program_binary [ "NUM_SHADER_BINARY_FORMATS", "CONST(0), NO_EXTRA" ], [ "SHADER_BINARY_FORMATS", "CONST(0), NO_EXTRA" ], |