diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-28 06:23:02 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-28 10:00:59 +0530 |
commit | 7e6764e304a472077e06701e9547245698716e68 (patch) | |
tree | a3077832f9b6da160a68a74d95db016aae803626 | |
parent | 111eb088fbaba7001eb055630b1f702ef5ccfa21 (diff) | |
download | gstreamer-plugins-bad-7e6764e304a472077e06701e9547245698716e68.tar.gz |
gstgl: Re-enable WINAPI on _MSC_VER
The calling convention may be deprecated, but we still need it for
OpenGL. The build issue was caused by an incorrect syntax being used for
the WINAPI (__stdcall) prototype in function pointers which was accepted
by GCC but is rejected by MSVC.
-rw-r--r-- | gst-libs/gst/gl/gstglapi.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglshader.c | 24 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglsl_private.h | 24 |
3 files changed, 25 insertions, 25 deletions
diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index fd8d9a648..308892002 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -76,7 +76,7 @@ #pragma GCC diagnostic pop #endif -#if defined(WINAPI) && !defined(_MSC_VER) +#if defined(WINAPI) #define GSTGLAPI WINAPI #else #define GSTGLAPI diff --git a/gst-libs/gst/gl/gstglshader.c b/gst-libs/gst/gl/gstglshader.c index 9f092369a..c16130800 100644 --- a/gst-libs/gst/gl/gstglshader.c +++ b/gst-libs/gst/gl/gstglshader.c @@ -48,22 +48,22 @@ typedef struct _GstGLShaderVTable { - GLuint GSTGLAPI (*CreateProgram) (void); - void GSTGLAPI (*DeleteProgram) (GLuint program); - void GSTGLAPI (*UseProgram) (GLuint program); - void GSTGLAPI (*GetAttachedShaders) (GLuint program, GLsizei maxcount, + GLuint (GSTGLAPI *CreateProgram) (void); + void (GSTGLAPI *DeleteProgram) (GLuint program); + void (GSTGLAPI *UseProgram) (GLuint program); + void (GSTGLAPI *GetAttachedShaders) (GLuint program, GLsizei maxcount, GLsizei * count, GLuint * shaders); - GLuint GSTGLAPI (*CreateShader) (GLenum shaderType); - void GSTGLAPI (*DeleteShader) (GLuint shader); - void GSTGLAPI (*AttachShader) (GLuint program, GLuint shader); - void GSTGLAPI (*DetachShader) (GLuint program, GLuint shader); + GLuint (GSTGLAPI *CreateShader) (GLenum shaderType); + void (GSTGLAPI *DeleteShader) (GLuint shader); + void (GSTGLAPI *AttachShader) (GLuint program, GLuint shader); + void (GSTGLAPI *DetachShader) (GLuint program, GLuint shader); - void GSTGLAPI (*GetShaderiv) (GLuint program, GLenum pname, GLint * params); - void GSTGLAPI (*GetProgramiv) (GLuint program, GLenum pname, GLint * params); - void GSTGLAPI (*GetShaderInfoLog) (GLuint shader, GLsizei maxLength, + void (GSTGLAPI *GetShaderiv) (GLuint program, GLenum pname, GLint * params); + void (GSTGLAPI *GetProgramiv) (GLuint program, GLenum pname, GLint * params); + void (GSTGLAPI *GetShaderInfoLog) (GLuint shader, GLsizei maxLength, GLsizei * length, char *log); - void GSTGLAPI (*GetProgramInfoLog) (GLuint shader, GLsizei maxLength, + void (GSTGLAPI *GetProgramInfoLog) (GLuint shader, GLsizei maxLength, GLsizei * length, char *log); } GstGLShaderVTable; diff --git a/gst-libs/gst/gl/gstglsl_private.h b/gst-libs/gst/gl/gstglsl_private.h index 755170dfa..08addeb8c 100644 --- a/gst-libs/gst/gl/gstglsl_private.h +++ b/gst-libs/gst/gl/gstglsl_private.h @@ -36,22 +36,22 @@ typedef struct _GstGLSLFuncs { gboolean initialized; - GLuint GSTGLAPI (*CreateProgram) (void); - void GSTGLAPI (*DeleteProgram) (GLuint program); - void GSTGLAPI (*UseProgram) (GLuint program); - void GSTGLAPI (*GetAttachedShaders) (GLuint program, GLsizei maxcount, + GLuint (GSTGLAPI *CreateProgram) (void); + void (GSTGLAPI *DeleteProgram) (GLuint program); + void (GSTGLAPI *UseProgram) (GLuint program); + void (GSTGLAPI *GetAttachedShaders) (GLuint program, GLsizei maxcount, GLsizei * count, GLuint * shaders); - GLuint GSTGLAPI (*CreateShader) (GLenum shaderType); - void GSTGLAPI (*DeleteShader) (GLuint shader); - void GSTGLAPI (*AttachShader) (GLuint program, GLuint shader); - void GSTGLAPI (*DetachShader) (GLuint program, GLuint shader); + GLuint (GSTGLAPI *CreateShader) (GLenum shaderType); + void (GSTGLAPI *DeleteShader) (GLuint shader); + void (GSTGLAPI *AttachShader) (GLuint program, GLuint shader); + void (GSTGLAPI *DetachShader) (GLuint program, GLuint shader); - void GSTGLAPI (*GetShaderiv) (GLuint program, GLenum pname, GLint * params); - void GSTGLAPI (*GetProgramiv) (GLuint program, GLenum pname, GLint * params); - void GSTGLAPI (*GetShaderInfoLog) (GLuint shader, GLsizei maxLength, + void (GSTGLAPI *GetShaderiv) (GLuint program, GLenum pname, GLint * params); + void (GSTGLAPI *GetProgramiv) (GLuint program, GLenum pname, GLint * params); + void (GSTGLAPI *GetShaderInfoLog) (GLuint shader, GLsizei maxLength, GLsizei * length, char *log); - void GSTGLAPI (*GetProgramInfoLog) (GLuint shader, GLsizei maxLength, + void (GSTGLAPI *GetProgramInfoLog) (GLuint shader, GLsizei maxLength, GLsizei * length, char *log); } GstGLSLFuncs; |