Mesa (master): Replace gl_frag_attrib enum with gl_varying_slot.

Paul Berry stereotype441 at kemper.freedesktop.org
Fri Mar 15 16:36:29 UTC 2013


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

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Sat Feb 23 09:00:58 2013 -0800

Replace gl_frag_attrib enum with gl_varying_slot.

This patch makes the following search-and-replace changes:

gl_frag_attrib -> gl_varying_slot
FRAG_ATTRIB_* -> VARYING_SLOT_*
FRAG_BIT_* -> VARYING_BIT_*

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
Tested-by: Brian Paul <brianp at vmware.com>

---

 src/glsl/builtin_variables.cpp                 |   26 ++--
 src/glsl/ir.cpp                                |    2 +-
 src/glsl/ir.h                                  |    2 +-
 src/glsl/link_varyings.cpp                     |   13 +-
 src/glsl/linker.cpp                            |    2 +-
 src/mesa/drivers/dri/i915/i915_fragprog.c      |   64 ++++----
 src/mesa/drivers/dri/i915/i915_state.c         |    2 +-
 src/mesa/drivers/dri/i915/intel_tris.c         |    2 +-
 src/mesa/drivers/dri/i965/brw_fs.cpp           |   24 ++--
 src/mesa/drivers/dri/i965/brw_fs.h             |    2 +-
 src/mesa/drivers/dri/i965/brw_fs_fp.cpp        |   10 +-
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp   |    2 +-
 src/mesa/drivers/dri/i965/brw_sf.c             |    2 +-
 src/mesa/drivers/dri/i965/brw_vs_constval.c    |    8 +-
 src/mesa/drivers/dri/i965/brw_wm.c             |   10 +-
 src/mesa/drivers/dri/i965/brw_wm_iz.cpp        |    2 +-
 src/mesa/drivers/dri/i965/brw_wm_state.c       |    2 +-
 src/mesa/drivers/dri/i965/gen6_sf_state.c      |   16 +-
 src/mesa/drivers/dri/i965/gen6_wm_state.c      |    2 +-
 src/mesa/drivers/dri/i965/gen7_sf_state.c      |   14 +-
 src/mesa/drivers/dri/i965/gen7_wm_state.c      |    2 +-
 src/mesa/drivers/x11/xm_line.c                 |    8 +-
 src/mesa/main/context.c                        |    4 +-
 src/mesa/main/ff_fragment_shader.cpp           |   38 +++---
 src/mesa/main/ffvertex_prog.c                  |   14 +-
 src/mesa/main/mtypes.h                         |   62 +-------
 src/mesa/main/state.h                          |    2 +-
 src/mesa/main/texstate.c                       |    2 +-
 src/mesa/program/ir_to_mesa.cpp                |    4 +-
 src/mesa/program/prog_execute.c                |    6 +-
 src/mesa/program/prog_print.c                  |   16 +-
 src/mesa/program/program.c                     |   10 +-
 src/mesa/program/program_parse.y               |    8 +-
 src/mesa/program/programopt.c                  |   14 +-
 src/mesa/state_tracker/st_atom_pixeltransfer.c |    4 +-
 src/mesa/state_tracker/st_atom_rasterizer.c    |    4 +-
 src/mesa/state_tracker/st_cb_bitmap.c          |    4 +-
 src/mesa/state_tracker/st_cb_drawpixels.c      |   10 +-
 src/mesa/state_tracker/st_cb_drawtex.c         |    2 +-
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp     |   26 ++--
 src/mesa/state_tracker/st_mesa_to_tgsi.c       |   12 +-
 src/mesa/state_tracker/st_program.c            |   50 +++---
 src/mesa/swrast/s_aaline.c                     |    8 +-
 src/mesa/swrast/s_aalinetemp.h                 |   22 ++--
 src/mesa/swrast/s_aatritemp.h                  |   52 +++---
 src/mesa/swrast/s_alpha.c                      |    2 +-
 src/mesa/swrast/s_atifragshader.c              |   10 +-
 src/mesa/swrast/s_context.c                    |   44 +++---
 src/mesa/swrast/s_context.h                    |    6 +-
 src/mesa/swrast/s_copypix.c                    |    4 +-
 src/mesa/swrast/s_drawpix.c                    |    4 +-
 src/mesa/swrast/s_feedback.c                   |   24 ++--
 src/mesa/swrast/s_fog.c                        |   20 ++--
 src/mesa/swrast/s_fragprog.c                   |   12 +-
 src/mesa/swrast/s_lines.c                      |   12 +-
 src/mesa/swrast/s_linetemp.h                   |   62 ++++----
 src/mesa/swrast/s_logic.c                      |    2 +-
 src/mesa/swrast/s_masking.c                    |    2 +-
 src/mesa/swrast/s_points.c                     |   84 +++++-----
 src/mesa/swrast/s_span.c                       |  112 +++++++-------
 src/mesa/swrast/s_span.h                       |   12 +-
 src/mesa/swrast/s_texcombine.c                 |    6 +-
 src/mesa/swrast/s_texfilter.c                  |    2 +-
 src/mesa/swrast/s_triangle.c                   |   40 +++---
 src/mesa/swrast/s_tritemp.h                    |  200 ++++++++++++------------
 src/mesa/swrast/s_zoom.c                       |   26 ++--
 src/mesa/swrast/swrast.h                       |    6 +-
 src/mesa/swrast_setup/ss_context.c             |   30 ++--
 src/mesa/swrast_setup/ss_triangle.c            |   12 +-
 src/mesa/swrast_setup/ss_tritmp.h              |   92 ++++++------
 src/mesa/tnl/t_context.c                       |    6 +-
 src/mesa/tnl_dd/t_dd_vb.c                      |   96 ++++++------
 72 files changed, 728 insertions(+), 791 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=eed6baf7621fa94e7888f8079b155fc67a08540c



More information about the mesa-commit mailing list