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

This lets us see stuff with GLSL shaders. Just need to take care of some compile errors now.

This commit is contained in:
Ryan Houdek 2011-12-07 22:11:41 -06:00 committed by Sonicadvance1
parent 7cec31dbf3
commit 3160da1289
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
View File

@ -66,7 +66,6 @@ GLuint PixelShaderCache::GetColorMatrixProgram()
void PixelShaderCache::Init() void PixelShaderCache::Init()
{ {
glEnable(GL_FRAGMENT_PROGRAM_ARB);
ShaderEnabled = true; ShaderEnabled = true;
CurrentShader = 0; CurrentShader = 0;
last_entry = NULL; last_entry = NULL;
@ -87,6 +86,7 @@ void PixelShaderCache::Init()
pSetPSConstant4fv = SetCGPSConstant4fv; pSetPSConstant4fv = SetCGPSConstant4fv;
pSetMultiPSConstant4fv = SetMultiCGPSConstant4fv; pSetMultiPSConstant4fv = SetMultiCGPSConstant4fv;
pCompilePixelShader = CompileCGPixelShader; pCompilePixelShader = CompileCGPixelShader;
glEnable(GL_FRAGMENT_PROGRAM_ARB);
} }
glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, (GLint *)&s_nMaxPixelInstructions); glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, (GLint *)&s_nMaxPixelInstructions);

2
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
View File

@ -55,7 +55,6 @@ bool (*pCompileVertexShader)(VERTEXSHADER&, const char*);
void VertexShaderCache::Init() void VertexShaderCache::Init()
{ {
glEnable(GL_VERTEX_PROGRAM_ARB);
ShaderEnabled = true; ShaderEnabled = true;
CurrentShader = 0; CurrentShader = 0;
last_entry = NULL; last_entry = NULL;
@ -75,6 +74,7 @@ void VertexShaderCache::Init()
pSetMultiVSConstant4fv = SetMultiCGVSConstant4fv; pSetMultiVSConstant4fv = SetMultiCGVSConstant4fv;
pSetMultiVSConstant3fv = SetMultiCGVSConstant3fv; pSetMultiVSConstant3fv = SetMultiCGVSConstant3fv;
pCompileVertexShader = CompileCGVertexShader; pCompileVertexShader = CompileCGVertexShader;
glEnable(GL_VERTEX_PROGRAM_ARB);
} }
glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, (GLint *)&s_nMaxVertexInstructions); glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, (GLint *)&s_nMaxVertexInstructions);