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

GSdx-ogl: GL4.1 program shader is optional 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5929 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2014-03-22 09:08:37 +00:00
parent d044147698
commit ba46b25e2f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/GSdx/GSWnd.cpp
View File

@ -45,7 +45,6 @@ void GSWndGL::PopulateGlFunction()
*(void**)&(gl_CompileShader) = GetProcAddress("glCompileShader"); *(void**)&(gl_CompileShader) = GetProcAddress("glCompileShader");
*(void**)&(gl_CreateProgram) = GetProcAddress("glCreateProgram"); *(void**)&(gl_CreateProgram) = GetProcAddress("glCreateProgram");
*(void**)&(gl_CreateShader) = GetProcAddress("glCreateShader"); *(void**)&(gl_CreateShader) = GetProcAddress("glCreateShader");
*(void**)&(gl_CreateShaderProgramv) = GetProcAddress("glCreateShaderProgramv");
*(void**)&(gl_DeleteBuffers) = GetProcAddress("glDeleteBuffers"); *(void**)&(gl_DeleteBuffers) = GetProcAddress("glDeleteBuffers");
*(void**)&(gl_DeleteFramebuffers) = GetProcAddress("glDeleteFramebuffers"); *(void**)&(gl_DeleteFramebuffers) = GetProcAddress("glDeleteFramebuffers");
*(void**)&(gl_DeleteProgram) = GetProcAddress("glDeleteProgram"); *(void**)&(gl_DeleteProgram) = GetProcAddress("glDeleteProgram");
@ -89,12 +88,13 @@ void GSWndGL::PopulateGlFunction()
// GL4.0 // GL4.0
*(void**)&(gl_UniformSubroutinesuiv) = GetProcAddress("glUniformSubroutinesuiv"); *(void**)&(gl_UniformSubroutinesuiv) = GetProcAddress("glUniformSubroutinesuiv");
// GL4.1 // GL4.1
*(void**)&(gl_BindProgramPipeline) = GetProcAddress("glBindProgramPipeline"); *(void**)&(gl_CreateShaderProgramv) = GetProcAddress("glCreateShaderProgramv", true);
*(void**)&(gl_DeleteProgramPipelines) = GetProcAddress("glDeleteProgramPipelines"); *(void**)&(gl_BindProgramPipeline) = GetProcAddress("glBindProgramPipeline", true);
*(void**)&(gl_GenProgramPipelines) = GetProcAddress("glGenProgramPipelines"); *(void**)&(gl_DeleteProgramPipelines) = GetProcAddress("glDeleteProgramPipelines", true);
*(void**)&(gl_GetProgramPipelineiv) = GetProcAddress("glGetProgramPipelineiv"); *(void**)&(gl_GenProgramPipelines) = GetProcAddress("glGenProgramPipelines", true);
*(void**)&(gl_GetProgramPipelineInfoLog) = GetProcAddress("glGetProgramPipelineInfoLog"); *(void**)&(gl_GetProgramPipelineiv) = GetProcAddress("glGetProgramPipelineiv", true);
*(void**)&(gl_ValidateProgramPipeline) = GetProcAddress("glValidateProgramPipeline"); *(void**)&(gl_GetProgramPipelineInfoLog) = GetProcAddress("glGetProgramPipelineInfoLog", true);
*(void**)&(gl_ValidateProgramPipeline) = GetProcAddress("glValidateProgramPipeline", true);
// NO GL4.1 // NO GL4.1
*(void**)&(gl_UseProgram) = GetProcAddress("glUseProgram"); *(void**)&(gl_UseProgram) = GetProcAddress("glUseProgram");
*(void**)&(gl_GetShaderInfoLog) = GetProcAddress("glGetShaderInfoLog"); *(void**)&(gl_GetShaderInfoLog) = GetProcAddress("glGetShaderInfoLog");