Module: Mesa Branch: master Commit: bc8bfdc42cce18cf3a44f487b73460bebe8c2ae4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc8bfdc42cce18cf3a44f487b73460bebe8c2ae4
Author: Eric Anholt <[email protected]> Date: Wed Jun 5 14:46:19 2013 -0700 mesa: Expose MAX_FRAGMENT_INPUT_COMPONENTS on ES3 and desktop 3.2. piglit OpenGL ES 3.0/minmax now passes. This was also one of the subcase failures in OpenGL 3.2/minmax (and still is, because our value is too low for 3.2, but at least we report what it is). Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> --- src/mesa/main/get.c | 7 +++++++ src/mesa/main/get_hash_params.py | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index b7462e7..d31ba01 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -407,6 +407,12 @@ static const int extra_gl30_es3[] = { EXTRA_END, }; +static const int extra_gl32_es3[] = { + EXTRA_VERSION_32, + EXTRA_API_ES3, + EXTRA_END, +}; + static const int extra_ARB_vertex_program_api_es2[] = { EXT(ARB_vertex_program), @@ -724,6 +730,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu break; case GL_MAX_VARYING_FLOATS_ARB: + case GL_MAX_FRAGMENT_INPUT_COMPONENTS: v->value_int = ctx->Const.MaxVarying * 4; break; diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 248269f..f47b33f 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -329,6 +329,9 @@ descriptor=[ [ "MAJOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], [ "MINOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], + # GL 3.0 / GLES3 + [ "MAX_FRAGMENT_INPUT_COMPONENTS", "LOC_CUSTOM, TYPE_INT, 0, extra_gl32_es3" ], + # GL_ARB_ES3_compatibility [ "MAX_ELEMENT_INDEX", "CONTEXT_INT64(Const.MaxElementIndex), extra_ARB_ES3_compatibility_api_es3"], _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
