Mesa (master): glsl: Set gl_MaxVertexOutputs from VertexProgram. MaxOutputComponents etc

[Ian Romanick]

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

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

glsl: Set gl_MaxVertexOutputs from VertexProgram.MaxOutputComponents etc

gl_MaxVertexOutputVectors => ctx->Const.VertexProgram.MaxOutputComponents
gl_MaxFragmentInputVectors => ctx->Const.FragmentProgram.MaxInputComponents

v2: Add types so that the code compiles.  Pointed out by Brian.

v3: Leave gl_MaxVaryingFloats et al. as-is.  Suggested by Paul.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com> [v2]
Reviewed-by: Marek Olšák <marek.olsak at amd.com> [v2]
Reviewed-by: Paul Berry <stereotype441 at gmail.com> [v2]

---

 src/glsl/builtin_variables.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 6a808c0..a75bb6d 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -497,9 +497,9 @@ builtin_variable_generator::generate_constants()
        */
       if (state->is_version(0, 300)) {
          add_const("gl_MaxVertexOutputVectors",
-                   state->Const.MaxVaryingFloats / 4);
+                   state->ctx->Const.VertexProgram.MaxOutputComponents / 4);
          add_const("gl_MaxFragmentInputVectors",
-                   state->Const.MaxVaryingFloats / 4);
+                   state->ctx->Const.FragmentProgram.MaxInputComponents / 4);
       } else {
          add_const("gl_MaxVaryingVectors", state->Const.MaxVaryingFloats / 4);
       }