From d1ade4eaf1e44e846be9b58035397bbdb3f50ed2 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 10 Sep 2013 10:10:07 -0500 Subject: [PATCH] mesa: Get GL_MAX_VERTEX_OUTPUT_COMPONENTS from VertexProgram.MaxOutputComponents MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In OpenGL ES 3.0 the minimum-maximum for GL_MAX_VERTEX_OUTPUT_VECTORS is 16, but the minimum-maximum for GL_MAX_FRAGMENT_INTPUT_VECTORS is 15. Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Reviewed-by: Marek Olšák Reviewed-by: Paul Berry --- src/mesa/main/get.c | 1 - src/mesa/main/get_hash_params.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index e7c24c71eb2..4f6f59ae6bb 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -714,7 +714,6 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu case GL_MAX_VARYING_FLOATS_ARB: case GL_MAX_FRAGMENT_INPUT_COMPONENTS: - case GL_MAX_VERTEX_OUTPUT_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 48bd3719577..a6ec1205176 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -330,7 +330,7 @@ descriptor=[ [ "MINOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], # GL 3.0 / GLES3 - [ "MAX_VERTEX_OUTPUT_COMPONENTS", "LOC_CUSTOM, TYPE_INT, 0, extra_gl32_es3" ], + [ "MAX_VERTEX_OUTPUT_COMPONENTS", "CONTEXT_INT(Const.VertexProgram.MaxOutputComponents), extra_gl32_es3" ], [ "MAX_FRAGMENT_INPUT_COMPONENTS", "LOC_CUSTOM, TYPE_INT, 0, extra_gl32_es3" ], # GL_ARB_ES3_compatibility -- 2.30.2