diff options
| author | Ian Romanick <[email protected]> | 2013-09-10 10:10:07 -0500 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-09-19 16:29:44 -0500 |
| commit | d1ade4eaf1e44e846be9b58035397bbdb3f50ed2 (patch) | |
| tree | 204a591b256da1e87a3cda215dba28ff2962acb7 | |
| parent | 67a2d317353f3917678a4e22228ea52b149a370f (diff) | |
mesa: Get GL_MAX_VERTEX_OUTPUT_COMPONENTS from VertexProgram.MaxOutputComponents
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
| -rw-r--r-- | src/mesa/main/get.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 2 |
2 files changed, 1 insertions, 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 |