diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2018-12-26 06:17:56 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-15 21:54:53 +0100 |
| commit | 52223313b10af4c76b516d6ead247a1a201a71d8 (patch) | |
| tree | e9fb7a948605622b7702d1c4aebef5838253850e | |
| parent | gl_shader_decompiler: Use rasterizer's UBO size limit (diff) | |
| download | yuzu-52223313b10af4c76b516d6ead247a1a201a71d8.tar yuzu-52223313b10af4c76b516d6ead247a1a201a71d8.tar.gz yuzu-52223313b10af4c76b516d6ead247a1a201a71d8.tar.bz2 yuzu-52223313b10af4c76b516d6ead247a1a201a71d8.tar.lz yuzu-52223313b10af4c76b516d6ead247a1a201a71d8.tar.xz yuzu-52223313b10af4c76b516d6ead247a1a201a71d8.tar.zst yuzu-52223313b10af4c76b516d6ead247a1a201a71d8.zip | |
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/shader/decode/other.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/shader/shader_ir.h | 2 |
3 files changed, 2 insertions, 13 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 7d7abe703..ecd27db07 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -1204,12 +1204,6 @@ private: return expr; } - std::string Ipa(Operation operation) { - const auto& attribute = operation[0]; - // TODO(Rodrigo): Special IPA attribute interactions - return Visit(attribute); - } - std::string Bra(Operation operation) { const auto target = std::get<ImmediateNode>(*operation[0]); code.AddLine(fmt::format("jmp_to = 0x{:x}u;", target.GetValue())); @@ -1448,8 +1442,6 @@ private: &GLSLDecompiler::F4TextureQueryLod, &GLSLDecompiler::F4TexelFetch, - &GLSLDecompiler::Ipa, - &GLSLDecompiler::Bra, &GLSLDecompiler::PushFlowStack, // Ssy &GLSLDecompiler::PushFlowStack, // Brk diff --git a/src/video_core/shader/decode/other.cpp b/src/video_core/shader/decode/other.cpp index 1918762b8..386433d8e 100644 --- a/src/video_core/shader/decode/other.cpp +++ b/src/video_core/shader/decode/other.cpp @@ -134,9 +134,8 @@ u32 ShaderIR::DecodeOther(BasicBlock& bb, u32 pc) { const Tegra::Shader::IpaMode input_mode{instr.ipa.interp_mode.Value(), instr.ipa.sample_mode.Value()}; - const Node input_attr = GetInputAttribute(attribute.index, attribute.element, input_mode); - const Node ipa = Operation(OperationCode::Ipa, input_attr); - const Node value = GetSaturatedFloat(ipa, instr.ipa.saturate); + const Node attr = GetInputAttribute(attribute.index, attribute.element, input_mode); + const Node value = GetSaturatedFloat(attr, instr.ipa.saturate); SetRegister(bb, instr.gpr0, value); break; diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h index 6d036d200..52c7c3180 100644 --- a/src/video_core/shader/shader_ir.h +++ b/src/video_core/shader/shader_ir.h @@ -161,8 +161,6 @@ enum class OperationCode { F4TextureQueryLod, /// (MetaTexture, float[N] coords) -> float4 F4TexelFetch, /// (MetaTexture, int[N], int) -> float4 - Ipa, /// (abuf src) -> float - Bra, /// (uint branch_target) -> void Ssy, /// (uint branch_target) -> void Pbk, /// (uint branch_target) -> void |