This is my second series in praparation for SPIR-V. I sent it out some time ago as an RFC. At the time I got a conditional review from Ken but I thought it was worth sending out again. The original can be found here:
http://lists.freedesktop.org/archives/mesa-dev/2015-November/099103.html There are two primary differences between this version and the previous: 1) The addition of patch 2 which adds an enum for keeping track of texture sources in the FS backend as requested by Ken. 2) I fixed a bug in the vec4 code where we didn't actually pass both the sampler and the texture to the generator. Jason Ekstrand (6): nir: Separate texture from sampler in nir_tex_instr i965/fs: Add an enum for keeping track of texture instruciton sources i965/fs: Separate the sampler from the surface in generate_tex i965/fs: Plumb separate surfaces and samplers through from NIR i965/vec4: Separate the sampler from the surface in generate_tex i965/vec4: Plumb separate surfaces and samplers through from NIR src/compiler/nir/nir.c | 8 ++- src/compiler/nir/nir.h | 26 ++++++-- src/compiler/nir/nir_clone.c | 7 ++- src/compiler/nir/nir_instr_set.c | 13 ++-- src/compiler/nir/nir_lower_samplers.c | 15 ++++- src/compiler/nir/nir_lower_tex.c | 4 +- src/compiler/nir/nir_print.c | 14 ++++- src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs.cpp | 75 ++++++++++++++---------- src/mesa/drivers/dri/i965/brw_fs.h | 18 ++++++ src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 20 +++++-- src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 26 +++++--- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 30 ++++++---- src/mesa/drivers/dri/i965/brw_vec4.h | 3 +- src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 18 ++++-- src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 25 +++++--- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 12 ++-- src/mesa/program/prog_to_nir.c | 1 + 18 files changed, 226 insertions(+), 91 deletions(-) -- 2.5.0.400.gff86faf _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
