From d533c393b20d1218778f57c2923fc706f894e621 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Thu, 7 Apr 2016 22:55:56 +0200 Subject: [PATCH] gsdx ogl: rely on DSA API --- plugins/GSdx/GLLoader.cpp | 2 -- plugins/GSdx/GLLoader.h | 2 -- plugins/GSdx/GSDeviceOGL.cpp | 2 +- plugins/GSdx/GSShaderOGL.cpp | 2 +- plugins/GSdx/GSWnd.cpp | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/GSdx/GLLoader.cpp b/plugins/GSdx/GLLoader.cpp index 14637fdabe..79b43a5c0f 100644 --- a/plugins/GSdx/GLLoader.cpp +++ b/plugins/GSdx/GLLoader.cpp @@ -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; diff --git a/plugins/GSdx/GLLoader.h b/plugins/GSdx/GLLoader.h index 7a5a22db39..adb49a5290 100644 --- a/plugins/GSdx/GLLoader.h +++ b/plugins/GSdx/GLLoader.h @@ -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; diff --git a/plugins/GSdx/GSDeviceOGL.cpp b/plugins/GSdx/GSDeviceOGL.cpp index e82195df04..7213b36a13 100644 --- a/plugins/GSdx/GSDeviceOGL.cpp +++ b/plugins/GSdx/GSDeviceOGL.cpp @@ -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); diff --git a/plugins/GSdx/GSShaderOGL.cpp b/plugins/GSdx/GSShaderOGL.cpp index 34494e1edc..46660ca72c 100644 --- a/plugins/GSdx/GSShaderOGL.cpp +++ b/plugins/GSdx/GSShaderOGL.cpp @@ -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); } diff --git a/plugins/GSdx/GSWnd.cpp b/plugins/GSdx/GSWnd.cpp index 117589c864..749df02ed8 100644 --- a/plugins/GSdx/GSWnd.cpp +++ b/plugins/GSdx/GSWnd.cpp @@ -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);