[Mesa-dev] [PATCH 0/6] Make gl_array_object use an array of gl_client_attribs V2

[Mathias Fröhlich]

Hi,

following a patch series to make gl_array_object use a VERT_ATTRIB_*
indexed array of gl_client_array structs.
Since we have already 33 client arrays in an array object the VERT_BIT_* and
for vertex shader inputs bitmaps are extended to 64 bits. Drivers
and shader code is updated to use the 64 bits bitmasks for
the vertex array inputs.

Changes since V1:
 Compute VERT_BIT*ALL defines. Remove consistency checks.
 Squash all three 'Make gl_program::InputsRead 64 bits' into a single patch.
 Omit the last two patches which need some further thoughts.
 Update a few requested minor changes.

The patchset survives a r600 piglit run on my favourite rv670 development 
machine with no regressions.

Please review.

Thanks

Mathias



Mathias Fröhlich (6):
  mesa: Introduce more symbolic VERT_{ATTRIB,BIT}* defines.
  mesa: Replace _NEW_ARRAY_* bits with VERT_BIT_*
  vbo: Use The VERT_{ATTRIB,BIT} defines.
  mesa: Make gl_array_object::_Enabled 64 bits.
  mesa: Make gl_program::InputsRead 64 bits.
  mesa: Use VERT_ATTRIB_* indexed array in gl_array_object.

 src/mesa/drivers/dri/i915/i915_fragprog.c      |    4 +-
 src/mesa/drivers/dri/i965/brw_context.h        |    2 +-
 src/mesa/drivers/dri/i965/brw_draw_upload.c    |    6 +-
 src/mesa/drivers/dri/i965/brw_vs.c             |    4 +-
 src/mesa/drivers/dri/i965/brw_vs_constval.c    |    2 +-
 src/mesa/drivers/dri/i965/brw_vs_emit.c        |    4 +-
 src/mesa/drivers/dri/i965/gen6_wm_state.c      |    2 +-
 src/mesa/drivers/dri/i965/gen7_wm_state.c      |    2 +-
 src/mesa/drivers/dri/r200/r200_vertprog.c      |   31 +++--
 src/mesa/main/api_arrayelt.c                   |   38 +++---
 src/mesa/main/api_validate.c                   |    6 +-
 src/mesa/main/arrayobj.c                       |   96 +++++-------
 src/mesa/main/attrib.c                         |   13 --
 src/mesa/main/bufferobj.c                      |   11 --
 src/mesa/main/context.c                        |    2 +-
 src/mesa/main/enable.c                         |   66 ++++----
 src/mesa/main/ff_fragment_shader.cpp           |    2 +-
 src/mesa/main/ffvertex_prog.c                  |   18 +-
 src/mesa/main/get.c                            |   98 ++++++------
 src/mesa/main/getstring.c                      |   18 +-
 src/mesa/main/mtypes.h                         |  199 ++++++++++-------------
 src/mesa/main/nvprogram.c                      |    8 +-
 src/mesa/main/state.c                          |   85 +++++-----
 src/mesa/main/state.h                          |    2 +-
 src/mesa/main/varray.c                         |  110 ++++++-------
 src/mesa/program/program_parse.y               |    6 +-
 src/mesa/program/programopt.c                  |    4 +-
 src/mesa/state_tracker/st_atom_pixeltransfer.c |    2 +-
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp     |    8 +-
 src/mesa/state_tracker/st_program.c            |   10 +-
 src/mesa/tnl/t_vb_program.c                    |    2 +-
 src/mesa/vbo/vbo_attrib.h                      |   59 ++++----
 src/mesa/vbo/vbo_context.c                     |   26 ++--
 src/mesa/vbo/vbo_exec.h                        |    4 +-
 src/mesa/vbo/vbo_exec_api.c                    |   24 ++-
 src/mesa/vbo/vbo_exec_array.c                  |   86 ++++-------
 src/mesa/vbo/vbo_exec_draw.c                   |   24 ++--
 src/mesa/vbo/vbo_save.c                        |   24 ++-
 src/mesa/vbo/vbo_save_draw.c                   |   18 ++-
 39 files changed, 524 insertions(+), 602 deletions(-)

-- 
1.7.4.4