Mesa (master): mesa: Get GL_MAX_VERTEX_OUTPUT_COMPONENTS from VertexProgram .MaxOutputComponents

[Ian Romanick]

Module: Mesa
Branch: master
Commit: d1ade4eaf1e44e846be9b58035397bbdb3f50ed2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1ade4eaf1e44e846be9b58035397bbdb3f50ed2

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Sep 10 10:10:07 2013 -0500

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 <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>

---

 src/mesa/main/get.c              |    1 -
 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 e7c24c7..4f6f59a 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 48bd371..a6ec120 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