summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2013-09-10 12:13:04 -0500
committerIan Romanick <ian.d.romanick@intel.com>2013-10-07 09:59:23 -0700
commit7db50171be05016fc0a4501c0fd62ef2bed78fbf (patch)
tree787ea96fe2e1794cf052291e8015fbf0cc98b447
parent42305fb50256c12b8e7a516115e72ae7089ccd1b (diff)
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@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> [v2] Reviewed-by: Marek Olšák <marek.olsak@amd.com> [v2] Reviewed-by: Paul Berry <stereotype441@gmail.com> [v2]
-rw-r--r--src/glsl/builtin_variables.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 6a808c072a2..a75bb6ddab4 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);
}