VERY experimental Nintendo Switch 2 emulator
C++
video_core: Fixed compilation errors because of name shadowing
Wollnashorn1f7c69934d06
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cppindex ee5a0c7236..7ff54003f3 100644--- a/src/video_core/renderer_opengl/gl_texture_cache.cpp+++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp@@ -1270,10 +1270,10 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const TSCEntry& config) {const f32 max_anisotropy = std::clamp(config.MaxAnisotropy(), 1.0f, 16.0f);- const auto create_sampler = [&](const f32 max_anisotropy) {- OGLSampler sampler;- sampler.Create();- const GLuint handle = sampler.handle;+ const auto create_sampler = [&](const f32 anisotropy) {+ OGLSampler new_sampler;+ new_sampler.Create();+ const GLuint handle = new_sampler.handle;glSamplerParameteri(handle, GL_TEXTURE_WRAP_S, MaxwellToGL::WrapMode(config.wrap_u));glSamplerParameteri(handle, GL_TEXTURE_WRAP_T, MaxwellToGL::WrapMode(config.wrap_v));glSamplerParameteri(handle, GL_TEXTURE_WRAP_R, MaxwellToGL::WrapMode(config.wrap_p));@@ -1287,7 +1287,7 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const TSCEntry& config) {glSamplerParameterfv(handle, GL_TEXTURE_BORDER_COLOR, config.BorderColor().data());if (GLAD_GL_ARB_texture_filter_anisotropic || GLAD_GL_EXT_texture_filter_anisotropic) {- glSamplerParameterf(handle, GL_TEXTURE_MAX_ANISOTROPY, max_anisotropy);+ glSamplerParameterf(handle, GL_TEXTURE_MAX_ANISOTROPY, anisotropy);} else {LOG_WARNING(Render_OpenGL, "GL_ARB_texture_filter_anisotropic is required");}@@ -1302,7 +1302,7 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const TSCEntry& config) {// We default to false because it's more commonLOG_WARNING(Render_OpenGL, "GL_ARB_seamless_cubemap_per_texture is required");}- return sampler;+ return new_sampler;};sampler = create_sampler(max_anisotropy);diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cppindex 0e8f8a0641..8ec1813355 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// Some games have samplers with garbage. Sanitize them here.const f32 max_anisotropy = std::clamp(tsc.MaxAnisotropy(), 1.0f, 16.0f);- const auto create_sampler = [&](const f32 max_anisotropy) {+ const auto create_sampler = [&](const f32 anisotropy) {return device.GetLogical().CreateSampler(VkSamplerCreateInfo{.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,.pNext = pnext,@@ -1814,8 +1814,8 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& t.addressModeV = MaxwellToVK::Sampler::WrapMode(device, tsc.wrap_v, tsc.mag_filter),.addressModeW = MaxwellToVK::Sampler::WrapMode(device, tsc.wrap_p, tsc.mag_filter),.mipLodBias = tsc.LodBias(),- .anisotropyEnable = static_cast<VkBool32>(max_anisotropy > 1.0f ? VK_TRUE : VK_FALSE),- .maxAnisotropy = max_anisotropy,+ .anisotropyEnable = static_cast<VkBool32>(anisotropy > 1.0f ? VK_TRUE : VK_FALSE),+ .maxAnisotropy = anisotropy,.compareEnable = tsc.depth_compare_enabled,.compareOp = MaxwellToVK::Sampler::DepthCompareFunction(tsc.depth_compare_func),.minLod = tsc.mipmap_filter == TextureMipmapFilter::None ? 0.0f : tsc.MinLod(),