Merge pull request #2851 from thedax/framebufferConvertUIOption

UI on all platforms(including NewUI!): Add options to change FramebufferCPUConvert

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

UI/GameSettingsScreen.cpp

@@ -162,7 +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")));

UI/MenuScreens.cpp

@@ -954,7 +954,7 @@ void GraphicsScreenP1::render() {
 	g_Config.iVSyncInterval = Vsync ? 1 : 0;
 	UICheckBox(GEN_ID, x, y += stride, gs->T("Fullscreen"), ALIGN_TOPLEFT, &g_Config.bFullScreen);
 #endif
-	UICheckBox(GEN_ID, x, y += stride, gs->T("Display Raw Framebuffer"), ALIGN_TOPLEFT, &g_Config.bDisplayFramebuffer);
+	
 	if (UICheckBox(GEN_ID, x, y += stride, gs->T("Buffered Rendering"), ALIGN_TOPLEFT, &g_Config.bBufferedRendering)) {
 		if (gpu)
 			gpu->Resized();
@@ -964,6 +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();
@@ -1245,7 +1251,9 @@ void GraphicsScreenP3::render() {
 		y += 20;
 	} else 
 		g_Config.iFrameSkip = 0;
-	
+
+	UICheckBox(GEN_ID, x, y += stride, gs->T("Display Raw Framebuffer"), ALIGN_TOPLEFT, &g_Config.bDisplayFramebuffer);
+
 	UIEnd();
 }
 

Windows/WndMainWindow.cpp

@@ -734,6 +734,13 @@ namespace MainWindow
 					gpu->Resized();  // easy way to force a clear...
 				break;
 
+			case ID_OPTIONS_FBOCPUCONVERT:
+				g_Config.bFramebuffersCPUConvert = !g_Config.bFramebuffersCPUConvert;
+				osm.ShowOnOff(g->T("Convert Framebuffers Using CPU"), g_Config.bFramebuffersCPUConvert);
+				if(gpu)
+					gpu->Resized(); // easy way to force a clear...
+				break;
+
 			case ID_OPTIONS_SHOWDEBUGSTATISTICS:
 				g_Config.bShowDebugStats = !g_Config.bShowDebugStats;
 				break;
@@ -1036,6 +1043,7 @@ namespace MainWindow
 		CHECKITEM(ID_CPU_DYNAREC,g_Config.bJit == true);
 		CHECKITEM(ID_OPTIONS_BUFFEREDRENDERING, g_Config.bBufferedRendering);
 		CHECKITEM(ID_OPTIONS_READFBOTOMEMORY, g_Config.bFramebuffersToMem);
+		CHECKITEM(ID_OPTIONS_FBOCPUCONVERT, g_Config.bFramebuffersCPUConvert);
 		CHECKITEM(ID_OPTIONS_SHOWDEBUGSTATISTICS, g_Config.bShowDebugStats);
 		CHECKITEM(ID_OPTIONS_HARDWARETRANSFORM, g_Config.bHardwareTransform);
 		CHECKITEM(ID_OPTIONS_FASTMEMORY, g_Config.bFastMemory);