From 3a6246eae7feef35e2078b6b76caa7d770e8ae50 Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 12 Jan 2013 08:23:24 +0800 Subject: [PATCH 1/3] Add Disable G3D Log to ini , make default false --- Core/Config.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Core/Config.cpp b/Core/Config.cpp index 90640ad1f9..ba7a49e48c 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -66,6 +66,7 @@ void CConfig::Load(const char *iniFileName) graphics->Get("LinearFiltering", &bLinearFiltering, false); graphics->Get("SSAA", &SSAntiAlaising, 0); graphics->Get("VBO", &bUseVBO, true); + graphics->Get("DisableG3DLog", &bDisableG3DLog, false); IniFile::Section *sound = iniFile.GetOrCreateSection("Sound"); sound->Get("Enable", &bEnableSound, true); @@ -107,6 +108,7 @@ void CConfig::Save() graphics->Set("LinearFiltering", bLinearFiltering); graphics->Set("SSAA", SSAntiAlaising); graphics->Set("VBO", bUseVBO); + graphics->Set("DisableG3DLog", bDisableG3DLog); IniFile::Section *sound = iniFile.GetOrCreateSection("Sound"); sound->Set("Enable", bEnableSound); From 908e4ecabf4e693f606ce90286ea217665b3bfca Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 12 Jan 2013 08:24:05 +0800 Subject: [PATCH 2/3] Revert AB for HW transform until find a better fix --- GPU/GLES/VertexShaderGenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GLES/VertexShaderGenerator.cpp b/GPU/GLES/VertexShaderGenerator.cpp index e30608bdd2..5444be8489 100644 --- a/GPU/GLES/VertexShaderGenerator.cpp +++ b/GPU/GLES/VertexShaderGenerator.cpp @@ -338,7 +338,7 @@ void GenerateVertexShader(int prim, char *buffer) { if (hasColor) { WRITE(p, " v_color0 = a_color0;\n"); } else { - WRITE(p, " v_color0 += vec4(u_matambientalpha.rgb, 0.0);\n"); + WRITE(p, " v_color0 = u_matambientalpha;\n"); } if (lmode) WRITE(p, " v_color1 = vec3(0.0, 0.0, 0.0);\n"); From 113706ad495395d1ea7e8fa2f1368c3c8920dd6a Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 12 Jan 2013 14:45:28 +0800 Subject: [PATCH 3/3] Add UpdateMenus() to ID_OPTIONS_FULLSCREEN --- Windows/WndMainWindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 3bacff84fc..00cf2660b6 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -480,6 +480,7 @@ namespace MainWindow SetZoom(screenfactor); _ViewFullScreen(hWnd); } + UpdateMenus(); break; case ID_OPTIONS_WIREFRAME: