diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-01-04 18:14:34 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2020-01-04 18:28:02 +0100 |
commit | a1667a7b46cef31a493721b6c193749ee54f730f (patch) | |
tree | 7e62f71ec4a3dbf957e842aa618e1d641af36c9f /src/video_core/shader/decode/texture.cpp | |
parent | Merge pull request #3247 from FernandoS27/remap-fix (diff) | |
download | yuzu-a1667a7b46cef31a493721b6c193749ee54f730f.tar yuzu-a1667a7b46cef31a493721b6c193749ee54f730f.tar.gz yuzu-a1667a7b46cef31a493721b6c193749ee54f730f.tar.bz2 yuzu-a1667a7b46cef31a493721b6c193749ee54f730f.tar.lz yuzu-a1667a7b46cef31a493721b6c193749ee54f730f.tar.xz yuzu-a1667a7b46cef31a493721b6c193749ee54f730f.tar.zst yuzu-a1667a7b46cef31a493721b6c193749ee54f730f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/shader/decode/texture.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp index 4b14cdf58..cf99cc5be 100644 --- a/src/video_core/shader/decode/texture.cpp +++ b/src/video_core/shader/decode/texture.cpp @@ -161,16 +161,16 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) { case OpCode::Id::TXD: { UNIMPLEMENTED_IF_MSG(instr.txd.UsesMiscMode(TextureMiscMode::AOFFI), "AOFFI is not implemented"); - UNIMPLEMENTED_IF_MSG(instr.txd.is_array != 0, "TXD Array is not implemented"); + const bool is_array = instr.txd.is_array != 0; u64 base_reg = instr.gpr8.Value(); const auto derivate_reg = instr.gpr20.Value(); const auto texture_type = instr.txd.texture_type.Value(); const auto coord_count = GetCoordCount(texture_type); - const Sampler* sampler = is_bindless - ? GetBindlessSampler(base_reg, {{texture_type, false, false}}) - : GetSampler(instr.sampler, {{texture_type, false, false}}); + const Sampler* sampler = + is_bindless ? GetBindlessSampler(base_reg, {{texture_type, is_array, false}}) + : GetSampler(instr.sampler, {{texture_type, is_array, false}}); Node4 values; if (sampler == nullptr) { for (u32 element = 0; element < values.size(); ++element) { @@ -179,6 +179,7 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) { WriteTexInstructionFloat(bb, instr, values); break; } + if (is_bindless) { base_reg++; } @@ -192,8 +193,14 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) { derivates.push_back(GetRegister(derivate_reg + derivate + 1)); } + Node array_node = {}; + if (is_array) { + const Node info_reg = GetRegister(base_reg + coord_count); + array_node = BitfieldExtract(info_reg, 0, 16); + } + for (u32 element = 0; element < values.size(); ++element) { - MetaTexture meta{*sampler, {}, {}, {}, {}, derivates, {}, {}, {}, element}; + MetaTexture meta{*sampler, array_node, {}, {}, {}, derivates, {}, {}, {}, element}; values[element] = Operation(OperationCode::TextureGradient, std::move(meta), coords); } |