yuzu-emu/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2024-11-30 11:54:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

gl_shader_decompiler: Remove some attribute stuff that has nothing to do with TEX/TEXS.

Browse Source
This commit is contained in:
bunnei 2018-06-06 19:42:32 -04:00
parent 4b114e1b8a
commit 00c830405b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View File

@ -1112,13 +1112,11 @@ private:
break; break;
} }
case OpCode::Type::Memory: { case OpCode::Type::Memory: {
const Attribute::Index attribute = instr.attribute.fmt20.index;
switch (opcode->GetId()) { switch (opcode->GetId()) {
case OpCode::Id::LD_A: { case OpCode::Id::LD_A: {
ASSERT_MSG(instr.attribute.fmt20.size == 0, "untested"); ASSERT_MSG(instr.attribute.fmt20.size == 0, "untested");
regs.SetRegisterToInputAttibute(instr.gpr0, instr.attribute.fmt20.element, regs.SetRegisterToInputAttibute(instr.gpr0, instr.attribute.fmt20.element,
attribute); instr.attribute.fmt20.index);
break; break;
} }
case OpCode::Id::LD_C: { case OpCode::Id::LD_C: {
@ -1150,12 +1148,11 @@ private:
} }
case OpCode::Id::ST_A: { case OpCode::Id::ST_A: {
ASSERT_MSG(instr.attribute.fmt20.size == 0, "untested"); ASSERT_MSG(instr.attribute.fmt20.size == 0, "untested");
regs.SetOutputAttributeToRegister(attribute, instr.attribute.fmt20.element, regs.SetOutputAttributeToRegister(instr.attribute.fmt20.index,
instr.gpr0); instr.attribute.fmt20.element, instr.gpr0);
break; break;
} }
case OpCode::Id::TEX: { case OpCode::Id::TEX: {
ASSERT_MSG(instr.attribute.fmt20.size == 4, "untested");
const std::string op_a = regs.GetRegisterAsFloat(instr.gpr8); const std::string op_a = regs.GetRegisterAsFloat(instr.gpr8);
const std::string op_b = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1); const std::string op_b = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1);
const std::string sampler = GetSampler(instr.sampler); const std::string sampler = GetSampler(instr.sampler);
@ -1168,7 +1165,7 @@ private:
const std::string texture = "texture(" + sampler + ", coords)"; const std::string texture = "texture(" + sampler + ", coords)";
size_t dest_elem{}; size_t dest_elem{};
for (size_t elem = 0; elem < instr.attribute.fmt20.size; ++elem) { for (size_t elem = 0; elem < 4; ++elem) {
if (!instr.tex.IsComponentEnabled(elem)) { if (!instr.tex.IsComponentEnabled(elem)) {
// Skip disabled components // Skip disabled components
continue; continue;
@ -1181,7 +1178,6 @@ private:
break; break;
} }
case OpCode::Id::TEXS: { case OpCode::Id::TEXS: {
ASSERT_MSG(instr.attribute.fmt20.size == 4, "untested");
const std::string op_a = regs.GetRegisterAsFloat(instr.gpr8); const std::string op_a = regs.GetRegisterAsFloat(instr.gpr8);
const std::string op_b = regs.GetRegisterAsFloat(instr.gpr20); const std::string op_b = regs.GetRegisterAsFloat(instr.gpr20);
const std::string sampler = GetSampler(instr.sampler); const std::string sampler = GetSampler(instr.sampler);