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

Author: Kenneth Graunke <kenn...@whitecape.org>
Date:   Mon Dec 14 01:45:55 2015 -0800

nir: Fix number of indices on shared variable store intrinsics.

Shared variables and input reworks landed around the same time.
Presumably, this was some sort of mistake in rebase conflict resolution.

This really only affects the num_indices field in nir_intrinsic_infos,
which is rarely used.  However, it's used by the printer.

Found by inspection.

Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstr...@intel.com>

---

 src/glsl/nir/nir_intrinsics.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/nir/nir_intrinsics.h b/src/glsl/nir/nir_intrinsics.h
index 9811fb3..ec9e845 100644
--- a/src/glsl/nir/nir_intrinsics.h
+++ b/src/glsl/nir/nir_intrinsics.h
@@ -309,6 +309,6 @@ STORE(per_vertex_output, 3, 1, 0)
 /* src[] = { value, block_index, offset }. const_index[] = { write_mask } */
 STORE(ssbo, 3, 1, 0)
 /* src[] = { value, offset }. const_index[] = { base, write_mask } */
-STORE(shared, 2, 1, 0)
+STORE(shared, 2, 2, 0)
 
 LAST_INTRINSIC(store_shared)

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to