diff options
| author | 2020-12-29 23:20:09 -0800 | |
|---|---|---|
| committer | 2020-12-29 23:20:09 -0800 | |
| commit | d5fe722a30947c5c808717ad8940077e95a3a81c (patch) | |
| tree | f6f5d6d6379b0404147969e7d1f548ed3d49ca01 /src/video_core/shader/decode.cpp | |
| parent | Merge pull request #5247 from comex/xx-concepts (diff) | |
| parent | video_core: Rewrite the texture cache (diff) | |
| download | yuzu-d5fe722a30947c5c808717ad8940077e95a3a81c.tar.gz yuzu-d5fe722a30947c5c808717ad8940077e95a3a81c.tar.xz yuzu-d5fe722a30947c5c808717ad8940077e95a3a81c.zip | |
Merge pull request #4967 from ReinUsesLisp/new-texcache
video_core/texture_cache: Rewrite the texture cache
Diffstat (limited to 'src/video_core/shader/decode.cpp')
| -rw-r--r-- | src/video_core/shader/decode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/shader/decode.cpp b/src/video_core/shader/decode.cpp index ab14c1aa3..6576d1208 100644 --- a/src/video_core/shader/decode.cpp +++ b/src/video_core/shader/decode.cpp | |||
| @@ -25,7 +25,7 @@ using Tegra::Shader::OpCode; | |||
| 25 | namespace { | 25 | namespace { |
| 26 | 26 | ||
| 27 | void DeduceTextureHandlerSize(VideoCore::GuestDriverProfile& gpu_driver, | 27 | void DeduceTextureHandlerSize(VideoCore::GuestDriverProfile& gpu_driver, |
| 28 | const std::list<Sampler>& used_samplers) { | 28 | const std::list<SamplerEntry>& used_samplers) { |
| 29 | if (gpu_driver.IsTextureHandlerSizeKnown() || used_samplers.size() <= 1) { | 29 | if (gpu_driver.IsTextureHandlerSizeKnown() || used_samplers.size() <= 1) { |
| 30 | return; | 30 | return; |
| 31 | } | 31 | } |
| @@ -43,9 +43,9 @@ void DeduceTextureHandlerSize(VideoCore::GuestDriverProfile& gpu_driver, | |||
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | std::optional<u32> TryDeduceSamplerSize(const Sampler& sampler_to_deduce, | 46 | std::optional<u32> TryDeduceSamplerSize(const SamplerEntry& sampler_to_deduce, |
| 47 | VideoCore::GuestDriverProfile& gpu_driver, | 47 | VideoCore::GuestDriverProfile& gpu_driver, |
| 48 | const std::list<Sampler>& used_samplers) { | 48 | const std::list<SamplerEntry>& used_samplers) { |
| 49 | const u32 base_offset = sampler_to_deduce.offset; | 49 | const u32 base_offset = sampler_to_deduce.offset; |
| 50 | u32 max_offset{std::numeric_limits<u32>::max()}; | 50 | u32 max_offset{std::numeric_limits<u32>::max()}; |
| 51 | for (const auto& sampler : used_samplers) { | 51 | for (const auto& sampler : used_samplers) { |