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

intel/compiler: Use "intel" prefix for walk_order enum

Browse source 
Will be used later in non-brw specific code in Iris.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27646>
This commit is contained in:
Caio Oliveira 2024-02-20 10:39:41 -08:00 • committed by Marge Bot
parent 74534397ac
commit 8ae528331c
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/iris/iris_state.c
View file

@ -8860,7 +8860,7 @@ iris_upload_compute_walker(struct iris_context *ice,
cw.GenerateLocalID = cs_prog_data->generate_local_id != 0;
cw.EmitLocal = cs_prog_data->generate_local_id;
cw.WalkOrder = cs_prog_data->walk_order;
cw.TileLayout = cs_prog_data->walk_order == BRW_WALK_ORDER_YXZ ?
cw.TileLayout = cs_prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
TileY32bpe : Linear;
#endif

2
src/intel/blorp/blorp_genX_exec.h
View file

@ -2227,7 +2227,7 @@ blorp_exec_compute(struct blorp_batch *batch, const struct blorp_params *params)
cw.GenerateLocalID = cs_prog_data->generate_local_id != 0;
cw.EmitLocal = cs_prog_data->generate_local_id;
cw.WalkOrder = cs_prog_data->walk_order;
cw.TileLayout = cs_prog_data->walk_order == BRW_WALK_ORDER_YXZ ?
cw.TileLayout = cs_prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
TileY32bpe : Linear;
#endif

11
src/intel/compiler/brw_compiler.h
View file

@ -1247,15 +1247,6 @@ struct brw_push_const_block {
unsigned size; /* Bytes, register aligned */
};
enum PACKED brw_compute_walk_order {
BRW_WALK_ORDER_XYZ = 0,
BRW_WALK_ORDER_XZY = 1,
BRW_WALK_ORDER_YXZ = 2,
BRW_WALK_ORDER_YZX = 3,
BRW_WALK_ORDER_ZXY = 4,
BRW_WALK_ORDER_ZYX = 5,
};
struct brw_cs_prog_data {
struct brw_stage_prog_data base;
@ -1279,7 +1270,7 @@ struct brw_cs_prog_data {
bool uses_btd_stack_ids;
bool uses_systolic;
uint8_t generate_local_id;
enum brw_compute_walk_order walk_order;
enum intel_compute_walk_order walk_order;
struct {
struct brw_push_const_block cross_thread;

2
src/intel/compiler/brw_nir_lower_cs_intrinsics.c
View file

@ -339,7 +339,7 @@ brw_nir_lower_cs_intrinsics(nir_shader *nir,
(nir->info.num_images == 0 && nir->info.num_textures == 0);
prog_data->walk_order =
linear ? BRW_WALK_ORDER_XYZ : BRW_WALK_ORDER_YXZ;
linear ? INTEL_WALK_ORDER_XYZ : INTEL_WALK_ORDER_YXZ;
/* nir_lower_compute_system_values will replace any references to
* SYSTEM_VALUE_LOCAL_INVOCATION_ID vector components with zero for

9
src/intel/compiler/intel_shader_enums.h
View file

@ -169,6 +169,15 @@ struct intel_cs_dispatch_info {
uint32_t right_mask;
};
enum PACKED intel_compute_walk_order {
INTEL_WALK_ORDER_XYZ = 0,
INTEL_WALK_ORDER_XZY = 1,
INTEL_WALK_ORDER_YXZ = 2,
INTEL_WALK_ORDER_YZX = 3,
INTEL_WALK_ORDER_ZXY = 4,
INTEL_WALK_ORDER_ZYX = 5,
};
#ifdef __cplusplus
} /* extern "C" */
#endif

2
src/intel/vulkan/genX_cmd_compute.c
View file

@ -356,7 +356,7 @@ emit_compute_walker(struct anv_cmd_buffer *cmd_buffer,
.GenerateLocalID = prog_data->generate_local_id != 0,
.EmitLocal = prog_data->generate_local_id,
.WalkOrder = prog_data->walk_order,
.TileLayout = prog_data->walk_order == BRW_WALK_ORDER_YXZ ?
.TileLayout = prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
TileY32bpe : Linear,
.LocalXMaximum = prog_data->local_size[0] - 1,
.LocalYMaximum = prog_data->local_size[1] - 1,

2
src/intel/vulkan/genX_simple_shader.c
View file

@ -567,7 +567,7 @@ genX(emit_simple_shader_dispatch)(struct anv_simple_shader *state,
cw.GenerateLocalID = prog_data->generate_local_id != 0;
cw.EmitLocal = prog_data->generate_local_id;
cw.WalkOrder = prog_data->walk_order;
cw.TileLayout = prog_data->walk_order == BRW_WALK_ORDER_YXZ ?
cw.TileLayout = prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
TileY32bpe : Linear;
#endif