[Mesa-dev] [PATCH v3 00/12] nir: Get rid of the *_indirect variants of

Jason Ekstrand jason at jlekstrand.net
Tue Dec 8 13:46:17 PST 2015


This is my third sending of this series.  I think this version is close to
working on all of the relevant drivers (it works on i965).  Hopefully, we
can actually push it this time.

As mentioned before, all but the first two patches will be squashed
together so it's important to get this right.  Thank you very much to Rob
Clark and Eric Anholt for all your work helping me debug this on your
drivers.

Jason Ekstrand (12):
  vc4: Do all uniform loads with byte offsets
  i965/fs_nir: Refactor store_output, load_input, and load_uniform
  nir: Get rid of *_indirect variants of input/output load/store
    intrinsics
  nir/glsl: Stop handling UBO/SSBO load/stores differently depending on
    indirect
  nir/lower_io: Get rid of load/store_foo_indirect
  i965/fs: Get rid of load/store_foo_indirect
  i965/vec4: Get rid of load/store_foo_indirect
  tgsi_to_nir: Get rid of load/store_foo_indirect
  ir3/nir: Use the new unified io intrinsics
  vc4/nir: Use the new unified io intrinsics
  nir/lower_clip: Update to the new load/store intrinsics
  nir/lower_two_sided_color: Update to the new load intrinsic

 src/gallium/auxiliary/nir/tgsi_to_nir.c            |  52 ++++----
 .../drivers/freedreno/ir3/ir3_compiler_nir.c       |  79 ++++++-----
 src/gallium/drivers/vc4/vc4_nir_lower_blend.c      |   1 +
 src/gallium/drivers/vc4/vc4_nir_lower_io.c         |  55 +++++---
 src/gallium/drivers/vc4/vc4_program.c              |  44 +++---
 src/glsl/nir/glsl_to_nir.cpp                       |  47 +------
 src/glsl/nir/nir.h                                 |   2 +-
 src/glsl/nir/nir_intrinsics.h                      |  81 ++++++------
 src/glsl/nir/nir_lower_clip.c                      |   3 +
 src/glsl/nir/nir_lower_io.c                        | 111 ++++++----------
 src/glsl/nir/nir_lower_phis_to_scalar.c            |   4 -
 src/glsl/nir/nir_lower_two_sided_color.c           |   2 +
 src/glsl/nir/nir_print.c                           |   9 +-
 src/mesa/drivers/dri/i965/brw_fs.h                 |   2 +-
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp           | 147 +++++++++------------
 src/mesa/drivers/dri/i965/brw_nir.c                |  45 +++++--
 src/mesa/drivers/dri/i965/brw_vec4_gs_nir.cpp      |   7 +-
 src/mesa/drivers/dri/i965/brw_vec4_nir.cpp         |  95 ++++++-------
 18 files changed, 380 insertions(+), 406 deletions(-)

-- 
2.5.0.400.gff86faf



More information about the mesa-dev mailing list