diff options
| author | Ian Romanick <[email protected]> | 2013-09-10 10:12:16 -0500 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-09-19 16:29:44 -0500 |
| commit | 965d9e649db3a6e8e1a07c13d49f265aeb8b3365 (patch) | |
| tree | d2bb94b60d18d9d365d11ad997169313b86a294c | |
| parent | d1ade4eaf1e44e846be9b58035397bbdb3f50ed2 (diff) | |
mesa: Get GL_MAX_FRAGMENT_INPUT_COMPONENTS from FragmentProgram.MaxInputComponents
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 4f6f59ae6bb..e33135db575 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -713,7 +713,6 @@ 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 a6ec1205176..138413498f9 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -331,7 +331,7 @@ descriptor=[ # GL 3.0 / GLES3 [ "MAX_VERTEX_OUTPUT_COMPONENTS", "CONTEXT_INT(Const.VertexProgram.MaxOutputComponents), extra_gl32_es3" ], - [ "MAX_FRAGMENT_INPUT_COMPONENTS", "LOC_CUSTOM, TYPE_INT, 0, extra_gl32_es3" ], + [ "MAX_FRAGMENT_INPUT_COMPONENTS", "CONTEXT_INT(Const.FragmentProgram.MaxInputComponents), extra_gl32_es3" ], # GL_ARB_ES3_compatibility [ "MAX_ELEMENT_INDEX", "CONTEXT_INT64(Const.MaxElementIndex), extra_ARB_ES3_compatibility_api_es3"], |