diff --git a/Core/Config.cpp b/Core/Config.cpp index 0b1e9fb7b1..88d3082185 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -124,7 +124,7 @@ void Config::Load(const char *iniFileName) graphics->Get("StretchToDisplay", &bStretchToDisplay, false); graphics->Get("TrueColor", &bTrueColor, true); graphics->Get("FramebuffersToMem", &bFramebuffersToMem, false); - graphics->Get("FramebuffersCPUConvert", &bFramebuffersCPUConvert, false); + graphics->Get("FramebuffersCPUConvert", &bFramebuffersCPUConvert, true); graphics->Get("MipMap", &bMipMap, true); graphics->Get("TexScalingLevel", &iTexScalingLevel, 1); graphics->Get("TexScalingType", &iTexScalingType, 0); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index aa871b8e9d..f7c6dbe12a 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -162,8 +162,9 @@ void GameSettingsScreen::CreateViews() { graphicsSettings->Add(new CheckBox(&g_Config.bUseVBO, gs->T("Stream VBO"))); graphicsSettings->Add(new CheckBox(&g_Config.SSAntiAliasing, gs->T("Anti Aliasing"))); graphicsSettings->Add(new CheckBox(&g_Config.bFramebuffersToMem, gs->T("Read Framebuffer to memory"))); +#ifndef USING_GLES2 graphicsSettings->Add(new CheckBox(&g_Config.bFramebuffersCPUConvert, gs->T("Convert Framebuffers Using CPU"))); - +#endif // TODO: Does frame rate belong among the graphics settings? graphicsSettings->Add(new ItemHeader(gs->T("Frame rate"))); graphicsSettings->Add(new CheckBox(&cap60FPS_, gs->T("Read Framebuffer to memory"))); diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index fb3f4f4995..e35c5f8b90 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -964,10 +964,12 @@ void GraphicsScreenP1::render() { if (gpu) gpu->Resized(); } +#ifndef USING_GLES2 if (UICheckBox(GEN_ID, x + 60, y += stride, gs->T("Convert Framebuffers Using CPU"), ALIGN_TOPLEFT, &g_Config.bFramebuffersCPUConvert)) { if (gpu) gpu->Resized(); } +#endif if (UICheckBox(GEN_ID, x + 60, y += stride, gs->T("AA", "Anti-Aliasing"), ALIGN_TOPLEFT, &g_Config.SSAntiAliasing)) { if (gpu) gpu->Resized();