diff options
author | Pavel Ondračka <pavel.ondracka@gmail.com> | 2023-01-11 14:13:05 +0100 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2023-01-18 20:02:37 +0000 |
commit | 9db7c1a509f45d52bb7b84a0def026b69be9fb9d (patch) | |
tree | 99cfc9642bf2d4958e6b8805dc1763fe27c68fec /src/gallium/drivers/r300 | |
parent | 7bec63c0249b7bdcd1208c88eebc73995d47e28b (diff) |
r300: remove backend negative addressing emulation
This is now handled in ntt.
Signed-off-by: Pavel Ondračka <pavel.ondracka@gmail.com>
Reviewed-by: Filip Gawin <filip@gawin.net>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20672>
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r-- | src/gallium/drivers/r300/compiler/r3xx_vertprog.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/src/gallium/drivers/r300/compiler/r3xx_vertprog.c b/src/gallium/drivers/r300/compiler/r3xx_vertprog.c index ceb590ea085..f322785abb0 100644 --- a/src/gallium/drivers/r300/compiler/r3xx_vertprog.c +++ b/src/gallium/drivers/r300/compiler/r3xx_vertprog.c @@ -794,77 +794,6 @@ static int swizzle_is_native(rc_opcode opcode, struct rc_src_register reg) return 1; } -static void transform_negative_addressing(struct r300_vertex_program_compiler *c, - struct rc_instruction *arl, - struct rc_instruction *end, - int min_offset) -{ - struct rc_instruction *inst, *add; - unsigned const_swizzle; - - /* Transform ARL/ARR */ - add = rc_insert_new_instruction(&c->Base, arl->Prev); - add->U.I.Opcode = RC_OPCODE_ADD; - add->U.I.DstReg.File = RC_FILE_TEMPORARY; - add->U.I.DstReg.Index = rc_find_free_temporary(&c->Base); - add->U.I.DstReg.WriteMask = RC_MASK_X; - add->U.I.SrcReg[0] = arl->U.I.SrcReg[0]; - add->U.I.SrcReg[1].File = RC_FILE_CONSTANT; - add->U.I.SrcReg[1].Index = rc_constants_add_immediate_scalar(&c->Base.Program.Constants, - min_offset, &const_swizzle); - add->U.I.SrcReg[1].Swizzle = const_swizzle; - - arl->U.I.SrcReg[0].File = RC_FILE_TEMPORARY; - arl->U.I.SrcReg[0].Index = add->U.I.DstReg.Index; - arl->U.I.SrcReg[0].Swizzle = RC_SWIZZLE_XXXX; - - /* Rewrite offsets up to and excluding inst. */ - for (inst = arl->Next; inst != end; inst = inst->Next) { - const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->U.I.Opcode); - - for (unsigned i = 0; i < opcode->NumSrcRegs; i++) - if (inst->U.I.SrcReg[i].RelAddr) - inst->U.I.SrcReg[i].Index -= min_offset; - } -} - -static void rc_emulate_negative_addressing(struct radeon_compiler *compiler, void *user) -{ - struct r300_vertex_program_compiler * c = (struct r300_vertex_program_compiler*)compiler; - struct rc_instruction *inst, *lastARL = NULL; - int min_offset = 0; - - for (inst = c->Base.Program.Instructions.Next; inst != &c->Base.Program.Instructions; inst = inst->Next) { - const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->U.I.Opcode); - - if (inst->U.I.Opcode == RC_OPCODE_ARL || inst->U.I.Opcode == RC_OPCODE_ARR) { - if (lastARL != NULL && min_offset < 0) - transform_negative_addressing(c, lastARL, inst, min_offset); - - lastARL = inst; - min_offset = 0; - continue; - } - - for (unsigned i = 0; i < opcode->NumSrcRegs; i++) { - if (inst->U.I.SrcReg[i].RelAddr && - inst->U.I.SrcReg[i].Index < 0) { - /* ARL must precede any indirect addressing. */ - if (!lastARL) { - rc_error(&c->Base, "Vertex shader: Found relative addressing without ARL/ARR."); - return; - } - - if (inst->U.I.SrcReg[i].Index < min_offset) - min_offset = inst->U.I.SrcReg[i].Index; - } - } - } - - if (lastARL != NULL && min_offset < 0) - transform_negative_addressing(c, lastARL, inst, min_offset); -} - const struct rc_swizzle_caps r300_vertprog_swizzle_caps = { .IsNative = &swizzle_is_native, .Split = NULL /* should never be called */ @@ -905,7 +834,6 @@ void r3xx_compile_vertex_program(struct r300_vertex_program_compiler *c) struct radeon_compiler_pass vs_list[] = { /* NAME DUMP PREDICATE FUNCTION PARAM */ {"add artificial outputs", 0, 1, rc_vs_add_artificial_outputs, NULL}, - {"emulate negative addressing", 1, 1, rc_emulate_negative_addressing, NULL}, {"native rewrite", 1, is_r500, rc_local_transform, alu_rewrite_r500}, {"native rewrite", 1, !is_r500, rc_local_transform, alu_rewrite_r300}, {"emulate modifiers", 1, !is_r500, rc_local_transform, emulate_modifiers}, |