diff options
| author |  Wollnashorn | 2023-06-15 18:46:40 +0200 |
|---|---|---|
| committer | Wollnashorn | 2023-06-15 18:46:40 +0200 |
| commit | 3e8cd91d548433344d9c479bb7ad83a3bf1560c1 (patch) | |
| tree | a1b04a5ea149d6b45ad52f1fcd01733740552e30 /src/video_core/renderer_vulkan | |
| parent | video_core: Add per-image anisotropy heuristics (format & mip count) (diff) | |
| download | yuzu-3e8cd91d548433344d9c479bb7ad83a3bf1560c1.tar.gz yuzu-3e8cd91d548433344d9c479bb7ad83a3bf1560c1.tar.xz yuzu-3e8cd91d548433344d9c479bb7ad83a3bf1560c1.zip | |
video_core: Fixed compilation errors because of name shadowing
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_texture_cache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 0e8f8a064..8ec181335 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp | |||
| @@ -1802,7 +1802,7 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& t | |||
| 1802 | // Some games have samplers with garbage. Sanitize them here. | 1802 | // Some games have samplers with garbage. Sanitize them here. |
| 1803 | const f32 max_anisotropy = std::clamp(tsc.MaxAnisotropy(), 1.0f, 16.0f); | 1803 | const f32 max_anisotropy = std::clamp(tsc.MaxAnisotropy(), 1.0f, 16.0f); |
| 1804 | 1804 | ||
| 1805 | const auto create_sampler = [&](const f32 max_anisotropy) { | 1805 | const auto create_sampler = [&](const f32 anisotropy) { |
| 1806 | return device.GetLogical().CreateSampler(VkSamplerCreateInfo{ | 1806 | return device.GetLogical().CreateSampler(VkSamplerCreateInfo{ |
| 1807 | .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO, | 1807 | .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO, |
| 1808 | .pNext = pnext, | 1808 | .pNext = pnext, |
| @@ -1814,8 +1814,8 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& t | |||
| 1814 | .addressModeV = MaxwellToVK::Sampler::WrapMode(device, tsc.wrap_v, tsc.mag_filter), | 1814 | .addressModeV = MaxwellToVK::Sampler::WrapMode(device, tsc.wrap_v, tsc.mag_filter), |
| 1815 | .addressModeW = MaxwellToVK::Sampler::WrapMode(device, tsc.wrap_p, tsc.mag_filter), | 1815 | .addressModeW = MaxwellToVK::Sampler::WrapMode(device, tsc.wrap_p, tsc.mag_filter), |
| 1816 | .mipLodBias = tsc.LodBias(), | 1816 | .mipLodBias = tsc.LodBias(), |
| 1817 | .anisotropyEnable = static_cast<VkBool32>(max_anisotropy > 1.0f ? VK_TRUE : VK_FALSE), | 1817 | .anisotropyEnable = static_cast<VkBool32>(anisotropy > 1.0f ? VK_TRUE : VK_FALSE), |
| 1818 | .maxAnisotropy = max_anisotropy, | 1818 | .maxAnisotropy = anisotropy, |
| 1819 | .compareEnable = tsc.depth_compare_enabled, | 1819 | .compareEnable = tsc.depth_compare_enabled, |
| 1820 | .compareOp = MaxwellToVK::Sampler::DepthCompareFunction(tsc.depth_compare_func), | 1820 | .compareOp = MaxwellToVK::Sampler::DepthCompareFunction(tsc.depth_compare_func), |
| 1821 | .minLod = tsc.mipmap_filter == TextureMipmapFilter::None ? 0.0f : tsc.MinLod(), | 1821 | .minLod = tsc.mipmap_filter == TextureMipmapFilter::None ? 0.0f : tsc.MinLod(), |