diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 9b4fdfbb0f..7ebe9b3b23 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -33,7 +33,7 @@ #define TEX2D GL_TEXTURE_2D #define PREC "highp" #define TEXTYPE "sampler2D" -#define TEXFUNC "texture" +#define TEXFUNC "texture2D" #else #define TEX2D GL_TEXTURE_RECTANGLE_ARB #define PREC diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp index 07947e0ee7..a6705a5236 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp @@ -23,36 +23,36 @@ SWVideoConfig g_SWVideoConfig; SWVideoConfig::SWVideoConfig() { - bFullscreen = false; - bHideCursor = false; - renderToMainframe = false; + bFullscreen = false; + bHideCursor = false; + renderToMainframe = false; bHwRasterizer = false; - bShowStats = false; + bShowStats = false; - bDumpTextures = false; - bDumpObjects = false; - bDumpFrames = false; + bDumpTextures = false; + bDumpObjects = false; + bDumpFrames = false; bZComploc = true; bZFreeze = true; - bDumpTevStages = false; + bDumpTevStages = false; bDumpTevTextureFetches = false; - drawStart = 0; - drawEnd = 100000; + drawStart = 0; + drawEnd = 100000; } void SWVideoConfig::Load(const char* ini_file) { - std::string temp; - IniFile iniFile; - iniFile.Load(ini_file); - - iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware - iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); + std::string temp; + IniFile iniFile; + iniFile.Load(ini_file); + + iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware + iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false); iniFile.Get("Rendering", "ZComploc", &bZComploc, true); @@ -72,11 +72,11 @@ void SWVideoConfig::Load(const char* ini_file) void SWVideoConfig::Save(const char* ini_file) { - IniFile iniFile; - iniFile.Load(ini_file); + IniFile iniFile; + iniFile.Load(ini_file); - iniFile.Set("Hardware", "Fullscreen", bFullscreen); - iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe); + iniFile.Set("Hardware", "Fullscreen", bFullscreen); + iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe); iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer); iniFile.Set("Rendering", "ZComploc", &bZComploc); @@ -92,7 +92,7 @@ void SWVideoConfig::Save(const char* ini_file) iniFile.Set("Misc", "DrawStart", drawStart); iniFile.Set("Misc", "DrawEnd", drawEnd); - - iniFile.Save(ini_file); + + iniFile.Save(ini_file); }