GLES2N64: Enabled Framebuffer (and lowres) rendering

[mupen64plus-pandora.git] / source / gles2n64 / src / Config.cpp

diff --git a/source/gles2n64/src/Config.cpp b/source/gles2n64/src/Config.cpp
old mode 100644 (file)
new mode 100755 (executable)
index c34ff6c..99d3d69
--- a/source/gles2n64/src/Config.cpp
+++ b/source/gles2n64/src/Config.cpp
@@ -64,7 +64,7 @@ Option configOptions[] =
     {"", NULL, 0},
 
     {"#Framebuffer Settings:",NULL,0},
-//    {"framebuffer enable", &config.framebuffer.enable, 0},
+    {"framebuffer enable", &config.framebuffer.enable, 0},
     {"framebuffer bilinear", &config.framebuffer.bilinear, 0},
     {"framebuffer width", &config.framebuffer.width, 400},
     {"framebuffer height", &config.framebuffer.height, 240},
@@ -76,6 +76,7 @@ Option configOptions[] =
     {"video force", &config.video.force, 0},
     {"video width", &config.video.width, 320},
     {"video height", &config.video.height, 240},
+    {"video stretch", &config.stretchVideo, 0},
     {"", NULL, 0},
 
     {"#Render Settings:", NULL, 0},
@@ -98,8 +99,8 @@ Option configOptions[] =
     {"", NULL, 0},
 
     {"#Frame skip:", NULL, 0},
-    {"auto frameskip", &config.autoFrameSkip, 0},
-    {"max frameskip", &config.maxFrameSkip, 0},
+    {"auto frameskip", &config.autoFrameSkip, 1},
+    {"max frameskip", &config.maxFrameSkip, 3},
     {"target FPS", &config.targetFPS, 20},
     {"frame render rate", &config.frameRenderRate, 1},
     {"vertical sync", &config.verticalSync, 0},
@@ -120,7 +121,7 @@ Option configOptions[] =
     {"hack banjo tooie", &config.hackBanjoTooie, 0},
     {"hack zelda", &config.hackZelda, 0},
     {"hack alpha", &config.hackAlpha, 0},
-    {"hack z", &config.zHack, 0},
+    {"hack z", &config.zHack, 0}
 
 };
 
@@ -214,17 +215,20 @@ void Config_LoadRomConfig(unsigned char* header)
     }
 
     LOG(LOG_MINIMAL, "Rom is %s\n", config.romPAL ? "PAL" : "NTSC");
+printf("Rom is %s\n", config.romPAL ? "PAL" : "NTSC");
 
     const char *filename = ConfigGetSharedDataFilepath("gles2n64rom.conf");
     FILE *f = fopen(filename,"r");
     if (!f)
     {
         LOG(LOG_MINIMAL, "Could not find %s Rom settings file, using global.\n", filename);
+printf("Could not find %s Rom settings file, using global.\n", filename);
         return;
     }
     else
     {
         LOG(LOG_MINIMAL, "[gles2N64]: Searching %s Database for \"%s\" ROM\n", filename, config.romName);
+printf("[gles2N64]: Searching %s Database for \"%s\" ROM\n", filename, config.romName);
         bool isRom = false;
         while (!feof(f))
         {
@@ -249,6 +253,7 @@ void Config_LoadRomConfig(unsigned char* header)
                     *val++ = '\0';
                     Config_SetOption(line,val);
                     LOG(LOG_MINIMAL, "%s = %s", line, val);
+printf("%s = %s", line, val);
                 }
             }
         }
@@ -272,11 +277,14 @@ void Config_LoadConfig()
     {
         LOG(LOG_MINIMAL, "[gles2N64]: Couldn't open config file '%s' for reading: %s\n", filename, strerror( errno ) );
         LOG(LOG_MINIMAL, "[gles2N64]: Attempting to write new Config \n");
+printf("[gles2N64]: Couldn't open config file '%s' for reading: %s\n", filename, strerror( errno ) );
+printf("[gles2N64]: Attempting to write new Config \n");
         Config_WriteConfig(filename);
     }
     else
     {
         LOG(LOG_MINIMAL, "[gles2n64]: Loading Config from %s \n", filename);
+printf("[gles2n64]: Loading Config from %s \n", filename);
 
         while (!feof( f ))
         {
@@ -297,6 +305,7 @@ void Config_LoadConfig()
         if (config.version < CONFIG_VERSION)
         {
             LOG(LOG_WARNING, "[gles2N64]: Wrong config version, rewriting config with defaults\n");
+printf("[gles2N64]: Wrong config version, rewriting config with defaults\n");
             Config_SetDefault();
             Config_WriteConfig(filename);
         }