OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/vec4: Use ir_texture_opcode less in emit_texture()

Browse Source 
This replaces a bunch of uses of the GLSL IR ir_texture_opcode enum with
the backend opcode, in preparation for removing it altogether.

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14191>
This commit is contained in:
Kenneth Graunke
2021-12-13 16:35:46 -08:00
parent 5ce4017a2b
commit 2729a741fc
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/intel/compiler/brw_vec4_visitor.cpp
View File

@@ -881,8 +881,10 @@ vec4_visitor::emit_texture(ir_texture_opcode op,
*/ */
inst->header_size = inst->header_size =
(devinfo->ver < 5 || (devinfo->ver < 5 ||
inst->offset != 0 || op == ir_tg4 || inst->offset != 0 ||
op == ir_texture_samples || opcode == SHADER_OPCODE_TG4 ||
opcode == SHADER_OPCODE_TG4_OFFSET ||
opcode == SHADER_OPCODE_SAMPLEINFO ||
is_high_sampler(sampler_reg)) ? 1 : 0; is_high_sampler(sampler_reg)) ? 1 : 0;
inst->base_mrf = 2; inst->base_mrf = 2;
inst->mlen = inst->header_size; inst->mlen = inst->header_size;
@@ -895,11 +897,11 @@ vec4_visitor::emit_texture(ir_texture_opcode op,
/* MRF for the first parameter */ /* MRF for the first parameter */
int param_base = inst->base_mrf + inst->header_size; int param_base = inst->base_mrf + inst->header_size;
if (op == ir_txs || op == ir_query_levels) { if (opcode == SHADER_OPCODE_TXS) {
int writemask = devinfo->ver == 4 ? WRITEMASK_W : WRITEMASK_X; int writemask = devinfo->ver == 4 ? WRITEMASK_W : WRITEMASK_X;
emit(MOV(dst_reg(MRF, param_base, lod.type, writemask), lod)); emit(MOV(dst_reg(MRF, param_base, lod.type, writemask), lod));
inst->mlen++; inst->mlen++;
} else if (op == ir_texture_samples) { } else if (opcode == SHADER_OPCODE_SAMPLEINFO) {
inst->dst.writemask = WRITEMASK_X; inst->dst.writemask = WRITEMASK_X;
} else { } else {
/* Load the coordinate */ /* Load the coordinate */
@@ -916,7 +918,9 @@ vec4_visitor::emit_texture(ir_texture_opcode op,
brw_imm_d(0))); brw_imm_d(0)));
} }
/* Load the shadow comparator */ /* Load the shadow comparator */
if (shadow_comparator.file != BAD_FILE && op != ir_txd && (op != ir_tg4 || offset_value.file == BAD_FILE)) { if (shadow_comparator.file != BAD_FILE &&
opcode != SHADER_OPCODE_TXD &&
opcode != SHADER_OPCODE_TG4_OFFSET) {
emit(MOV(dst_reg(MRF, param_base + 1, shadow_comparator.type, emit(MOV(dst_reg(MRF, param_base + 1, shadow_comparator.type,
WRITEMASK_X), WRITEMASK_X),
shadow_comparator)); shadow_comparator));
@@ -924,7 +928,8 @@ vec4_visitor::emit_texture(ir_texture_opcode op,
} }
/* Load the LOD info */ /* Load the LOD info */
if (op == ir_tex || op == ir_txl) { switch (opcode) {
case SHADER_OPCODE_TXL: {
int mrf, writemask; int mrf, writemask;
if (devinfo->ver >= 5) { if (devinfo->ver >= 5) {
mrf = param_base + 1; mrf = param_base + 1;
@@ -940,9 +945,14 @@ vec4_visitor::emit_texture(ir_texture_opcode op,
writemask = WRITEMASK_W; writemask = WRITEMASK_W;
} }
emit(MOV(dst_reg(MRF, mrf, lod.type, writemask), lod)); emit(MOV(dst_reg(MRF, mrf, lod.type, writemask), lod));
} else if (op == ir_txf) { break;
}
case SHADER_OPCODE_TXF:
emit(MOV(dst_reg(MRF, param_base, lod.type, WRITEMASK_W), lod)); emit(MOV(dst_reg(MRF, param_base, lod.type, WRITEMASK_W), lod));
} else if (op == ir_txf_ms) { break;
case SHADER_OPCODE_TXF_CMS:
emit(MOV(dst_reg(MRF, param_base + 1, sample_index.type, WRITEMASK_X), emit(MOV(dst_reg(MRF, param_base + 1, sample_index.type, WRITEMASK_X),
sample_index)); sample_index));
if (devinfo->ver >= 7) { if (devinfo->ver >= 7) {
@@ -955,7 +965,9 @@ vec4_visitor::emit_texture(ir_texture_opcode op,
mcs)); mcs));
} }
inst->mlen++; inst->mlen++;
} else if (op == ir_txd) { break;
case SHADER_OPCODE_TXD: {
const brw_reg_type type = lod.type; const brw_reg_type type = lod.type;
if (devinfo->ver >= 5) { if (devinfo->ver >= 5) {
@@ -983,7 +995,10 @@ vec4_visitor::emit_texture(ir_texture_opcode op,
emit(MOV(dst_reg(MRF, param_base + 2, type, WRITEMASK_XYZ), lod2)); emit(MOV(dst_reg(MRF, param_base + 2, type, WRITEMASK_XYZ), lod2));
inst->mlen += 2; inst->mlen += 2;
} }
} else if (op == ir_tg4 && offset_value.file != BAD_FILE) { break;
}
case SHADER_OPCODE_TG4_OFFSET:
if (shadow_comparator.file != BAD_FILE) { if (shadow_comparator.file != BAD_FILE) {
emit(MOV(dst_reg(MRF, param_base, shadow_comparator.type, WRITEMASK_W), emit(MOV(dst_reg(MRF, param_base, shadow_comparator.type, WRITEMASK_W),
shadow_comparator)); shadow_comparator));
@@ -992,6 +1007,10 @@ vec4_visitor::emit_texture(ir_texture_opcode op,
emit(MOV(dst_reg(MRF, param_base + 1, glsl_type::ivec2_type, WRITEMASK_XY), emit(MOV(dst_reg(MRF, param_base + 1, glsl_type::ivec2_type, WRITEMASK_XY),
offset_value)); offset_value));
inst->mlen++; inst->mlen++;
break;
default:
break;
} }
} }