diff options
| author | Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> | 2021-05-27 14:39:03 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-06-07 22:34:42 +0000 |
| commit | 43a6a2151b07d1fc6975026746f11779c58fc818 (patch) | |
| tree | 37f13fe0a70c8a4355293d4beefbbd8c75f21ce4 /src/compiler | |
| parent | 430d2206daef6ae16403b6b0ed7d5b28dd9e68bd (diff) | |
compiler: Rename SYSTEM_VALUE_LOCAL_GROUP_SIZE to SYSTEM_VALUE_WORKGROUP_SIZE
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>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/builtin_variables.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_cs_derived.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir.c | 4 | ||||
| -rw-r--r-- | src/compiler/shader_enums.c | 2 | ||||
| -rw-r--r-- | src/compiler/shader_enums.h | 2 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_variables.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index 8be36eda5bd..a314e32d029 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -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"); } diff --git a/src/compiler/glsl/lower_cs_derived.cpp b/src/compiler/glsl/lower_cs_derived.cpp index 69ee3990bb7..85a57232b61 100644 --- a/src/compiler/glsl/lower_cs_derived.cpp +++ b/src/compiler/glsl/lower_cs_derived.cpp @@ -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; diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 1a3fd5c6f9c..9aa91cdcbff 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -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: diff --git a/src/compiler/shader_enums.c b/src/compiler/shader_enums.c index 7c53a09ce9b..b1eae07c86e 100644 --- a/src/compiler/shader_enums.c +++ b/src/compiler/shader_enums.c @@ -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), diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index 7522bdbd77c..541742517e1 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -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, diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index e832a472879..c3b5fc7e4ff 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -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: |