OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: move lowering of SYSTEM_VALUE_LOCAL_GROUP_SIZE into a function

Browse Source 
we already have this code duplicated and we will need it for the global
group size as well

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
This commit is contained in:
Karol Herbst
2018-07-11 02:42:03 +02:00
parent 529aa9e646
commit 31cbcbdb87
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/compiler/nir/nir_lower_system_values.c
View File

@@ -28,6 +28,17 @@
#include "nir.h"
#include "nir_builder.h"
static nir_ssa_def*
build_local_group_size(nir_builder *b)
{
nir_const_value local_size;
memset(&local_size, 0, sizeof(local_size));
local_size.u32[0] = b->shader->info.cs.local_size[0];
local_size.u32[1] = b->shader->info.cs.local_size[1];
local_size.u32[2] = b->shader->info.cs.local_size[2];
return nir_build_imm(b, 3, 32, local_size);
}
static bool
convert_block(nir_block *block, nir_builder *b)
{
@@ -66,19 +77,11 @@ convert_block(nir_block *block, nir_builder *b)
* "The value of gl_GlobalInvocationID is equal to
* gl_WorkGroupID * gl_WorkGroupSize + gl_LocalInvocationID"
*/
nir_const_value local_size;
memset(&local_size, 0, sizeof(local_size));
local_size.u32[0] = b->shader->info.cs.local_size[0];
local_size.u32[1] = b->shader->info.cs.local_size[1];
local_size.u32[2] = b->shader->info.cs.local_size[2];
nir_ssa_def *group_size = build_local_group_size(b);
nir_ssa_def *group_id = nir_load_work_group_id(b);
nir_ssa_def *local_id = nir_load_local_invocation_id(b);
sysval = nir_iadd(b, nir_imul(b, group_id,
nir_build_imm(b, 3, 32, local_size)),
local_id);
sysval = nir_iadd(b, nir_imul(b, group_id, group_size), local_id);
break;
}
@@ -112,12 +115,7 @@ convert_block(nir_block *block, nir_builder *b)
}
case SYSTEM_VALUE_LOCAL_GROUP_SIZE: {
nir_const_value local_size;
memset(&local_size, 0, sizeof(local_size));
local_size.u32[0] = b->shader->info.cs.local_size[0];
local_size.u32[1] = b->shader->info.cs.local_size[1];
local_size.u32[2] = b->shader->info.cs.local_size[2];
sysval = nir_build_imm(b, 3, 32, local_size);
sysval = build_local_group_size(b);
break;
}