Set GLES Tex2D function to texture2D, texture is only available in GL…

…ES3. Fix some tabs in the config file.
dolphin-emu · Mar 18, 2013 · 12f5f10 · 12f5f10
1 parent b512b23
commit 12f5f10
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git 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
@@ -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);
 }