fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 10:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

compiler: Rename SYSTEM_VALUE_LOCAL_GROUP_SIZE to SYSTEM_VALUE_WORKGROUP_SIZE

Browse source 
Acked-by: Emma Anholt <emma@anholt.net>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11190>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2021-05-27 14:39:03 -07:00 • committed by Marge Bot
parent 430d2206da
commit 43a6a2151b
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/glsl/builtin_variables.cpp
View file

@ -1456,7 +1456,7 @@ builtin_variable_generator::generate_cs_special_vars()
add_system_value(SYSTEM_VALUE_NUM_WORK_GROUPS, uvec3_t, "gl_NumWorkGroups");
if (state->ARB_compute_variable_group_size_enable) {
add_system_value(SYSTEM_VALUE_LOCAL_GROUP_SIZE,
add_system_value(SYSTEM_VALUE_WORKGROUP_SIZE,
uvec3_t, "gl_LocalGroupSizeARB");
}

2
src/compiler/glsl/lower_cs_derived.cpp
View file

@ -138,7 +138,7 @@ lower_cs_derived_visitor::find_sysvals()
if (local_size_variable) {
gl_WorkGroupSize = new(shader) ir_dereference_variable(
add_system_value(
SYSTEM_VALUE_LOCAL_GROUP_SIZE, glsl_type::uvec3_type,
SYSTEM_VALUE_WORKGROUP_SIZE, glsl_type::uvec3_type,
"gl_LocalGroupSizeARB"));
} else {
ir_constant_data data;

4
src/compiler/nir/nir.c
View file

@ -2019,7 +2019,7 @@ nir_intrinsic_from_system_value(gl_system_value val)
return nir_intrinsic_load_num_subgroups;
case SYSTEM_VALUE_SUBGROUP_ID:
return nir_intrinsic_load_subgroup_id;
case SYSTEM_VALUE_LOCAL_GROUP_SIZE:
case SYSTEM_VALUE_WORKGROUP_SIZE:
return nir_intrinsic_load_local_group_size;
case SYSTEM_VALUE_GLOBAL_INVOCATION_ID:
return nir_intrinsic_load_global_invocation_id;
@ -2151,7 +2151,7 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin)
case nir_intrinsic_load_subgroup_id:
return SYSTEM_VALUE_SUBGROUP_ID;
case nir_intrinsic_load_local_group_size:
return SYSTEM_VALUE_LOCAL_GROUP_SIZE;
return SYSTEM_VALUE_WORKGROUP_SIZE;
case nir_intrinsic_load_global_invocation_id:
return SYSTEM_VALUE_GLOBAL_INVOCATION_ID;
case nir_intrinsic_load_base_global_invocation_id:

2
src/compiler/shader_enums.c
View file

@ -277,7 +277,7 @@ gl_system_value_name(gl_system_value sysval)
ENUM(SYSTEM_VALUE_GLOBAL_INVOCATION_INDEX),
ENUM(SYSTEM_VALUE_WORK_GROUP_ID),
ENUM(SYSTEM_VALUE_NUM_WORK_GROUPS),
ENUM(SYSTEM_VALUE_LOCAL_GROUP_SIZE),
ENUM(SYSTEM_VALUE_WORKGROUP_SIZE),
ENUM(SYSTEM_VALUE_GLOBAL_GROUP_SIZE),
ENUM(SYSTEM_VALUE_USER_DATA_AMD),
ENUM(SYSTEM_VALUE_WORK_DIM),

2
src/compiler/shader_enums.h
View file

@ -712,7 +712,7 @@ typedef enum
SYSTEM_VALUE_GLOBAL_INVOCATION_INDEX,
SYSTEM_VALUE_WORK_GROUP_ID,
SYSTEM_VALUE_NUM_WORK_GROUPS,
SYSTEM_VALUE_LOCAL_GROUP_SIZE,
SYSTEM_VALUE_WORKGROUP_SIZE,
SYSTEM_VALUE_GLOBAL_GROUP_SIZE,
SYSTEM_VALUE_WORK_DIM,
SYSTEM_VALUE_USER_DATA_AMD,

2
src/compiler/spirv/vtn_variables.c
View file

@ -919,7 +919,7 @@ vtn_get_builtin_location(struct vtn_builder *b,
break;
case SpvBuiltInWorkgroupSize:
case SpvBuiltInEnqueuedWorkgroupSize:
*location = SYSTEM_VALUE_LOCAL_GROUP_SIZE;
*location = SYSTEM_VALUE_WORKGROUP_SIZE;
set_mode_system_value(b, mode);
break;
case SpvBuiltInWorkgroupId:

2
src/gallium/auxiliary/tgsi/tgsi_from_mesa.c
View file

@ -269,7 +269,7 @@ tgsi_get_sysval_semantic(unsigned sysval)
return TGSI_SEMANTIC_BLOCK_ID;
case SYSTEM_VALUE_NUM_WORK_GROUPS:
return TGSI_SEMANTIC_GRID_SIZE;
case SYSTEM_VALUE_LOCAL_GROUP_SIZE:
case SYSTEM_VALUE_WORKGROUP_SIZE:
return TGSI_SEMANTIC_BLOCK_SIZE;
/* ARB_shader_ballot */

2
src/gallium/drivers/radeonsi/si_shader_nir.c
View file

@ -435,7 +435,7 @@ void si_nir_scan_shader(const struct nir_shader *nir, struct si_shader_info *inf
info->uses_subgroup_info = BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_LOCAL_INVOCATION_INDEX) ||
BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_SUBGROUP_ID) ||
BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_NUM_SUBGROUPS);
info->uses_variable_block_size = BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_LOCAL_GROUP_SIZE);
info->uses_variable_block_size = BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_WORKGROUP_SIZE);
info->uses_drawid = BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_DRAW_ID);
info->uses_primid = BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_PRIMITIVE_ID) ||
nir->info.inputs_read & VARYING_BIT_PRIMITIVE_ID;