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

gsdx ogl: rely on DSA API

This commit is contained in:
Gregory Hainaut 2016-04-07 22:55:56 +02:00
parent fb97de7f79
commit d533c393b2
5 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GLLoader.cpp
View File

@ -54,7 +54,6 @@ PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer = NUL
PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D = NULL;
PFNGLGENBUFFERSPROC glGenBuffers = NULL;
PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers = NULL;
PFNGLGENSAMPLERSPROC glGenSamplers = NULL;
PFNGLGENVERTEXARRAYSPROC glGenVertexArrays = NULL;
PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv = NULL;
PFNGLGETDEBUGMESSAGELOGARBPROC glGetDebugMessageLogARB = NULL;
@ -95,7 +94,6 @@ PFNGLGETINTEGER64VPROC glGetInteger64v = NUL
// GL4.0
// GL4.1
PFNGLBINDPROGRAMPIPELINEPROC glBindProgramPipeline = NULL;
PFNGLGENPROGRAMPIPELINESPROC glGenProgramPipelines = NULL;
PFNGLDELETEPROGRAMPIPELINESPROC glDeleteProgramPipelines = NULL;
PFNGLGETPROGRAMPIPELINEIVPROC glGetProgramPipelineiv = NULL;
PFNGLVALIDATEPROGRAMPIPELINEPROC glValidateProgramPipeline = NULL;

2
plugins/GSdx/GLLoader.h
View File

@ -229,7 +229,6 @@ extern PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer;
extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
extern PFNGLGENBUFFERSPROC glGenBuffers;
extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
extern PFNGLGENSAMPLERSPROC glGenSamplers;
extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
extern PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv;
extern PFNGLGETDEBUGMESSAGELOGARBPROC glGetDebugMessageLogARB;
@ -271,7 +270,6 @@ extern PFNGLGETINTEGER64VPROC glGetInteger64v;
// GL4.1
extern PFNGLBINDPROGRAMPIPELINEPROC glBindProgramPipeline;
extern PFNGLDELETEPROGRAMPIPELINESPROC glDeleteProgramPipelines;
extern PFNGLGENPROGRAMPIPELINESPROC glGenProgramPipelines;
extern PFNGLGETPROGRAMPIPELINEIVPROC glGetProgramPipelineiv;
extern PFNGLVALIDATEPROGRAMPIPELINEPROC glValidateProgramPipeline;
extern PFNGLGETPROGRAMPIPELINEINFOLOGPROC glGetProgramPipelineInfoLog;

2
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -619,7 +619,7 @@ GLuint GSDeviceOGL::CreateSampler(bool bilinear, bool tau, bool tav, bool aniso)
GL_PUSH("Create Sampler");
GLuint sampler;
glGenSamplers(1, &sampler);
glCreateSamplers(1, &sampler);
if (bilinear) {
glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

2
plugins/GSdx/GSShaderOGL.cpp
View File

@ -28,7 +28,7 @@ GSShaderOGL::GSShaderOGL(bool debug) :
m_debug_shader(debug)
{
m_single_prog.clear();
glGenProgramPipelines(1, &m_pipeline);
glCreateProgramPipelines(1, &m_pipeline);
glBindProgramPipeline(m_pipeline);
}

2
plugins/GSdx/GSWnd.cpp
View File

@ -60,7 +60,6 @@ void GSWndGL::PopulateGlFunction()
GL_EXT_LOAD(glFramebufferTexture2D);
GL_EXT_LOAD(glGenBuffers);
GL_EXT_LOAD(glGenFramebuffers);
GL_EXT_LOAD(glGenSamplers);
GL_EXT_LOAD(glGenVertexArrays);
GL_EXT_LOAD(glGetBufferParameteriv);
GL_EXT_LOAD(glGetDebugMessageLogARB);
@ -102,7 +101,6 @@ void GSWndGL::PopulateGlFunction()
GL_EXT_LOAD(glCreateShaderProgramv);
GL_EXT_LOAD(glBindProgramPipeline);
GL_EXT_LOAD(glDeleteProgramPipelines);
GL_EXT_LOAD(glGenProgramPipelines);
GL_EXT_LOAD(glGetProgramPipelineiv);
GL_EXT_LOAD(glGetProgramPipelineInfoLog);
GL_EXT_LOAD(glValidateProgramPipeline);