<div dir="ltr"><div><div><div>I made a few cosmetic comments on patch 9 and I made a comment on patch 5 that might make a good future cleanup. However, I think it's good enough to land. </div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div>Don't forget to cc 12.0 </div>--Jason </div><div class="gmail_extra"> <div class="gmail_quote">On Wed, Jun 1, 2016 at 3:04 PM, Jordan Justen <<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">git://<a href="http://people.freedesktop.org/~jljusten/mesa" rel="noreferrer" target="_blank">people.freedesktop.org/~jljusten/mesa</a> hsw-cs-cross-thread-constants-v4 v4: * Support both the old and new layouts until the switch-over to the new layout. This minimizes the size of the switch over patch. (Jason) v3: * <a href="https://lists.freedesktop.org/archives/mesa-dev/2016-May/118722.html" rel="noreferrer" target="_blank">https://lists.freedesktop.org/archives/mesa-dev/2016-May/118722.html</a> v2: * <a href="https://lists.freedesktop.org/archives/mesa-dev/2016-May/118566.html" rel="noreferrer" target="_blank">https://lists.freedesktop.org/archives/mesa-dev/2016-May/118566.html</a> v1: * <a href="https://lists.freedesktop.org/archives/mesa-dev/2016-May/117952.html" rel="noreferrer" target="_blank">https://lists.freedesktop.org/archives/mesa-dev/2016-May/117952.html</a> Jordan Justen (12): glsl: Add glsl LowerCsDerivedVariables option nir: Make lowering gl_LocalInvocationIndex optional i965: Add nir channel_num system value i965: Add uniform for a CS thread local base ID i965: Put CS local thread ID uniform in last push register i965: Add nir based intrinsic lowering and thread ID uniform i965: Store number of threads in brw_cs_prog_data i965: Add CS push constant info to brw_cs_prog_data i965: Support new local ID push constant & cross-thread constants anv: Support new local ID generation & cross-thread constants i965: Enable cross-thread constants and compact local IDs for hsw+ i965: Remove old CS local ID handling src/compiler/glsl/builtin_variables.cpp | 29 ++-- src/compiler/glsl/glsl_parser_extras.cpp | 2 +- src/compiler/glsl/ir.h | 3 +- src/compiler/nir/nir.c | 4 + src/compiler/nir/nir.h | 2 + src/compiler/nir/nir_gather_info.c | 1 + src/compiler/nir/nir_intrinsics.h | 2 + src/compiler/nir/nir_lower_system_values.c | 16 +- src/intel/vulkan/anv_cmd_buffer.c | 52 +++---- src/intel/vulkan/anv_pipeline.c | 4 + src/intel/vulkan/anv_private.h | 1 - src/intel/vulkan/gen7_cmd_buffer.c | 15 +- src/intel/vulkan/gen8_cmd_buffer.c | 13 +- src/intel/vulkan/genX_cmd_buffer.c | 4 +- src/intel/vulkan/genX_pipeline.c | 12 +- src/mesa/drivers/dri/i965/Makefile.sources | 1 + src/mesa/drivers/dri/i965/brw_compiler.h | 22 ++- src/mesa/drivers/dri/i965/brw_cs.c | 3 + src/mesa/drivers/dri/i965/brw_defines.h | 3 + src/mesa/drivers/dri/i965/brw_fs.cpp | 197 +++++++++++++------------ src/mesa/drivers/dri/i965/brw_fs.h | 1 - src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 22 ++- src/mesa/drivers/dri/i965/brw_nir.h | 2 + src/mesa/drivers/dri/i965/brw_nir_intrinsics.c | 179 ++++++++++++++++++++++ src/mesa/drivers/dri/i965/gen7_cs_state.c | 124 ++++++++-------- src/mesa/main/mtypes.h | 3 + src/mesa/state_tracker/st_extensions.c | 1 + 27 files changed, 472 insertions(+), 246 deletions(-) create mode 100644 src/mesa/drivers/dri/i965/brw_nir_intrinsics.c -- 2.8.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>