Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Mac build fix. Rename WindowZoom ini parameter to force-reset it as it

Browse source 
should always be 1 on Android for now.
This commit is contained in:
Henrik Rydgård 2013-05-07 23:28:19 +02:00
parent 321ebb29b3
commit b3355b2f7c
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Core/Config.cpp
View file

@ -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);

8
GPU/GLES/ShaderManager.cpp
View file

@ -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);
}