fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 02:20:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tgsi: remove unused tgsi_shader_info fields

Browse source 
Removes:
uses_persp_opcode_interp_centroid
uses_persp_opcode_interp_offset
uses_persp_opcode_interp_sample
uses_linear_opcode_interp_centroid
uses_linear_opcode_interp_offset
uses_linear_opcode_interp_sample

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24100>
This commit is contained in:
Thomas H.P. Andersen 2023-07-11 18:22:27 +02:00 • committed by Marge Bot
parent 6c513ef4fd
commit 436e59e3d9
3 changed files with 6 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gallium/auxiliary/nir/nir_to_tgsi_info.c
View file

@ -307,35 +307,6 @@ static void scan_instruction(const struct nir_shader *nir,
gather_intrinsic_load_deref_info(nir, intr, deref, need_texcoord, var, info);
break;
}
case nir_intrinsic_interp_deref_at_centroid:
case nir_intrinsic_interp_deref_at_sample:
case nir_intrinsic_interp_deref_at_offset: {
enum glsl_interp_mode interp = nir_intrinsic_get_var(intr, 0)->data.interpolation;
switch (interp) {
case INTERP_MODE_SMOOTH:
case INTERP_MODE_NONE:
if (intr->intrinsic == nir_intrinsic_interp_deref_at_centroid)
info->uses_persp_opcode_interp_centroid = true;
else if (intr->intrinsic == nir_intrinsic_interp_deref_at_sample)
info->uses_persp_opcode_interp_sample = true;
else
info->uses_persp_opcode_interp_offset = true;
break;
case INTERP_MODE_NOPERSPECTIVE:
if (intr->intrinsic == nir_intrinsic_interp_deref_at_centroid)
info->uses_linear_opcode_interp_centroid = true;
else if (intr->intrinsic == nir_intrinsic_interp_deref_at_sample)
info->uses_linear_opcode_interp_sample = true;
else
info->uses_linear_opcode_interp_offset = true;
break;
case INTERP_MODE_FLAT:
break;
default:
unreachable("Unsupported interpoation type");
}
break;
}
default:
break;
}

63
src/gallium/auxiliary/tgsi/tgsi_scan.c
View file

