ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Video: Fix Post Process shader options issues 

-An assert would be erroneously thrown when shaders declared an array of 4 int or float options, despite 4 being the max supported (a simple <= / < mistake)
-When changing the type of a shader option (e.g. from bool to float), the serialization would be stuck appending the value from the previous option type, making the shader fail to build permanently until the cache were cleaned
This commit is contained in:
Filippo Tarpini 2023-06-08 02:54:46 +03:00 committed by GitHub
parent 44d93048b3
commit c9e61a79b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/VideoCommon/PostProcessing.cpp
View File

@ -255,7 +255,13 @@ void PostProcessingConfiguration::LoadOptionsConfiguration()
std::string value; std::string value;
ini.GetOrCreateSection(section)->Get(it.second.m_option_name, &value); ini.GetOrCreateSection(section)->Get(it.second.m_option_name, &value);
if (!value.empty()) if (!value.empty())
TryParseVector(value, &it.second.m_integer_values); {
auto integer_values = it.second.m_integer_values;
if (TryParseVector(value, &integer_values))
{
it.second.m_integer_values = integer_values;
}
}
} }
break; break;
case ConfigurationOption::OptionType::Float: case ConfigurationOption::OptionType::Float:
@ -263,7 +269,13 @@ void PostProcessingConfiguration::LoadOptionsConfiguration()
std::string value; std::string value;
ini.GetOrCreateSection(section)->Get(it.second.m_option_name, &value); ini.GetOrCreateSection(section)->Get(it.second.m_option_name, &value);
if (!value.empty()) if (!value.empty())
TryParseVector(value, &it.second.m_float_values); {
auto float_values = it.second.m_float_values;
if (TryParseVector(value, &float_values))
{
it.second.m_float_values = float_values;
}
}
} }
break; break;
} }
@ -664,13 +676,13 @@ void PostProcessing::FillUniformBuffer(const MathUtil::Rectangle<int>& src,
break; break;
case PostProcessingConfiguration::ConfigurationOption::OptionType::Integer: case PostProcessingConfiguration::ConfigurationOption::OptionType::Integer:
ASSERT(it.second.m_integer_values.size() < 4); ASSERT(it.second.m_integer_values.size() <= 4);
std::copy_n(it.second.m_integer_values.begin(), it.second.m_integer_values.size(), std::copy_n(it.second.m_integer_values.begin(), it.second.m_integer_values.size(),
value.as_int); value.as_int);
break; break;
case PostProcessingConfiguration::ConfigurationOption::OptionType::Float: case PostProcessingConfiguration::ConfigurationOption::OptionType::Float:
ASSERT(it.second.m_float_values.size() < 4); ASSERT(it.second.m_float_values.size() <= 4);
std::copy_n(it.second.m_float_values.begin(), it.second.m_float_values.size(), std::copy_n(it.second.m_float_values.begin(), it.second.m_float_values.size(),
value.as_float); value.as_float);
break; break;