Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Shader_IR: Corrections, styling and extras.

Browse source
This commit is contained in:
Fernando Sahmkow 2020-01-08 12:13:05 -04:00 committed by FernandoS27
parent 37b8504faa
commit 3919b7b8a9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/video_core/shader/decode.cpp
View file

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cstring> #include <cstring>
#include <limits>
#include <set> #include <set>
#include <fmt/format.h> #include <fmt/format.h>
@ -64,7 +65,7 @@ std::optional<u32> TryDeduceSamplerSize(Sampler& sampler_to_deduce,
return std::nullopt; return std::nullopt;
} }
const u32 base_offset = sampler_to_deduce.GetOffset(); const u32 base_offset = sampler_to_deduce.GetOffset();
u32 max_offset{UINT_MAX}; u32 max_offset{std::numeric_limits<u32>::max()};
for (const auto& sampler : used_samplers) { for (const auto& sampler : used_samplers) {
if (sampler.IsBindless()) { if (sampler.IsBindless()) {
continue; continue;
@ -73,7 +74,7 @@ std::optional<u32> TryDeduceSamplerSize(Sampler& sampler_to_deduce,
max_offset = std::min(sampler.GetOffset(), max_offset); max_offset = std::min(sampler.GetOffset(), max_offset);
} }
} }
if (max_offset == UINT_MAX) { if (max_offset == std::numeric_limits<u32>::max()) {
return std::nullopt; return std::nullopt;
} }
return ((max_offset - base_offset) * 4) / gpu_driver->GetTextureHandlerSize(); return ((max_offset - base_offset) * 4) / gpu_driver->GetTextureHandlerSize();
@ -373,6 +374,7 @@ void ShaderIR::PostDecode() {
if (size) { if (size) {
sampler.SetSize(*size); sampler.SetSize(*size);
} else { } else {
LOG_CRITICAL(HW_GPU, "Failed to deduce size of indexed sampler");
sampler.SetSize(1); sampler.SetSize(1);
} }
} }