X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=source%2Fgles2rice%2Fsrc%2FConfig.cpp;h=7ac7295a421dfc23cfffb82f957f7a234329cb16;hb=0764a4751fb12ff200c29943700ee45b3722f102;hp=98d86cda3a4b717f750593361cd700c2f17dc530;hpb=ca22e7b76883b946060a6b40bb8709c1981e1cf6;p=mupen64plus-pandora.git

diff --git a/source/gles2rice/src/Config.cpp b/source/gles2rice/src/Config.cpp
index 98d86cd..7ac7295 100755
--- a/source/gles2rice/src/Config.cpp
+++ b/source/gles2rice/src/Config.cpp
@@ -313,6 +313,9 @@ BOOL InitConfiguration(void)
     ConfigSetDefaultBool(l_ConfigVideoGeneral, "Fullscreen", 0, "Use fullscreen mode if True, or windowed mode if False ");
     ConfigSetDefaultInt(l_ConfigVideoGeneral, "ScreenWidth", 640, "Width of output window or fullscreen width");
     ConfigSetDefaultInt(l_ConfigVideoGeneral, "ScreenHeight", 480, "Height of output window or fullscreen height");
+#if 1
+    ConfigSetDefaultBool(l_ConfigVideoGeneral, "AspectRatio", 1, "If true, use correct aspect ratio, if false, stretch to fullscreen");
+#endif
     ConfigSetDefaultBool(l_ConfigVideoGeneral, "VerticalSync", 0, "If true, activate the SDL_GL_SWAP_CONTROL attribute");
 
     ConfigSetDefaultInt(l_ConfigVideoRice, "FrameBufferSetting", FRM_BUF_NONE, "Frame Buffer Emulation (0=ROM default, 1=disable)");
@@ -430,8 +433,16 @@ static void ReadConfiguration(void)
     windowSetting.bDisplayFullscreen = ConfigGetParamBool(l_ConfigVideoGeneral, "Fullscreen");
     windowSetting.uDisplayWidth = ConfigGetParamInt(l_ConfigVideoGeneral, "ScreenWidth");
 #if 1
-	if (windowSetting.uDisplayWidth==800)
-		windowSetting.uDisplayWidth = 640;	// no strech
+	windowSetting.bDisplayRatio = true;
+	windowSetting.uDisplayX = 0;
+	windowSetting.uDisplayY = 0;
+    windowSetting.bDisplayRatio = ConfigGetParamBool(l_ConfigVideoGeneral, "AspectRatio");
+	if (windowSetting.bDisplayRatio) {
+		if (windowSetting.uDisplayWidth==800) {
+			windowSetting.uDisplayWidth = 640;	// no strech
+			windowSetting.uDisplayX = 80;
+		}
+	}
 #endif
     windowSetting.uDisplayHeight = ConfigGetParamInt(l_ConfigVideoGeneral, "ScreenHeight");
     windowSetting.bVerticalSync = ConfigGetParamBool(l_ConfigVideoGeneral, "VerticalSync");
@@ -465,7 +476,7 @@ static void ReadConfiguration(void)
 
     options.mipmapping = ConfigGetParamInt(l_ConfigVideoRice, "Mipmapping");
 	//*SEB* Force to 0 has other setting crash on the Pandora
-	options.mipmapping = 0;
+	options.mipmapping = TEXTURE_NO_MIPMAP;
     options.fogMethod = ConfigGetParamInt(l_ConfigVideoRice, "FogMethod");
     options.forceTextureFilter = ConfigGetParamInt(l_ConfigVideoRice, "ForceTextureFilter");
     options.textureEnhancement = ConfigGetParamInt(l_ConfigVideoRice, "TextureEnhancement");