Mesa (master): nir: Add support for gl_HelperInvocation system value.

Matt Turner mattst88 at kemper.freedesktop.org
Sat Nov 21 01:38:23 UTC 2015


Module: Mesa
Branch: master
Commit: c28b574170706d4f9625e7ffa72c87862aa1ca31
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c28b574170706d4f9625e7ffa72c87862aa1ca31

Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Nov 13 17:50:27 2015 -0800

nir: Add support for gl_HelperInvocation system value.

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/glsl/nir/nir.c            |    4 ++++
 src/glsl/nir/nir_intrinsics.h |    1 +
 2 files changed, 5 insertions(+)

diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c
index dba18c9..8956b7e 100644
--- a/src/glsl/nir/nir.c
+++ b/src/glsl/nir/nir.c
@@ -1577,6 +1577,8 @@ nir_intrinsic_from_system_value(gl_system_value val)
       return nir_intrinsic_load_tess_level_inner;
    case SYSTEM_VALUE_VERTICES_IN:
       return nir_intrinsic_load_patch_vertices_in;
+   case SYSTEM_VALUE_HELPER_INVOCATION:
+      return nir_intrinsic_load_helper_invocation;
    default:
       unreachable("system value does not directly correspond to intrinsic");
    }
@@ -1620,6 +1622,8 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin)
       return SYSTEM_VALUE_TESS_LEVEL_INNER;
    case nir_intrinsic_load_patch_vertices_in:
       return SYSTEM_VALUE_VERTICES_IN;
+   case nir_intrinsic_load_helper_invocation:
+      return SYSTEM_VALUE_HELPER_INVOCATION;
    default:
       unreachable("intrinsic doesn't produce a system value");
    }
diff --git a/src/glsl/nir/nir_intrinsics.h b/src/glsl/nir/nir_intrinsics.h
index b8d7d6c..b2565c5 100644
--- a/src/glsl/nir/nir_intrinsics.h
+++ b/src/glsl/nir/nir_intrinsics.h
@@ -225,6 +225,7 @@ SYSTEM_VALUE(local_invocation_id, 3, 0)
 SYSTEM_VALUE(work_group_id, 3, 0)
 SYSTEM_VALUE(user_clip_plane, 4, 1) /* const_index[0] is user_clip_plane[idx] */
 SYSTEM_VALUE(num_work_groups, 3, 0)
+SYSTEM_VALUE(helper_invocation, 1, 0)
 
 /*
  * The format of the indices depends on the type of the load.  For uniforms,




More information about the mesa-commit mailing list