From f0182f9a66ca897d415de3f72fd3fe82bbca6c53 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 25 Apr 2015 01:32:09 +0200 Subject: [PATCH] windows requires APIENTRY (=> stdcall) --- plugins/GSdx/GLLoader.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/GSdx/GLLoader.cpp b/plugins/GSdx/GLLoader.cpp index a2e54a0314..a466f80888 100644 --- a/plugins/GSdx/GLLoader.cpp +++ b/plugins/GSdx/GLLoader.cpp @@ -147,31 +147,31 @@ PFNGLTEXTUREBARRIERPROC gl_TextureBarrier = NU #endif namespace Emulate_DSA { - void BindTextureUnit(GLuint unit, GLuint texture) { + void APIENTRY BindTextureUnit(GLuint unit, GLuint texture) { gl_ActiveTexture(GL_TEXTURE0 + unit); glBindTexture(GL_TEXTURE_2D, texture); } - void CreateTexture(GLenum target, GLsizei n, GLuint *textures) { + void APIENTRY CreateTexture(GLenum target, GLsizei n, GLuint *textures) { glGenTextures(1, textures); } - void TextureStorage(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) { + void APIENTRY TextureStorage(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) { BindTextureUnit(7, texture); gl_TexStorage2D(GL_TEXTURE_2D, levels, internalformat, width, height); } - void TextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels) { + void APIENTRY TextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels) { BindTextureUnit(7, texture); glTexSubImage2D(GL_TEXTURE_2D, level, xoffset, yoffset, width, height, format, type, pixels); } - void CopyTextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) { + void APIENTRY CopyTextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) { BindTextureUnit(7, texture); glCopyTexSubImage2D(GL_TEXTURE_2D, level, xoffset, yoffset, x, y, width, height); } - void GetTexureImage(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels) { + void APIENTRY GetTexureImage(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels) { BindTextureUnit(7, texture); glGetTexImage(GL_TEXTURE_2D, level, format, type, pixels); }