@ -109,7 +109,6 @@ scan_src_operand(struct tgsi_shader_info *info,
const struct tgsi_full_src_register *src,
unsigned src_index,
unsigned usage_mask_after_swizzle,
bool is_interp_instruction,
bool *is_mem_inst)
{
int ind = src->Register.Index;
@ -292,7 +291,6 @@ scan_instruction(struct tgsi_shader_info *info,
{
unsigned i;
bool is_mem_inst = false;
bool is_interp_instruction = false;
unsigned sampler_src;
assert(fullinst->Instruction.Opcode < TGSI_OPCODE_LAST);
@ -381,55 +379,6 @@ scan_instruction(struct tgsi_shader_info *info,
break;
}
if (fullinst->Instruction.Opcode == TGSI_OPCODE_INTERP_CENTROID ||
fullinst->Instruction.Opcode == TGSI_OPCODE_INTERP_OFFSET ||
fullinst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE) {
const struct tgsi_full_src_register *src0 = &fullinst->Src[0];
unsigned input;
is_interp_instruction = true;
if (src0->Register.Indirect && src0->Indirect.ArrayID)
input = info->input_array_first[src0->Indirect.ArrayID];
else
input = src0->Register.Index;
/* For the INTERP opcodes, the interpolation is always
* PERSPECTIVE unless LINEAR is specified.
*/
switch (info->input_interpolate[input]) {
case TGSI_INTERPOLATE_COLOR:
case TGSI_INTERPOLATE_CONSTANT:
case TGSI_INTERPOLATE_PERSPECTIVE:
switch (fullinst->Instruction.Opcode) {
case TGSI_OPCODE_INTERP_CENTROID:
info->uses_persp_opcode_interp_centroid = true;
break;
case TGSI_OPCODE_INTERP_OFFSET:
info->uses_persp_opcode_interp_offset = true;
break;
case TGSI_OPCODE_INTERP_SAMPLE:
info->uses_persp_opcode_interp_sample = true;
break;
}
break;
case TGSI_INTERPOLATE_LINEAR:
switch (fullinst->Instruction.Opcode) {
case TGSI_OPCODE_INTERP_CENTROID:
info->uses_linear_opcode_interp_centroid = true;
break;
case TGSI_OPCODE_INTERP_OFFSET:
info->uses_linear_opcode_interp_offset = true;
break;
case TGSI_OPCODE_INTERP_SAMPLE:
info->uses_linear_opcode_interp_sample = true;
break;
}
break;
}
}
if ((fullinst->Instruction.Opcode >= TGSI_OPCODE_F2D &&
fullinst->Instruction.Opcode <= TGSI_OPCODE_DSSG) ||
fullinst->Instruction.Opcode == TGSI_OPCODE_DFMA ||
@ -443,7 +392,7 @@ scan_instruction(struct tgsi_shader_info *info,
for (i = 0; i < fullinst->Instruction.NumSrcRegs; i++) {
scan_src_operand(info, fullinst, &fullinst->Src[i], i,
tgsi_util_get_inst_usage_mask(fullinst, i),
is_interp_instruction, &is_mem_inst);
&is_mem_inst);
if (fullinst->Src[i].Register.Indirect) {
struct tgsi_full_src_register src = {{0}};
@ -453,7 +402,7 @@ scan_instruction(struct tgsi_shader_info *info,
scan_src_operand(info, fullinst, &src, -1,
1 << fullinst->Src[i].Indirect.Swizzle,
false, NULL);
NULL);
}
if (fullinst->Src[i].Register.Dimension &&
@ -465,7 +414,7 @@ scan_instruction(struct tgsi_shader_info *info,
scan_src_operand(info, fullinst, &src, -1,
1 << fullinst->Src[i].DimIndirect.Swizzle,
false, NULL);
NULL);
}
}
@ -481,7 +430,7 @@ scan_instruction(struct tgsi_shader_info *info,
(1 << fullinst->TexOffsets[i].SwizzleX) |
(1 << fullinst->TexOffsets[i].SwizzleY) |
(1 << fullinst->TexOffsets[i].SwizzleZ),
false, &is_mem_inst);
&is_mem_inst);
}
}
@ -496,7 +445,7 @@ scan_instruction(struct tgsi_shader_info *info,
src.Register.Index = dst->Indirect.Index;
scan_src_operand(info, fullinst, &src, -1,
1 << dst->Indirect.Swizzle, false, NULL);
1 << dst->Indirect.Swizzle, NULL);
info->indirect_files |= (1 << dst->Register.File);
info->indirect_files_written |= (1 << dst->Register.File);
@ -509,7 +458,7 @@ scan_instruction(struct tgsi_shader_info *info,
src.Register.Index = dst->DimIndirect.Index;
scan_src_operand(info, fullinst, &src, -1,
1 << dst->DimIndirect.Swizzle, false, NULL);
1 << dst->DimIndirect.Swizzle, NULL);
info->dim_indirect_files |= 1u << dst->Register.File;
}

6
src/gallium/auxiliary/tgsi/tgsi_scan.h
View file

@ -90,12 +90,6 @@ struct tgsi_shader_info
bool writes_samplemask; /**< does fragment shader write sample mask? */
bool writes_edgeflag; /**< vertex shader outputs edgeflag */
bool uses_kill; /**< KILL or KILL_IF instruction used? */
bool uses_persp_opcode_interp_centroid;
bool uses_persp_opcode_interp_offset;
bool uses_persp_opcode_interp_sample;
bool uses_linear_opcode_interp_centroid;
bool uses_linear_opcode_interp_offset;
bool uses_linear_opcode_interp_sample;
bool uses_instanceid;
bool uses_vertexid;
bool uses_vertexid_nobase;