yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Corrections to TEX_B

This commit is contained in:
Fernando Sahmkow 2019-03-26 19:02:24 -04:00 committed by FernandoS27
parent 90d06acfed
commit ac3ba9a33e
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/video_core/engines/shader_bytecode.h
View File

@ -966,6 +966,38 @@ union Instruction {
} }
} tex; } tex;
union {
BitField<28, 1, u64> array;
BitField<29, 2, TextureType> texture_type;
BitField<31, 4, u64> component_mask;
BitField<49, 1, u64> nodep_flag;
BitField<50, 1, u64> dc_flag;
BitField<36, 1, u64> aoffi_flag;
BitField<37, 3, TextureProcessMode> process_mode;
bool IsComponentEnabled(std::size_t component) const {
return ((1ull << component) & component_mask) != 0;
}
TextureProcessMode GetTextureProcessMode() const {
return process_mode;
}
bool UsesMiscMode(TextureMiscMode mode) const {
switch (mode) {
case TextureMiscMode::DC:
return dc_flag != 0;
case TextureMiscMode::NODEP:
return nodep_flag != 0;
case TextureMiscMode::AOFFI:
return aoffi_flag != 0;
default:
break;
}
return false;
}
} tex_b;
union { union {
BitField<22, 6, TextureQueryType> query_type; BitField<22, 6, TextureQueryType> query_type;
BitField<31, 4, u64> component_mask; BitField<31, 4, u64> component_mask;

9
src/video_core/shader/decode/texture.cpp
View File

@ -65,10 +65,10 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) {
LOG_WARNING(HW_GPU, "TEX.NODEP implementation is incomplete"); LOG_WARNING(HW_GPU, "TEX.NODEP implementation is incomplete");
} }
const TextureType texture_type{instr.tex.texture_type}; const TextureType texture_type{instr.tex_b.texture_type};
const bool is_array = instr.tex.array != 0; const bool is_array = instr.tex_b.array != 0;
const bool depth_compare = instr.tex.UsesMiscMode(TextureMiscMode::DC); const bool depth_compare = instr.tex_b.UsesMiscMode(TextureMiscMode::DC);
const auto process_mode = instr.tex.GetTextureProcessMode(); const auto process_mode = instr.tex_b.GetTextureProcessMode();
WriteTexInstructionFloat(bb, instr, WriteTexInstructionFloat(bb, instr,
GetTexCode(instr, texture_type, process_mode, depth_compare, GetTexCode(instr, texture_type, process_mode, depth_compare,
is_array, true, instr.gpr20)); is_array, true, instr.gpr20));
@ -462,6 +462,7 @@ Node4 ShaderIR::GetTexCode(Instruction instr, TextureType texture_type,
if (is_aoffi) { if (is_aoffi) {
aoffi = GetAoffiCoordinates(GetRegister(parameter_register++), coord_count, false); aoffi = GetAoffiCoordinates(GetRegister(parameter_register++), coord_count, false);
} }
const u32 bindless_offset = (is_bindless ? 1 : 0);
Node dc{}; Node dc{};
if (depth_compare) { if (depth_compare) {