<div dir="ltr"><div class="gmail_quote"><div dir="ltr">On Wed, Jul 11, 2018 at 2:29 PM Karol Herbst <<a href="mailto:kherbst@redhat.com" target="_blank">kherbst@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">we already have this code duplicated and we will need it for the global<br>
group size as well<br>
<br>
Signed-off-by: Karol Herbst <<a href="mailto:kherbst@redhat.com" target="_blank">kherbst@redhat.com</a>><br>
---<br>
src/compiler/nir/nir_lower_system_values.c | 29 +++++++++++-----------<br>
1 file changed, 14 insertions(+), 15 deletions(-)<br>
<br>
diff --git a/src/compiler/nir/nir_lower_system_values.c b/src/compiler/nir/nir_lower_system_values.c<br>
index f315b7ae96f..2a1be8fdd45 100644<br>
--- a/src/compiler/nir/nir_lower_system_values.c<br>
+++ b/src/compiler/nir/nir_lower_system_values.c<br>
@@ -28,6 +28,17 @@<br>
#include "nir.h"<br>
#include "nir_builder.h"<br>
<br>
+static nir_ssa_def*<br>
+handle_local_group_size(nir_builder *b)<br></blockquote><div><br></div><div>How about build_local_group_size_imm or something like that? "handle" is a bit of an odd name.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+{<br>
+ nir_const_value local_size;<br>
+ memset(&local_size, 0, sizeof(local_size));<br>
+ local_size.u32[0] = b->shader->info.cs.local_size[0];<br>
+ local_size.u32[1] = b->shader->info.cs.local_size[1];<br>
+ local_size.u32[2] = b->shader->info.cs.local_size[2];<br>
+ return nir_build_imm(b, 3, 32, local_size);<br>
+}<br>
+<br>
static bool<br>
convert_block(nir_block *block, nir_builder *b)<br>
{<br>
@@ -66,18 +77,11 @@ convert_block(nir_block *block, nir_builder *b)<br>
* "The value of gl_GlobalInvocationID is equal to<br>
* gl_WorkGroupID * gl_WorkGroupSize + gl_LocalInvocationID"<br>
*/<br>
-<br>
- nir_const_value local_size;<br>
- memset(&local_size, 0, sizeof(local_size));<br>
- local_size.u32[0] = b->shader->info.cs.local_size[0];<br>
- local_size.u32[1] = b->shader->info.cs.local_size[1];<br>
- local_size.u32[2] = b->shader->info.cs.local_size[2];<br>
-<br>
+ nir_ssa_def *group_size = handle_local_group_size(b);<br>
nir_ssa_def *group_id = nir_load_work_group_id(b);<br>
nir_ssa_def *local_id = nir_load_local_invocation_id(b);<br>
<br>
- sysval = nir_iadd(b, nir_imul(b, group_id,<br>
- nir_build_imm(b, 3, 32, local_size)),<br>
+ sysval = nir_iadd(b, nir_imul(b, group_id, group_size),<br>
local_id);<br></blockquote><div><br></div><div>Can this fit on one line now? Not that it matters much.</div><div><br></div><div>4 and 5 are</div><div><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
break;<br>
}<br>
@@ -112,12 +116,7 @@ convert_block(nir_block *block, nir_builder *b)<br>
}<br>
<br>
case SYSTEM_VALUE_LOCAL_GROUP_SIZE: {<br>
- nir_const_value local_size;<br>
- memset(&local_size, 0, sizeof(local_size));<br>
- local_size.u32[0] = b->shader->info.cs.local_size[0];<br>
- local_size.u32[1] = b->shader->info.cs.local_size[1];<br>
- local_size.u32[2] = b->shader->info.cs.local_size[2];<br>
- sysval = nir_build_imm(b, 3, 32, local_size);<br>
+ sysval = handle_local_group_size(b);<br>
break;<br>
}<br>
<br>
-- <br>
2.17.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div></div>