diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-06-08 17:25:11 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-06-21 02:38:34 +0200 |
commit | b7de31ac97da9ac80be9f93180a934874b547b0e (patch) | |
tree | ae673b531514a4eb2fcc16cf71e9aa11fb660a68 /src/video_core/shader | |
parent | texture_cache: Don't Image Copy if component types differ (diff) | |
download | yuzu-b7de31ac97da9ac80be9f93180a934874b547b0e.tar yuzu-b7de31ac97da9ac80be9f93180a934874b547b0e.tar.gz yuzu-b7de31ac97da9ac80be9f93180a934874b547b0e.tar.bz2 yuzu-b7de31ac97da9ac80be9f93180a934874b547b0e.tar.lz yuzu-b7de31ac97da9ac80be9f93180a934874b547b0e.tar.xz yuzu-b7de31ac97da9ac80be9f93180a934874b547b0e.tar.zst yuzu-b7de31ac97da9ac80be9f93180a934874b547b0e.zip |
Diffstat (limited to 'src/video_core/shader')
-rw-r--r-- | src/video_core/shader/decode/image.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/video_core/shader/decode/image.cpp b/src/video_core/shader/decode/image.cpp index 199b6b793..24f022cc0 100644 --- a/src/video_core/shader/decode/image.cpp +++ b/src/video_core/shader/decode/image.cpp @@ -3,10 +3,15 @@ // Refer to the license.txt file included. #include <algorithm> +#include <vector> +#include <fmt/format.h> #include "common/assert.h" +#include "common/bit_field.h" #include "common/common_types.h" +#include "common/logging/log.h" #include "video_core/engines/shader_bytecode.h" +#include "video_core/shader/node_helper.h" #include "video_core/shader/shader_ir.h" namespace VideoCommon::Shader { @@ -92,8 +97,8 @@ const Image& ShaderIR::GetBindlessImage(Tegra::Shader::Register reg, const Node image_register{GetRegister(reg)}; const Node base_image{ TrackCbuf(image_register, global_code, static_cast<s64>(global_code.size()))}; - const auto cbuf{std::get_if<CbufNode>(base_image)}; - const auto cbuf_offset_imm{std::get_if<ImmediateNode>(cbuf->GetOffset())}; + const auto cbuf{std::get_if<CbufNode>(&*base_image)}; + const auto cbuf_offset_imm{std::get_if<ImmediateNode>(&*cbuf->GetOffset())}; const auto cbuf_offset{cbuf_offset_imm->GetValue()}; const auto cbuf_index{cbuf->GetIndex()}; const auto cbuf_key{(static_cast<u64>(cbuf_index) << 32) | static_cast<u64>(cbuf_offset)}; |