From b3355b2f7c1da3149d3ecac5eccfe7770bc23696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 7 May 2013 23:28:19 +0200 Subject: [PATCH] Mac build fix. Rename WindowZoom ini parameter to force-reset it as it should always be 1 on Android for now. --- Core/Config.cpp | 8 ++++---- GPU/GLES/ShaderManager.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index d7feb25fe9..4cf2389f65 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -90,9 +90,9 @@ void Config::Load(const char *iniFileName) graphics->Get("ShowFPSCounter", &bShowFPSCounter, false); graphics->Get("DisplayFramebuffer", &bDisplayFramebuffer, false); #ifdef _WIN32 - graphics->Get("WindowZoom", &iWindowZoom, 2); + graphics->Get("ResolutionScale", &iWindowZoom, 2); #else - graphics->Get("WindowZoom", &iWindowZoom, 1); + graphics->Get("ResolutionScale", &iWindowZoom, 1); #endif graphics->Get("BufferedRendering", &bBufferedRendering, true); graphics->Get("HardwareTransform", &bHardwareTransform, true); @@ -185,14 +185,14 @@ void Config::Save() IniFile::Section *graphics = iniFile.GetOrCreateSection("Graphics"); graphics->Set("ShowFPSCounter", bShowFPSCounter); graphics->Set("DisplayFramebuffer", bDisplayFramebuffer); - graphics->Set("WindowZoom", iWindowZoom); + graphics->Set("ResolutionScale", iWindowZoom); graphics->Set("BufferedRendering", bBufferedRendering); graphics->Set("HardwareTransform", bHardwareTransform); graphics->Set("LinearFiltering", bLinearFiltering); graphics->Set("SSAA", SSAntiAliasing); graphics->Set("VBO", bUseVBO); graphics->Set("FrameSkip", iFrameSkip); - graphics->Set("UseMediaEngine", bUseMediaEngine); + graphics->Set("UseMediaEngine", bUseMediaEngine); graphics->Set("AnisotropyLevel", iAnisotropyLevel); graphics->Set("VertexCache", bVertexCache); graphics->Set("FullScreen", bFullScreen); diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp index 701f8ce198..a6bb7b5279 100644 --- a/GPU/GLES/ShaderManager.cpp +++ b/GPU/GLES/ShaderManager.cpp @@ -182,10 +182,10 @@ static void SetColorUniform3Alpha(int uniform, u32 color, u8 alpha) static void SetColorUniform3iAlpha(int uniform, u32 color, u8 alpha) { const GLint col[4] = { - ((color & 0xFF)), - ((color & 0xFF00) >> 8), - ((color & 0xFF0000) >> 16), - alpha + (GLint)((color & 0xFF)), + (GLint)((color & 0xFF00) >> 8), + (GLint)((color & 0xFF0000) >> 16), + (GLint)alpha }; glUniform4iv(uniform, 1, col); }