Module: Mesa Branch: master Commit: 62e011d593008e61ddcba3c32b5710505f4974e6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=62e011d593008e61ddcba3c32b5710505f4974e6
Author: Jordan Justen <[email protected]> Date: Fri Mar 13 11:32:43 2015 -0700 nir: Add gl_LocalInvocationID variable Signed-off-by: Jordan Justen <[email protected]> Reviewed-by: Iago Toral Quiroga <[email protected]> Reviewed-by: Kristian Høgsberg <[email protected]> --- src/glsl/nir/nir.c | 2 ++ src/glsl/nir/nir_intrinsics.h | 1 + src/glsl/nir/nir_lower_system_values.c | 3 +++ 3 files changed, 6 insertions(+) diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c index aafcb93..1774e1c 100644 --- a/src/glsl/nir/nir.c +++ b/src/glsl/nir/nir.c @@ -1457,6 +1457,8 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin) return SYSTEM_VALUE_SAMPLE_POS; case nir_intrinsic_load_sample_mask_in: return SYSTEM_VALUE_SAMPLE_MASK_IN; + case nir_intrinsic_load_local_invocation_id: + return SYSTEM_VALUE_LOCAL_INVOCATION_ID; /* FINISHME: Add tessellation intrinsics. return SYSTEM_VALUE_TESS_COORD; return SYSTEM_VALUE_VERTICES_IN; diff --git a/src/glsl/nir/nir_intrinsics.h b/src/glsl/nir/nir_intrinsics.h index 07dd5cf..8396612 100644 --- a/src/glsl/nir/nir_intrinsics.h +++ b/src/glsl/nir/nir_intrinsics.h @@ -141,6 +141,7 @@ SYSTEM_VALUE(sample_id, 1) SYSTEM_VALUE(sample_pos, 2) SYSTEM_VALUE(sample_mask_in, 1) SYSTEM_VALUE(invocation_id, 1) +SYSTEM_VALUE(local_invocation_id, 3) /* * The format of the indices depends on the type of the load. For uniforms, diff --git a/src/glsl/nir/nir_lower_system_values.c b/src/glsl/nir/nir_lower_system_values.c index 440fb0b..91228e3 100644 --- a/src/glsl/nir/nir_lower_system_values.c +++ b/src/glsl/nir/nir_lower_system_values.c @@ -70,6 +70,9 @@ convert_instr(nir_intrinsic_instr *instr) case SYSTEM_VALUE_INVOCATION_ID: op = nir_intrinsic_load_invocation_id; break; + case SYSTEM_VALUE_LOCAL_INVOCATION_ID: + op = nir_intrinsic_load_local_invocation_id; + break; default: unreachable("not reached"); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
