ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set GLES Tex2D function to texture2D, texture is only available in GLES3. Fix some tabs in the config file.

This commit is contained in:
Ryan Houdek 2013-03-18 07:49:46 +00:00
parent b512b23407
commit 12f5f102c7
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -33,7 +33,7 @@
#define TEX2D GL_TEXTURE_2D #define TEX2D GL_TEXTURE_2D
#define PREC "highp" #define PREC "highp"
#define TEXTYPE "sampler2D" #define TEXTYPE "sampler2D"
#define TEXFUNC "texture" #define TEXFUNC "texture2D"
#else #else
#define TEX2D GL_TEXTURE_RECTANGLE_ARB #define TEX2D GL_TEXTURE_RECTANGLE_ARB
#define PREC #define PREC

44
Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
View File

@ -23,36 +23,36 @@ SWVideoConfig g_SWVideoConfig;
SWVideoConfig::SWVideoConfig() SWVideoConfig::SWVideoConfig()
{ {
bFullscreen = false; bFullscreen = false;
bHideCursor = false; bHideCursor = false;
renderToMainframe = false; renderToMainframe = false;
bHwRasterizer = false; bHwRasterizer = false;
bShowStats = false; bShowStats = false;
bDumpTextures = false; bDumpTextures = false;
bDumpObjects = false; bDumpObjects = false;
bDumpFrames = false; bDumpFrames = false;
bZComploc = true; bZComploc = true;
bZFreeze = true; bZFreeze = true;
bDumpTevStages = false; bDumpTevStages = false;
bDumpTevTextureFetches = false; bDumpTevTextureFetches = false;
drawStart = 0; drawStart = 0;
drawEnd = 100000; drawEnd = 100000;
} }
void SWVideoConfig::Load(const char* ini_file) void SWVideoConfig::Load(const char* ini_file)
{ {
std::string temp; std::string temp;
IniFile iniFile; IniFile iniFile;
iniFile.Load(ini_file); iniFile.Load(ini_file);
iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware
iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false);
iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false); iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false);
iniFile.Get("Rendering", "ZComploc", &bZComploc, true); iniFile.Get("Rendering", "ZComploc", &bZComploc, true);
@ -72,11 +72,11 @@ void SWVideoConfig::Load(const char* ini_file)
void SWVideoConfig::Save(const char* ini_file) void SWVideoConfig::Save(const char* ini_file)
{ {
IniFile iniFile; IniFile iniFile;
iniFile.Load(ini_file); iniFile.Load(ini_file);
iniFile.Set("Hardware", "Fullscreen", bFullscreen); iniFile.Set("Hardware", "Fullscreen", bFullscreen);
iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe); iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe);
iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer); iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer);
iniFile.Set("Rendering", "ZComploc", &bZComploc); iniFile.Set("Rendering", "ZComploc", &bZComploc);
@ -92,7 +92,7 @@ void SWVideoConfig::Save(const char* ini_file)
iniFile.Set("Misc", "DrawStart", drawStart); iniFile.Set("Misc", "DrawStart", drawStart);
iniFile.Set("Misc", "DrawEnd", drawEnd); iniFile.Set("Misc", "DrawEnd", drawEnd);
iniFile.Save(ini_file); iniFile.Save(ini_file);
} }