diff options
| author | Chad Versace <[email protected]> | 2012-11-20 17:04:45 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-01-10 10:57:51 -0800 |
| commit | 75b963c095d28e1a1b31753142e2d5f934b62f79 (patch) | |
| tree | 70550f02c8122e1c9c575412197f6eabf049f36c /src | |
| parent | 532e05a9d094fdcdeb2c8dfd0bec6eab82dc8163 (diff) | |
mesa: Support more glGet enums for ES3
For glGetIntegerv, add support for the following in an OpenGL ES 3.0
context:
GL_MAJOR_VERSION
GL_MINOR_VERSION
GL_NUM_EXTENSIONS
See Table 6.29 of the OpenGL ES 3.0 spec.
Fixes error GL_INVALID_ENUM in piglit egl-create-context-verify-gl-flavor,
testcase for OpenGL ES 3.0.
Reviewed-by: Kenneth Graunke <[email protected]> (v1)
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/get.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index e15cbd473a8..039c32161d9 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -364,6 +364,12 @@ static const int extra_version_30[] = { EXTRA_VERSION_30, EXTRA_END }; static const int extra_version_31[] = { EXTRA_VERSION_31, EXTRA_END }; static const int extra_version_32[] = { EXTRA_VERSION_32, EXTRA_END }; +static const int extra_gl30_es3[] = { + EXTRA_VERSION_30, + EXTRA_API_ES3, + EXTRA_END, +}; + static const int extra_ARB_vertex_program_api_es2[] = { EXT(ARB_vertex_program), diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index c0826c7caf0..3db820a7760 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -321,6 +321,11 @@ descriptor=[ # Enums in OpenGL and ES 3.0 { "apis": ["GL", "GL_CORE", "GLES3"], "params": [ +# GL 3.0 / GLES3 + [ "NUM_EXTENSIONS", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], + [ "MAJOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], + [ "MINOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], + # GL_ARB_ES3_compatibility [ "MAX_ELEMENT_INDEX", "CONTEXT_INT64(Const.MaxElementIndex), extra_ARB_ES3_compatibility_api_es3"], @@ -661,9 +666,6 @@ descriptor=[ [ "SAMPLER_BINDING", "LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, NO_EXTRA" ], # GL 3.0 - [ "NUM_EXTENSIONS", "LOC_CUSTOM, TYPE_INT, 0, extra_version_30" ], - [ "MAJOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_version_30" ], - [ "MINOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_version_30" ], [ "CONTEXT_FLAGS", "CONTEXT_INT(Const.ContextFlags), extra_version_30" ], # GL3.0 / GL_EXT_framebuffer_sRGB |