diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-11-06 05:54:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-06 05:54:11 +0100 |
commit | 654b77d2ec372bd986d472da7491d0156d0af52e (patch) | |
tree | 163ac38e64ed94bdcf3a4ee3c50816c6882cc138 /src/video_core/shader/shader_ir.h | |
parent | Merge pull request #3073 from DarkLordZach/azure-rename-partial (diff) | |
parent | shader/node: Unpack bindless texture encoding (diff) | |
download | yuzu-654b77d2ec372bd986d472da7491d0156d0af52e.tar yuzu-654b77d2ec372bd986d472da7491d0156d0af52e.tar.gz yuzu-654b77d2ec372bd986d472da7491d0156d0af52e.tar.bz2 yuzu-654b77d2ec372bd986d472da7491d0156d0af52e.tar.lz yuzu-654b77d2ec372bd986d472da7491d0156d0af52e.tar.xz yuzu-654b77d2ec372bd986d472da7491d0156d0af52e.tar.zst yuzu-654b77d2ec372bd986d472da7491d0156d0af52e.zip |
Diffstat (limited to 'src/video_core/shader/shader_ir.h')
-rw-r--r-- | src/video_core/shader/shader_ir.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h index b5567f54e..26c8fde22 100644 --- a/src/video_core/shader/shader_ir.h +++ b/src/video_core/shader/shader_ir.h @@ -5,6 +5,7 @@ #pragma once #include <array> +#include <list> #include <map> #include <optional> #include <set> @@ -95,11 +96,11 @@ public: return used_cbufs; } - const std::set<Sampler>& GetSamplers() const { + const std::list<Sampler>& GetSamplers() const { return used_samplers; } - const std::map<u64, Image>& GetImages() const { + const std::list<Image>& GetImages() const { return used_images; } @@ -316,9 +317,6 @@ private: /// Access a bindless image sampler. Image& GetBindlessImage(Tegra::Shader::Register reg, Tegra::Shader::ImageType type); - /// Tries to access an existing image, updating it's state as needed - Image* TryUseExistingImage(u64 offset, Tegra::Shader::ImageType type); - /// Extracts a sequence of bits from a node Node BitfieldExtract(Node value, u32 offset, u32 bits); @@ -402,8 +400,8 @@ private: std::set<Tegra::Shader::Attribute::Index> used_input_attributes; std::set<Tegra::Shader::Attribute::Index> used_output_attributes; std::map<u32, ConstBuffer> used_cbufs; - std::set<Sampler> used_samplers; - std::map<u64, Image> used_images; + std::list<Sampler> used_samplers; + std::list<Image> used_images; std::array<bool, Tegra::Engines::Maxwell3D::Regs::NumClipDistances> used_clip_distances{}; std::map<GlobalMemoryBase, GlobalMemoryUsage> used_global_memory; bool uses_layer{}; |