diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2021-06-18 09:17:01 -0500 |
|---|---|---|
| committer | Jason Ekstrand <jason@jlekstrand.net> | 2021-06-21 09:03:34 -0500 |
| commit | f0f713960b17328712c84dde539a76b22a8bf38b (patch) | |
| tree | c41576d19dc65a1d6a718a4ae3a215f6c983c60c /src/compiler | |
| parent | e5510536e76e65e8a4f089a8d7acb093de853173 (diff) | |
nir,amd: Suffix nir_op_cube_face_coord/index with _amd
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11463>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir_lower_alu_to_scalar.c | 4 | ||||
| -rw-r--r-- | src/compiler/nir/nir_opcodes.py | 4 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_amd.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/nir/nir_lower_alu_to_scalar.c b/src/compiler/nir/nir_lower_alu_to_scalar.c index e72f17f99c7..023cecefca0 100644 --- a/src/compiler/nir/nir_lower_alu_to_scalar.c +++ b/src/compiler/nir/nir_lower_alu_to_scalar.c @@ -125,8 +125,8 @@ lower_alu_instr_scalar(nir_builder *b, nir_instr *instr, void *_data) case nir_op_vec4: case nir_op_vec3: case nir_op_vec2: - case nir_op_cube_face_coord: - case nir_op_cube_face_index: + case nir_op_cube_face_coord_amd: + case nir_op_cube_face_index_amd: /* We don't need to scalarize these ops, they're the ones generated to * group up outputs into a value that can be SSAed. */ diff --git a/src/compiler/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py index b39c7b57498..a692c4ecc9c 100644 --- a/src/compiler/nir/nir_opcodes.py +++ b/src/compiler/nir/nir_opcodes.py @@ -514,7 +514,7 @@ for (unsigned bit = 0; bit < bit_size; bit++) { """) # AMD_gcn_shader extended instructions -unop_horiz("cube_face_coord", 2, tfloat32, 3, tfloat32, """ +unop_horiz("cube_face_coord_amd", 2, tfloat32, 3, tfloat32, """ dst.x = dst.y = 0.0; float absX = fabsf(src0.x); float absY = fabsf(src0.y); @@ -536,7 +536,7 @@ dst.x = dst.x * (1.0f / ma) + 0.5f; dst.y = dst.y * (1.0f / ma) + 0.5f; """) -unop_horiz("cube_face_index", 1, tfloat32, 3, tfloat32, """ +unop_horiz("cube_face_index_amd", 1, tfloat32, 3, tfloat32, """ float absX = fabsf(src0.x); float absY = fabsf(src0.y); float absZ = fabsf(src0.z); diff --git a/src/compiler/spirv/vtn_amd.c b/src/compiler/spirv/vtn_amd.c index 623ff1205d7..85df179d91c 100644 --- a/src/compiler/spirv/vtn_amd.c +++ b/src/compiler/spirv/vtn_amd.c @@ -33,10 +33,10 @@ vtn_handle_amd_gcn_shader_instruction(struct vtn_builder *b, SpvOp ext_opcode, nir_ssa_def *def; switch ((enum GcnShaderAMD)ext_opcode) { case CubeFaceIndexAMD: - def = nir_cube_face_index(&b->nb, vtn_get_nir_ssa(b, w[5])); + def = nir_cube_face_index_amd(&b->nb, vtn_get_nir_ssa(b, w[5])); break; case CubeFaceCoordAMD: - def = nir_cube_face_coord(&b->nb, vtn_get_nir_ssa(b, w[5])); + def = nir_cube_face_coord_amd(&b->nb, vtn_get_nir_ssa(b, w[5])); break; case TimeAMD: { def = nir_pack_64_2x32(&b->nb, nir_shader_clock(&b->nb, NIR_SCOPE_SUBGROUP)); |