diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-08-20 10:57:31 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-08-20 10:57:31 -0700 |
| commit | d29e3331426823b0dcd49a7436a4a8a6bdf60dcf (patch) | |
| tree | 84bbe066f736929fc1b4e381f3c719006070d409 /Source/Core/VideoBackends/OGL/PostProcessing.cpp | |
| parent | a09cf1d8f1bdc58de56b8fbb2d2282b8e59d2e69 (diff) | |
| parent | a9c33075f2f2b8ca6ffb699308a282e385a726b9 (diff) | |
Merge pull request #833 from shuffle2/msvc-improvements
misc improvements for msvc build. -Werror for msvc!
Diffstat (limited to 'Source/Core/VideoBackends/OGL/PostProcessing.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/PostProcessing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.cpp b/Source/Core/VideoBackends/OGL/PostProcessing.cpp index 10ccf9fba8..311756d063 100644 --- a/Source/Core/VideoBackends/OGL/PostProcessing.cpp +++ b/Source/Core/VideoBackends/OGL/PostProcessing.cpp @@ -282,7 +282,7 @@ std::string OpenGLPostProcessing::LoadShaderOptions(const std::string& code) } else if (it.second.m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_INTEGER) { - u32 count = it.second.m_integer_values.size(); + u32 count = static_cast<u32>(it.second.m_integer_values.size()); if (count == 1) glsl_options += StringFromFormat("uniform int option_%s;\n", it.first.c_str()); else @@ -290,7 +290,7 @@ std::string OpenGLPostProcessing::LoadShaderOptions(const std::string& code) } else if (it.second.m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_FLOAT) { - u32 count = it.second.m_float_values.size(); + u32 count = static_cast<u32>(it.second.m_float_values.size()); if (count == 1) glsl_options += StringFromFormat("uniform float option_%s;\n", it.first.c_str()); else |