st/mesa/r200/i915/i965: eliminate gl_fragment_program

Graphics / Mesa 3D Graphics Library / Mesa - Timothy Arceri [collabora.com] - 25 October 2016 22:29 UTC

Here we move OriginUpperLeft and PixelCenterInteger into gl_program all other fields have been replace by shader_info.

V2: Don't use anonymous union/structs to hold vertex/fragment fields suggested by Ian.

3423488 st/mesa/r200/i915/i965: eliminate gl_fragment_program
src/compiler/shader_info.c | 13 +----
src/mesa/drivers/common/meta.c | 10 ++--
src/mesa/drivers/common/meta.h | 2 +-
src/mesa/drivers/dri/i915/i915_context.h | 2 +-
src/mesa/drivers/dri/i915/i915_fragprog.c | 40 +++++++-------
src/mesa/drivers/dri/i915/i915_program.c | 16 +++---
src/mesa/drivers/dri/i915/i915_state.c | 2 +-
src/mesa/drivers/dri/i915/intel_tris.c | 4 +-
src/mesa/drivers/dri/i965/brw_clip.c | 2 +-
src/mesa/drivers/dri/i965/brw_context.c | 2 +-
src/mesa/drivers/dri/i965/brw_context.h | 8 +--
src/mesa/drivers/dri/i965/brw_curbe.c | 4 +-
src/mesa/drivers/dri/i965/brw_draw.c | 2 +-
src/mesa/drivers/dri/i965/brw_program.c | 5 +-
src/mesa/drivers/dri/i965/brw_sf.c | 4 +-
src/mesa/drivers/dri/i965/brw_wm.c | 25 ++++-----
src/mesa/drivers/dri/i965/brw_wm_state.c | 4 +-
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 +-
src/mesa/drivers/dri/i965/gen6_sf_state.c | 2 +-
src/mesa/drivers/dri/i965/gen6_wm_state.c | 2 +-
src/mesa/drivers/dri/i965/gen8_sf_state.c | 2 +-
src/mesa/drivers/dri/r200/r200_vertprog.c | 4 +-
src/mesa/main/arbprogram.c | 51 ++++++++---------
src/mesa/main/context.c | 8 +--
src/mesa/main/ffvertex_prog.c | 5 +-
src/mesa/main/mtypes.h | 33 +++--------
src/mesa/main/shared.c | 5 +-
src/mesa/main/state.c | 46 ++++++++--------
src/mesa/main/state.h | 2 +-
src/mesa/main/texstate.c | 2 +-
src/mesa/program/arbprogparse.c | 64 +++++++++++-----------
src/mesa/program/arbprogparse.h | 5 +-
src/mesa/program/ir_to_mesa.cpp | 6 +-
src/mesa/program/prog_statevars.c | 8 +--
src/mesa/program/prog_to_nir.c | 7 +--
src/mesa/program/program.c | 21 +++----
src/mesa/program/program.h | 24 +-------
src/mesa/program/programopt.c | 31 +++++------
src/mesa/program/programopt.h | 5 +-
src/mesa/state_tracker/st_atom.c | 2 +-
src/mesa/state_tracker/st_atom_constbuf.c | 2 +-
src/mesa/state_tracker/st_atom_rasterizer.c | 4 +-
src/mesa/state_tracker/st_atom_sampler.c | 2 +-
src/mesa/state_tracker/st_atom_shader.c | 4 +-
src/mesa/state_tracker/st_atom_texture.c | 2 +-
src/mesa/state_tracker/st_cb_bitmap.c | 3 +-
src/mesa/state_tracker/st_cb_bitmap.h | 2 +-
src/mesa/state_tracker/st_cb_drawpixels.c | 6 +-
src/mesa/state_tracker/st_cb_drawtex.c | 2 +-
src/mesa/state_tracker/st_cb_program.c | 2 +-
src/mesa/state_tracker/st_context.c | 2 +-
src/mesa/state_tracker/st_debug.c | 4 +-
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 12 ++--
src/mesa/state_tracker/st_mesa_to_tgsi.c | 6 +-
src/mesa/state_tracker/st_program.c | 47 ++++++++--------
src/mesa/state_tracker/st_program.h | 8 +--
src/mesa/swrast/s_context.c | 15 +++--
src/mesa/swrast/s_fragprog.c | 23 ++++----
src/mesa/swrast/s_span.c | 4 +-
src/mesa/tnl/t_context.c | 8 +--
60 files changed, 281 insertions(+), 361 deletions(-)

Upstream: cgit.freedesktop.org

  • Share