[Mesa-dev] [PATCH] 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. Found by inspection. Signed-off-by: Kenneth Graunke --- src/glsl/nir/nir_intrinsics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) No effect in Jenkins, oddly. 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) -- 2.6.3 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] nir: Fix number of indices on shared variable store intrinsics.
Reviewed-by: Jason Ekstrand On Mon, Dec 14, 2015 at 3:32 AM, Kenneth Graunke wrote: > Shared variables and input reworks landed around the same time. > Presumably, this was some sort of mistake in rebase conflict resolution. > > Found by inspection. > > Signed-off-by: Kenneth Graunke > --- > src/glsl/nir/nir_intrinsics.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > No effect in Jenkins, oddly. > > 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) > -- > 2.6.3 > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] nir: Fix number of indices on shared variable store intrinsics.
Kenneth Graunke writes: > Shared variables and input reworks landed around the same time. > Presumably, this was some sort of mistake in rebase conflict resolution. > > Found by inspection. > > Signed-off-by: Kenneth Graunke Reviewed-by: Kristian Høgsberg > --- > src/glsl/nir/nir_intrinsics.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > No effect in Jenkins, oddly. > > 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) > -- > 2.6.3 > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev