OSDN Git Service

mesa: Use correct data for MAX_{VERTEX,GEOMETRY}_VARYING_COMPONENTS_ARB queries
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 10 Sep 2013 14:35:58 +0000 (09:35 -0500)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 19 Sep 2013 21:29:44 +0000 (16:29 -0500)
commitd91249df1a9f99813794aac09c4fba77831da1f7
tree5c9e37f266517a63128115944f17ce0fdffb57c7
parenta384238c3dbcc89f7acc51027b123e50d2d3ae60
mesa: Use correct data for MAX_{VERTEX,GEOMETRY}_VARYING_COMPONENTS_ARB queries

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 MaxVaryingComponents.  It was previously the only place that
set MaxVaryingComponents.

I believe that the structure is allocated by calloc, so the value should
be initialized to zero in non-Gallium drivers before and after my
change.  Right now nobody enables GL_ARB_geometry_shader4, so it's
pretty much dead code anyway.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Cc: Zack Rusin <zackr@vmware.com>
src/mesa/main/get_hash_params.py
src/mesa/state_tracker/st_extensions.c