From: Ian Romanick <ian.d.roman...@intel.com>
Previously gl_constants::MaxVaryingComponents was used. Now
gl_constants::VertexProgram::MaxOutputs and
gl_constants::GeometryProgram::MaxOutputs are used.
This means that st_extensions.c had to be updated to set these fields
instead of o MaxVaryingComponents. It was previously the only place
that set MaxVaryingComponents.
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
Cc: Paul Berry <stereotype...@gmail.com>
Cc: Marek Olšák <mar...@gmail.com>
Cc: Brian Paul <bri...@vmware.com>
Cc: Zack Rusin <za...@vmware.com>
---
src/mesa/main/get_hash_params.py | 4 ++--
src/mesa/state_tracker/st_extensions.c | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index ca312ee..48bd371 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -651,8 +651,8 @@ descriptor=[
[ "MAX_GEOMETRY_OUTPUT_VERTICES_ARB",
"CONTEXT_INT(Const.MaxGeometryOutputVertices), extra_ARB_geometry_shader4" ],
[ "MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB",
"CONTEXT_INT(Const.MaxGeometryTotalOutputComponents),
extra_ARB_geometry_shader4" ],
[ "MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB",
"CONTEXT_INT(Const.GeometryProgram.MaxUniformComponents),
extra_ARB_geometry_shader4" ],
- [ "MAX_GEOMETRY_VARYING_COMPONENTS_ARB",
"CONTEXT_INT(Const.MaxVaryingComponents), extra_ARB_geometry_shader4" ],
- [ "MAX_VERTEX_VARYING_COMPONENTS_ARB",
"CONTEXT_INT(Const.MaxVaryingComponents), extra_ARB_geometry_shader4" ],
+ [ "MAX_GEOMETRY_VARYING_COMPONENTS_ARB",
"CONTEXT_INT(Const.GeometryProgram.MaxOutputComponents),
extra_ARB_geometry_shader4" ],
+ [ "MAX_VERTEX_VARYING_COMPONENTS_ARB",
"CONTEXT_INT(Const.VertexProgram.MaxOutputComponents),
extra_ARB_geometry_shader4" ],
# GL_ARB_color_buffer_float
[ "RGBA_FLOAT_MODE_ARB", "BUFFER_FIELD(Visual.floatMode, TYPE_BOOLEAN),
extra_core_ARB_color_buffer_float_and_new_buffers" ],
diff --git a/src/mesa/state_tracker/st_extensions.c
b/src/mesa/state_tracker/st_extensions.c
index 0b7001b..97dd732 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -256,7 +256,10 @@ void st_init_limits(struct st_context *st)
c->MaxVarying = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT,
PIPE_SHADER_CAP_MAX_INPUTS);
c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING);
- c->MaxVaryingComponents = c->MaxVarying * 4;
+ c->FragmentProgram.MaxInputComponents = c->MaxVarying * 4;
+ c->VertexProgram.MaxOutputComponents = c->MaxVarying * 4;
+ c->GeometryProgram.MaxInputComponents = c->MaxVarying * 4;
+ c->GeometryProgram.MaxOutputComponents = c->MaxVarying * 4;
c->MinProgramTexelOffset = screen->get_param(screen,
PIPE_CAP_MIN_TEXEL_OFFSET);
c->MaxProgramTexelOffset = screen->get_param(screen,
PIPE_CAP_MAX_TEXEL_OFFSET);
--
1.8.1.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
