From f9fe82f19ec4b85ff901e268dc3fff98b3e5255a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= Date: Sat, 27 Dec 2025 10:26:00 +0100 Subject: [PATCH] ShaderAsset: Fix shadowed variable `samplers` is a member defined in ShaderAsset.h --- Source/Core/VideoCommon/Assets/ShaderAsset.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp index 99c9ed4ab0..04a9139212 100644 --- a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp +++ b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp @@ -256,7 +256,7 @@ bool RasterSurfaceShaderData::FromJson(const VideoCommon::CustomAssetLibrary::As const auto parse_samplers = [&](const char* name, - std::vector* samplers) -> bool { + std::vector* samplers_out) -> bool { const auto samplers_iter = json.find(name); if (samplers_iter == json.end()) { @@ -309,7 +309,7 @@ bool RasterSurfaceShaderData::FromJson(const VideoCommon::CustomAssetLibrary::As asset_id); return false; } - samplers->push_back(std::move(sampler)); + samplers_out->push_back(std::move(sampler)); } return true;