From f3c0c1bb88d87f3bb8689f58aa4beabf50e82b06 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Thu, 25 Jun 2015 10:25:24 +0200 Subject: [PATCH] gsdx-ogl: TexParamami is provided in core --- plugins/GSdx/GLLoader.cpp | 3 +-- plugins/GSdx/GLLoader.h | 7 ------- plugins/GSdx/GSWnd.cpp | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/GSdx/GLLoader.cpp b/plugins/GSdx/GLLoader.cpp index 88d721b825..5ec466c622 100644 --- a/plugins/GSdx/GLLoader.cpp +++ b/plugins/GSdx/GLLoader.cpp @@ -86,7 +86,6 @@ PFNGLCLIENTWAITSYNCPROC gl_ClientWaitSync = NU PFNGLFLUSHMAPPEDBUFFERRANGEPROC gl_FlushMappedBufferRange = NULL; PFNGLBLENDEQUATIONSEPARATEPROC gl_BlendEquationSeparate = NULL; PFNGLBLENDFUNCSEPARATEPROC gl_BlendFuncSeparate = NULL; -PFNGLTEXPARAMETERIPROC gl_TexParameteri = NULL; // GL4.0 PFNGLUNIFORMSUBROUTINESUIVPROC gl_UniformSubroutinesuiv = NULL; // GL4.1 @@ -186,7 +185,7 @@ namespace Emulate_DSA { void APIENTRY TextureParameteri (GLuint texture, GLenum pname, GLint param) { BindTextureUnit(7, texture); - gl_TexParameteri(GL_TEXTURE_2D, pname, param); + glTexParameteri(GL_TEXTURE_2D, pname, param); } // Framebuffer entry point diff --git a/plugins/GSdx/GLLoader.h b/plugins/GSdx/GLLoader.h index 98c9dc86e6..4ca96cd61a 100644 --- a/plugins/GSdx/GLLoader.h +++ b/plugins/GSdx/GLLoader.h @@ -205,12 +205,6 @@ typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC) (void); typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels); #endif /* GL_VERSION_4_5 */ -// only exist in glcorearb.h -#ifndef PFNGLTEXPARAMETERIPROC -typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); -#endif - - extern PFNGLACTIVETEXTUREPROC gl_ActiveTexture; extern PFNGLBLENDCOLORPROC gl_BlendColor; extern PFNGLATTACHSHADERPROC gl_AttachShader; @@ -275,7 +269,6 @@ extern PFNGLCLIENTWAITSYNCPROC gl_ClientWaitSync; extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC gl_FlushMappedBufferRange; extern PFNGLBLENDEQUATIONSEPARATEPROC gl_BlendEquationSeparate; extern PFNGLBLENDFUNCSEPARATEPROC gl_BlendFuncSeparate; -extern PFNGLTEXPARAMETERIPROC gl_TexParameteri; // GL4.0 extern PFNGLUNIFORMSUBROUTINESUIVPROC gl_UniformSubroutinesuiv; // GL4.1 diff --git a/plugins/GSdx/GSWnd.cpp b/plugins/GSdx/GSWnd.cpp index ce59497761..d92a2ec519 100644 --- a/plugins/GSdx/GSWnd.cpp +++ b/plugins/GSdx/GSWnd.cpp @@ -79,7 +79,6 @@ void GSWndGL::PopulateGlFunction() *(void**)&(gl_DeleteSync) = GetProcAddress("glDeleteSync"); *(void**)&(gl_ClientWaitSync) = GetProcAddress("glClientWaitSync"); *(void**)&(gl_FlushMappedBufferRange) = GetProcAddress("glFlushMappedBufferRange"); - *(void**)&(gl_TexParameteri) = GetProcAddress("glTexParameteri"); // GL4.0 *(void**)&(gl_UniformSubroutinesuiv) = GetProcAddress("glUniformSubroutinesuiv", true); *(void**)&(gl_BlendEquationSeparateiARB) = GetProcAddress("glBlendEquationSeparateiARB", true);