소스 검색

Added GLX_NV_copy_image extension, updated tools

Zachary Lund 11 년 전
부모
커밋
1dd3917745
6개의 변경된 파일225개의 추가작업 그리고 207개의 파일을 삭제
  1. 117 120
      libobs-opengl/GL/gl_obs.c
  2. 50 47
      libobs-opengl/GL/gl_obs.h
  3. 27 17
      libobs-opengl/GL/glx_obs.c
  4. 12 3
      libobs-opengl/GL/glx_obs.h
  5. 14 17
      libobs-opengl/GL/wgl_obs.c
  6. 5 3
      libobs-opengl/GL/wgl_obs.h

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 117 - 120
libobs-opengl/GL/gl_obs.c


+ 50 - 47
libobs-opengl/GL/gl_obs.h

@@ -1,3 +1,4 @@
+/* AUTOGENERATED BY glLoadGen, DO NOT EDIT */
 #ifndef POINTER_C_GENERATED_HEADER_OPENGL_H
 #define POINTER_C_GENERATED_HEADER_OPENGL_H
 
@@ -62,6 +63,8 @@
 #endif
 
 
+#define GL_LOAD_GEN_GL_VERSION 440
+
 #ifndef GL_LOAD_GEN_BASIC_OPENGL_TYPEDEFS
 #define GL_LOAD_GEN_BASIC_OPENGL_TYPEDEFS
 
@@ -6379,9 +6382,9 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glGenTransformFeedbacks)(GLsizei, GLuint *);
 #define glGenTransformFeedbacks _ptrc_glGenTransformFeedbacks
 extern GLboolean (CODEGEN_FUNCPTR *_ptrc_glIsTransformFeedback)(GLuint);
 #define glIsTransformFeedback _ptrc_glIsTransformFeedback
-extern void (CODEGEN_FUNCPTR *_ptrc_glPauseTransformFeedback)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glPauseTransformFeedback)(void);
 #define glPauseTransformFeedback _ptrc_glPauseTransformFeedback
-extern void (CODEGEN_FUNCPTR *_ptrc_glResumeTransformFeedback)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glResumeTransformFeedback)(void);
 #define glResumeTransformFeedback _ptrc_glResumeTransformFeedback
 #endif /*GL_ARB_transform_feedback2*/ 
 
@@ -6405,7 +6408,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glDepthRangef)(GLfloat, GLfloat);
 #define glDepthRangef _ptrc_glDepthRangef
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetShaderPrecisionFormat)(GLenum, GLenum, GLint *, GLint *);
 #define glGetShaderPrecisionFormat _ptrc_glGetShaderPrecisionFormat
-extern void (CODEGEN_FUNCPTR *_ptrc_glReleaseShaderCompiler)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glReleaseShaderCompiler)(void);
 #define glReleaseShaderCompiler _ptrc_glReleaseShaderCompiler
 extern void (CODEGEN_FUNCPTR *_ptrc_glShaderBinary)(GLsizei, const GLuint *, GLenum, const GLvoid *, GLsizei);
 #define glShaderBinary _ptrc_glShaderBinary
@@ -6666,7 +6669,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glObjectLabel)(GLenum, GLuint, GLsizei, cons
 #define glObjectLabel _ptrc_glObjectLabel
 extern void (CODEGEN_FUNCPTR *_ptrc_glObjectPtrLabel)(const void *, GLsizei, const GLchar *);
 #define glObjectPtrLabel _ptrc_glObjectPtrLabel
-extern void (CODEGEN_FUNCPTR *_ptrc_glPopDebugGroup)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glPopDebugGroup)(void);
 #define glPopDebugGroup _ptrc_glPopDebugGroup
 extern void (CODEGEN_FUNCPTR *_ptrc_glPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *);
 #define glPushDebugGroup _ptrc_glPushDebugGroup
@@ -7350,7 +7353,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glPointParameterfvARB)(GLenum, const GLfloat
 
 #ifndef GL_ARB_robustness
 #define GL_ARB_robustness 1
-extern GLenum (CODEGEN_FUNCPTR *_ptrc_glGetGraphicsResetStatusARB)();
+extern GLenum (CODEGEN_FUNCPTR *_ptrc_glGetGraphicsResetStatusARB)(void);
 #define glGetGraphicsResetStatusARB _ptrc_glGetGraphicsResetStatusARB
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetnColorTableARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *);
 #define glGetnColorTableARB _ptrc_glGetnColorTableARB
@@ -7409,7 +7412,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glAttachObjectARB)(GLhandleARB, GLhandleARB)
 #define glAttachObjectARB _ptrc_glAttachObjectARB
 extern void (CODEGEN_FUNCPTR *_ptrc_glCompileShaderARB)(GLhandleARB);
 #define glCompileShaderARB _ptrc_glCompileShaderARB
-extern GLhandleARB (CODEGEN_FUNCPTR *_ptrc_glCreateProgramObjectARB)();
+extern GLhandleARB (CODEGEN_FUNCPTR *_ptrc_glCreateProgramObjectARB)(void);
 #define glCreateProgramObjectARB _ptrc_glCreateProgramObjectARB
 extern GLhandleARB (CODEGEN_FUNCPTR *_ptrc_glCreateShaderObjectARB)(GLenum);
 #define glCreateShaderObjectARB _ptrc_glCreateShaderObjectARB
@@ -7827,7 +7830,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glAlphaFragmentOp2ATI)(GLenum, GLuint, GLuin
 #define glAlphaFragmentOp2ATI _ptrc_glAlphaFragmentOp2ATI
 extern void (CODEGEN_FUNCPTR *_ptrc_glAlphaFragmentOp3ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define glAlphaFragmentOp3ATI _ptrc_glAlphaFragmentOp3ATI
-extern void (CODEGEN_FUNCPTR *_ptrc_glBeginFragmentShaderATI)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glBeginFragmentShaderATI)(void);
 #define glBeginFragmentShaderATI _ptrc_glBeginFragmentShaderATI
 extern void (CODEGEN_FUNCPTR *_ptrc_glBindFragmentShaderATI)(GLuint);
 #define glBindFragmentShaderATI _ptrc_glBindFragmentShaderATI
@@ -7839,7 +7842,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glColorFragmentOp3ATI)(GLenum, GLuint, GLuin
 #define glColorFragmentOp3ATI _ptrc_glColorFragmentOp3ATI
 extern void (CODEGEN_FUNCPTR *_ptrc_glDeleteFragmentShaderATI)(GLuint);
 #define glDeleteFragmentShaderATI _ptrc_glDeleteFragmentShaderATI
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndFragmentShaderATI)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndFragmentShaderATI)(void);
 #define glEndFragmentShaderATI _ptrc_glEndFragmentShaderATI
 extern GLuint (CODEGEN_FUNCPTR *_ptrc_glGenFragmentShadersATI)(GLuint);
 #define glGenFragmentShadersATI _ptrc_glGenFragmentShadersATI
@@ -8066,7 +8069,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glCopyColorSubTableEXT)(GLenum, GLsizei, GLi
 #define GL_EXT_compiled_vertex_array 1
 extern void (CODEGEN_FUNCPTR *_ptrc_glLockArraysEXT)(GLint, GLsizei);
 #define glLockArraysEXT _ptrc_glLockArraysEXT
-extern void (CODEGEN_FUNCPTR *_ptrc_glUnlockArraysEXT)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glUnlockArraysEXT)(void);
 #define glUnlockArraysEXT _ptrc_glUnlockArraysEXT
 #endif /*GL_EXT_compiled_vertex_array*/ 
 
@@ -9108,7 +9111,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glBindBufferOffsetEXT)(GLenum, GLuint, GLuin
 #define glBindBufferOffsetEXT _ptrc_glBindBufferOffsetEXT
 extern void (CODEGEN_FUNCPTR *_ptrc_glBindBufferRangeEXT)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
 #define glBindBufferRangeEXT _ptrc_glBindBufferRangeEXT
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndTransformFeedbackEXT)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndTransformFeedbackEXT)(void);
 #define glEndTransformFeedbackEXT _ptrc_glEndTransformFeedbackEXT
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetTransformFeedbackVaryingEXT)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
 #define glGetTransformFeedbackVaryingEXT _ptrc_glGetTransformFeedbackVaryingEXT
@@ -9165,7 +9168,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glVertexAttribLPointerEXT)(GLuint, GLint, GL
 
 #ifndef GL_EXT_vertex_shader
 #define GL_EXT_vertex_shader 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glBeginVertexShaderEXT)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glBeginVertexShaderEXT)(void);
 #define glBeginVertexShaderEXT _ptrc_glBeginVertexShaderEXT
 extern GLuint (CODEGEN_FUNCPTR *_ptrc_glBindLightParameterEXT)(GLenum, GLenum);
 #define glBindLightParameterEXT _ptrc_glBindLightParameterEXT
@@ -9185,7 +9188,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glDisableVariantClientStateEXT)(GLuint);
 #define glDisableVariantClientStateEXT _ptrc_glDisableVariantClientStateEXT
 extern void (CODEGEN_FUNCPTR *_ptrc_glEnableVariantClientStateEXT)(GLuint);
 #define glEnableVariantClientStateEXT _ptrc_glEnableVariantClientStateEXT
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndVertexShaderEXT)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndVertexShaderEXT)(void);
 #define glEndVertexShaderEXT _ptrc_glEndVertexShaderEXT
 extern void (CODEGEN_FUNCPTR *_ptrc_glExtractComponentEXT)(GLuint, GLuint, GLuint);
 #define glExtractComponentEXT _ptrc_glExtractComponentEXT
@@ -9269,7 +9272,7 @@ extern GLsync (CODEGEN_FUNCPTR *_ptrc_glImportSyncEXT)(GLenum, GLintptr, GLbitfi
 
 #ifndef GL_GREMEDY_frame_terminator
 #define GL_GREMEDY_frame_terminator 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glFrameTerminatorGREMEDY)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glFrameTerminatorGREMEDY)(void);
 #define glFrameTerminatorGREMEDY _ptrc_glFrameTerminatorGREMEDY
 #endif /*GL_GREMEDY_frame_terminator*/ 
 
@@ -9370,7 +9373,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glVertexPointervINTEL)(GLint, GLenum, const
 
 #ifndef GL_MESA_resize_buffers
 #define GL_MESA_resize_buffers 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glResizeBuffersMESA)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glResizeBuffersMESA)(void);
 #define glResizeBuffersMESA _ptrc_glResizeBuffersMESA
 #endif /*GL_MESA_resize_buffers*/ 
 
@@ -9431,7 +9434,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glWindowPos4svMESA)(const GLshort *);
 #define GL_NVX_conditional_render 1
 extern void (CODEGEN_FUNCPTR *_ptrc_glBeginConditionalRenderNVX)(GLuint);
 #define glBeginConditionalRenderNVX _ptrc_glBeginConditionalRenderNVX
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndConditionalRenderNVX)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndConditionalRenderNVX)(void);
 #define glEndConditionalRenderNVX _ptrc_glEndConditionalRenderNVX
 #endif /*GL_NVX_conditional_render*/ 
 
@@ -9475,7 +9478,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glUniformHandleui64vNV)(GLint, GLsizei, cons
 
 #ifndef GL_NV_blend_equation_advanced
 #define GL_NV_blend_equation_advanced 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glBlendBarrierNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glBlendBarrierNV)(void);
 #define glBlendBarrierNV _ptrc_glBlendBarrierNV
 extern void (CODEGEN_FUNCPTR *_ptrc_glBlendParameteriNV)(GLenum, GLint);
 #define glBlendParameteriNV _ptrc_glBlendParameteriNV
@@ -9488,7 +9491,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glBlendParameteriNV)(GLenum, GLint);
 #define GL_NV_conditional_render 1
 extern void (CODEGEN_FUNCPTR *_ptrc_glBeginConditionalRenderNV)(GLuint, GLenum);
 #define glBeginConditionalRenderNV _ptrc_glBeginConditionalRenderNV
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndConditionalRenderNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndConditionalRenderNV)(void);
 #define glEndConditionalRenderNV _ptrc_glEndConditionalRenderNV
 #endif /*GL_NV_conditional_render*/ 
 
@@ -9827,7 +9830,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glBeginOcclusionQueryNV)(GLuint);
 #define glBeginOcclusionQueryNV _ptrc_glBeginOcclusionQueryNV
 extern void (CODEGEN_FUNCPTR *_ptrc_glDeleteOcclusionQueriesNV)(GLsizei, const GLuint *);
 #define glDeleteOcclusionQueriesNV _ptrc_glDeleteOcclusionQueriesNV
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndOcclusionQueryNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndOcclusionQueryNV)(void);
 #define glEndOcclusionQueryNV _ptrc_glEndOcclusionQueryNV
 extern void (CODEGEN_FUNCPTR *_ptrc_glGenOcclusionQueriesNV)(GLsizei, GLuint *);
 #define glGenOcclusionQueriesNV _ptrc_glGenOcclusionQueriesNV
@@ -9989,7 +9992,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glPresentFrameKeyedNV)(GLuint, GLuint64EXT,
 #define GL_NV_primitive_restart 1
 extern void (CODEGEN_FUNCPTR *_ptrc_glPrimitiveRestartIndexNV)(GLuint);
 #define glPrimitiveRestartIndexNV _ptrc_glPrimitiveRestartIndexNV
-extern void (CODEGEN_FUNCPTR *_ptrc_glPrimitiveRestartNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glPrimitiveRestartNV)(void);
 #define glPrimitiveRestartNV _ptrc_glPrimitiveRestartNV
 #endif /*GL_NV_primitive_restart*/ 
 
@@ -10072,7 +10075,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glUniformui64vNV)(GLint, GLsizei, const GLui
 
 #ifndef GL_NV_texture_barrier
 #define GL_NV_texture_barrier 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glTextureBarrierNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glTextureBarrierNV)(void);
 #define glTextureBarrierNV _ptrc_glTextureBarrierNV
 #endif /*GL_NV_texture_barrier*/ 
 
@@ -10111,7 +10114,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glBindBufferOffsetNV)(GLenum, GLuint, GLuint
 #define glBindBufferOffsetNV _ptrc_glBindBufferOffsetNV
 extern void (CODEGEN_FUNCPTR *_ptrc_glBindBufferRangeNV)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
 #define glBindBufferRangeNV _ptrc_glBindBufferRangeNV
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndTransformFeedbackNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndTransformFeedbackNV)(void);
 #define glEndTransformFeedbackNV _ptrc_glEndTransformFeedbackNV
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetActiveVaryingNV)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
 #define glGetActiveVaryingNV _ptrc_glGetActiveVaryingNV
@@ -10139,15 +10142,15 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glGenTransformFeedbacksNV)(GLsizei, GLuint *
 #define glGenTransformFeedbacksNV _ptrc_glGenTransformFeedbacksNV
 extern GLboolean (CODEGEN_FUNCPTR *_ptrc_glIsTransformFeedbackNV)(GLuint);
 #define glIsTransformFeedbackNV _ptrc_glIsTransformFeedbackNV
-extern void (CODEGEN_FUNCPTR *_ptrc_glPauseTransformFeedbackNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glPauseTransformFeedbackNV)(void);
 #define glPauseTransformFeedbackNV _ptrc_glPauseTransformFeedbackNV
-extern void (CODEGEN_FUNCPTR *_ptrc_glResumeTransformFeedbackNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glResumeTransformFeedbackNV)(void);
 #define glResumeTransformFeedbackNV _ptrc_glResumeTransformFeedbackNV
 #endif /*GL_NV_transform_feedback2*/ 
 
 #ifndef GL_NV_vdpau_interop
 #define GL_NV_vdpau_interop 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glVDPAUFiniNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glVDPAUFiniNV)(void);
 #define glVDPAUFiniNV _ptrc_glVDPAUFiniNV
 extern void (CODEGEN_FUNCPTR *_ptrc_glVDPAUGetSurfaceivNV)(GLvdpauSurfaceNV, GLenum, GLsizei, GLsizei *, GLint *);
 #define glVDPAUGetSurfaceivNV _ptrc_glVDPAUGetSurfaceivNV
@@ -10171,7 +10174,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glVDPAUUnregisterSurfaceNV)(GLvdpauSurfaceNV
 
 #ifndef GL_NV_vertex_array_range
 #define GL_NV_vertex_array_range 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glFlushVertexArrayRangeNV)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glFlushVertexArrayRangeNV)(void);
 #define glFlushVertexArrayRangeNV _ptrc_glFlushVertexArrayRangeNV
 extern void (CODEGEN_FUNCPTR *_ptrc_glVertexArrayRangeNV)(GLsizei, const GLvoid *);
 #define glVertexArrayRangeNV _ptrc_glVertexArrayRangeNV
@@ -10868,7 +10871,7 @@ extern GLint (CODEGEN_FUNCPTR *_ptrc_glPollAsyncSGIX)(GLuint *);
 
 #ifndef GL_SGIX_flush_raster
 #define GL_SGIX_flush_raster 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glFlushRasterSGIX)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glFlushRasterSGIX)(void);
 #define glFlushRasterSGIX _ptrc_glFlushRasterSGIX
 #endif /*GL_SGIX_flush_raster*/ 
 
@@ -10927,7 +10930,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glIglooInterfaceSGIX)(GLenum, const GLvoid *
 
 #ifndef GL_SGIX_instruments
 #define GL_SGIX_instruments 1
-extern GLint (CODEGEN_FUNCPTR *_ptrc_glGetInstrumentsSGIX)();
+extern GLint (CODEGEN_FUNCPTR *_ptrc_glGetInstrumentsSGIX)(void);
 #define glGetInstrumentsSGIX _ptrc_glGetInstrumentsSGIX
 extern void (CODEGEN_FUNCPTR *_ptrc_glInstrumentsBufferSGIX)(GLsizei, GLint *);
 #define glInstrumentsBufferSGIX _ptrc_glInstrumentsBufferSGIX
@@ -10935,7 +10938,7 @@ extern GLint (CODEGEN_FUNCPTR *_ptrc_glPollInstrumentsSGIX)(GLint *);
 #define glPollInstrumentsSGIX _ptrc_glPollInstrumentsSGIX
 extern void (CODEGEN_FUNCPTR *_ptrc_glReadInstrumentsSGIX)(GLint);
 #define glReadInstrumentsSGIX _ptrc_glReadInstrumentsSGIX
-extern void (CODEGEN_FUNCPTR *_ptrc_glStartInstrumentsSGIX)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glStartInstrumentsSGIX)(void);
 #define glStartInstrumentsSGIX _ptrc_glStartInstrumentsSGIX
 extern void (CODEGEN_FUNCPTR *_ptrc_glStopInstrumentsSGIX)(GLint);
 #define glStopInstrumentsSGIX _ptrc_glStopInstrumentsSGIX
@@ -11003,7 +11006,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glSpriteParameterivSGIX)(GLenum, const GLint
 
 #ifndef GL_SGIX_tag_sample_buffer
 #define GL_SGIX_tag_sample_buffer 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glTagSampleBufferSGIX)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glTagSampleBufferSGIX)(void);
 #define glTagSampleBufferSGIX _ptrc_glTagSampleBufferSGIX
 #endif /*GL_SGIX_tag_sample_buffer*/ 
 
@@ -11038,7 +11041,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glGetColorTableSGI)(GLenum, GLenum, GLenum,
 
 #ifndef GL_SUNX_constant_data
 #define GL_SUNX_constant_data 1
-extern void (CODEGEN_FUNCPTR *_ptrc_glFinishTextureSUNX)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glFinishTextureSUNX)(void);
 #define glFinishTextureSUNX _ptrc_glFinishTextureSUNX
 #endif /*GL_SUNX_constant_data*/ 
 
@@ -11200,9 +11203,9 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glDrawBuffer)(GLenum);
 #define glDrawBuffer _ptrc_glDrawBuffer
 extern void (CODEGEN_FUNCPTR *_ptrc_glEnable)(GLenum);
 #define glEnable _ptrc_glEnable
-extern void (CODEGEN_FUNCPTR *_ptrc_glFinish)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glFinish)(void);
 #define glFinish _ptrc_glFinish
-extern void (CODEGEN_FUNCPTR *_ptrc_glFlush)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glFlush)(void);
 #define glFlush _ptrc_glFlush
 extern void (CODEGEN_FUNCPTR *_ptrc_glFrontFace)(GLenum);
 #define glFrontFace _ptrc_glFrontFace
@@ -11210,7 +11213,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glGetBooleanv)(GLenum, GLboolean *);
 #define glGetBooleanv _ptrc_glGetBooleanv
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetDoublev)(GLenum, GLdouble *);
 #define glGetDoublev _ptrc_glGetDoublev
-extern GLenum (CODEGEN_FUNCPTR *_ptrc_glGetError)();
+extern GLenum (CODEGEN_FUNCPTR *_ptrc_glGetError)(void);
 #define glGetError _ptrc_glGetError
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetFloatv)(GLenum, GLfloat *);
 #define glGetFloatv _ptrc_glGetFloatv
@@ -11394,7 +11397,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glBlendEquationSeparate)(GLenum, GLenum);
 #define glBlendEquationSeparate _ptrc_glBlendEquationSeparate
 extern void (CODEGEN_FUNCPTR *_ptrc_glCompileShader)(GLuint);
 #define glCompileShader _ptrc_glCompileShader
-extern GLuint (CODEGEN_FUNCPTR *_ptrc_glCreateProgram)();
+extern GLuint (CODEGEN_FUNCPTR *_ptrc_glCreateProgram)(void);
 #define glCreateProgram _ptrc_glCreateProgram
 extern GLuint (CODEGEN_FUNCPTR *_ptrc_glCreateShader)(GLenum);
 #define glCreateShader _ptrc_glCreateShader
@@ -11628,9 +11631,9 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glDisablei)(GLenum, GLuint);
 #define glDisablei _ptrc_glDisablei
 extern void (CODEGEN_FUNCPTR *_ptrc_glEnablei)(GLenum, GLuint);
 #define glEnablei _ptrc_glEnablei
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndConditionalRender)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndConditionalRender)(void);
 #define glEndConditionalRender _ptrc_glEndConditionalRender
-extern void (CODEGEN_FUNCPTR *_ptrc_glEndTransformFeedback)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glEndTransformFeedback)(void);
 #define glEndTransformFeedback _ptrc_glEndTransformFeedback
 extern void (CODEGEN_FUNCPTR *_ptrc_glFlushMappedBufferRange)(GLenum, GLintptr, GLsizeiptr);
 #define glFlushMappedBufferRange _ptrc_glFlushMappedBufferRange
@@ -11988,9 +11991,9 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glPatchParameterfv)(GLenum, const GLfloat *)
 #define glPatchParameterfv _ptrc_glPatchParameterfv
 extern void (CODEGEN_FUNCPTR *_ptrc_glPatchParameteri)(GLenum, GLint);
 #define glPatchParameteri _ptrc_glPatchParameteri
-extern void (CODEGEN_FUNCPTR *_ptrc_glPauseTransformFeedback)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glPauseTransformFeedback)(void);
 #define glPauseTransformFeedback _ptrc_glPauseTransformFeedback
-extern void (CODEGEN_FUNCPTR *_ptrc_glResumeTransformFeedback)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glResumeTransformFeedback)(void);
 #define glResumeTransformFeedback _ptrc_glResumeTransformFeedback
 extern void (CODEGEN_FUNCPTR *_ptrc_glUniform1d)(GLint, GLdouble);
 #define glUniform1d _ptrc_glUniform1d
@@ -12167,7 +12170,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glProgramUniformMatrix4x3dv)(GLuint, GLint,
 #define glProgramUniformMatrix4x3dv _ptrc_glProgramUniformMatrix4x3dv
 extern void (CODEGEN_FUNCPTR *_ptrc_glProgramUniformMatrix4x3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
 #define glProgramUniformMatrix4x3fv _ptrc_glProgramUniformMatrix4x3fv
-extern void (CODEGEN_FUNCPTR *_ptrc_glReleaseShaderCompiler)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glReleaseShaderCompiler)(void);
 #define glReleaseShaderCompiler _ptrc_glReleaseShaderCompiler
 extern void (CODEGEN_FUNCPTR *_ptrc_glScissorArrayv)(GLuint, GLsizei, const GLint *);
 #define glScissorArrayv _ptrc_glScissorArrayv
@@ -12220,8 +12223,6 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glDrawTransformFeedbackStreamInstanced)(GLen
 #define glDrawTransformFeedbackStreamInstanced _ptrc_glDrawTransformFeedbackStreamInstanced
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetActiveAtomicCounterBufferiv)(GLuint, GLuint, GLenum, GLint *);
 #define glGetActiveAtomicCounterBufferiv _ptrc_glGetActiveAtomicCounterBufferiv
-extern void (CODEGEN_FUNCPTR *_ptrc_glGetInternalformati64v)(GLenum, GLenum, GLenum, GLsizei, GLint64 *);
-#define glGetInternalformati64v _ptrc_glGetInternalformati64v
 extern void (CODEGEN_FUNCPTR *_ptrc_glMemoryBarrier)(GLbitfield);
 #define glMemoryBarrier _ptrc_glMemoryBarrier
 extern void (CODEGEN_FUNCPTR *_ptrc_glTexStorage1D)(GLenum, GLsizei, GLenum, GLsizei);
@@ -12255,6 +12256,8 @@ extern GLuint (CODEGEN_FUNCPTR *_ptrc_glGetDebugMessageLog)(GLuint, GLsizei, GLe
 #define glGetDebugMessageLog _ptrc_glGetDebugMessageLog
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetFramebufferParameteriv)(GLenum, GLenum, GLint *);
 #define glGetFramebufferParameteriv _ptrc_glGetFramebufferParameteriv
+extern void (CODEGEN_FUNCPTR *_ptrc_glGetInternalformati64v)(GLenum, GLenum, GLenum, GLsizei, GLint64 *);
+#define glGetInternalformati64v _ptrc_glGetInternalformati64v
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetObjectLabel)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *);
 #define glGetObjectLabel _ptrc_glGetObjectLabel
 extern void (CODEGEN_FUNCPTR *_ptrc_glGetObjectPtrLabel)(const void *, GLsizei, GLsizei *, GLchar *);
@@ -12291,7 +12294,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glObjectLabel)(GLenum, GLuint, GLsizei, cons
 #define glObjectLabel _ptrc_glObjectLabel
 extern void (CODEGEN_FUNCPTR *_ptrc_glObjectPtrLabel)(const void *, GLsizei, const GLchar *);
 #define glObjectPtrLabel _ptrc_glObjectPtrLabel
-extern void (CODEGEN_FUNCPTR *_ptrc_glPopDebugGroup)();
+extern void (CODEGEN_FUNCPTR *_ptrc_glPopDebugGroup)(void);
 #define glPopDebugGroup _ptrc_glPopDebugGroup
 extern void (CODEGEN_FUNCPTR *_ptrc_glPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *);
 #define glPushDebugGroup _ptrc_glPushDebugGroup
@@ -12338,17 +12341,17 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glClearTexSubImage)(GLuint, GLint, GLint, GL
 enum ogl_LoadStatus
 {
 	ogl_LOAD_FAILED = 0,
-	ogl_LOAD_SUCCEEDED = 1,
+	ogl_LOAD_SUCCEEDED = 1
 };
 
-int ogl_LoadFunctions();
+int ogl_LoadFunctions(void);
 
-int ogl_GetMinorVersion();
-int ogl_GetMajorVersion();
+int ogl_GetMinorVersion(void);
+int ogl_GetMajorVersion(void);
 int ogl_IsVersionGEQ(int majorVersion, int minorVersion);
 
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/
 
-#endif //POINTER_C_GENERATED_HEADER_OPENGL_H
+#endif /* POINTER_C_GENERATED_HEADER_OPENGL_H */

+ 27 - 17
libobs-opengl/GL/glx_obs.c

@@ -1,3 +1,4 @@
+/* AUTOGENERATED BY glLoadGen, DO NOT EDIT */
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
@@ -44,17 +45,14 @@ static PROC WinGetProcAddress(const char *name)
 
 /* Linux, FreeBSD, other */
 #ifndef IntGetProcAddress
-	#ifndef GLX_ARB_get_proc_address
-	#define GLX_ARB_get_proc_address 1
-
-	typedef void (*__GLXextFuncPtr)(void);
-	extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
-
-	#endif /* GLX_ARB_get_proc_address */
+	extern void ( * glXGetProcAddressARB (const GLubyte *procName)) (void);
 
 	#define IntGetProcAddress(name) (*glXGetProcAddressARB)((const GLubyte*)name)
 #endif
 
+/* TODO: Need to eventually use eglGetProcAddress */
+
+int glx_ext_NV_copy_image = glx_LOAD_FAILED;
 int glx_ext_ARB_create_context = glx_LOAD_FAILED;
 int glx_ext_ARB_create_context_profile = glx_LOAD_FAILED;
 int glx_ext_ARB_create_context_robustness = glx_LOAD_FAILED;
@@ -68,9 +66,19 @@ int glx_ext_EXT_import_context = glx_LOAD_FAILED;
 int glx_ext_EXT_swap_control = glx_LOAD_FAILED;
 int glx_ext_EXT_swap_control_tear = glx_LOAD_FAILED;
 
+void (CODEGEN_FUNCPTR *_ptrc_glXCopyImageSubDataNV)(Display *, GLXContext, GLuint, GLenum, GLint, GLint, GLint, GLint, GLXContext, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei) = NULL;
+
+static int Load_NV_copy_image(void)
+{
+	int numFailed = 0;
+	_ptrc_glXCopyImageSubDataNV = (void (CODEGEN_FUNCPTR *)(Display *, GLXContext, GLuint, GLenum, GLint, GLint, GLint, GLint, GLXContext, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei))IntGetProcAddress("glXCopyImageSubDataNV");
+	if(!_ptrc_glXCopyImageSubDataNV) numFailed++;
+	return numFailed;
+}
+
 GLXContext (CODEGEN_FUNCPTR *_ptrc_glXCreateContextAttribsARB)(Display *, GLXFBConfig, GLXContext, Bool, const int *) = NULL;
 
-static int Load_ARB_create_context()
+static int Load_ARB_create_context(void)
 {
 	int numFailed = 0;
 	_ptrc_glXCreateContextAttribsARB = (GLXContext (CODEGEN_FUNCPTR *)(Display *, GLXFBConfig, GLXContext, Bool, const int *))IntGetProcAddress("glXCreateContextAttribsARB");
@@ -80,18 +88,18 @@ static int Load_ARB_create_context()
 
 void (CODEGEN_FUNCPTR *_ptrc_glXFreeContextEXT)(Display *, GLXContext) = NULL;
 GLXContextID (CODEGEN_FUNCPTR *_ptrc_glXGetContextIDEXT)(const GLXContext) = NULL;
-Display * (CODEGEN_FUNCPTR *_ptrc_glXGetCurrentDisplayEXT)() = NULL;
+Display * (CODEGEN_FUNCPTR *_ptrc_glXGetCurrentDisplayEXT)(void) = NULL;
 GLXContext (CODEGEN_FUNCPTR *_ptrc_glXImportContextEXT)(Display *, GLXContextID) = NULL;
 int (CODEGEN_FUNCPTR *_ptrc_glXQueryContextInfoEXT)(Display *, GLXContext, int, int *) = NULL;
 
-static int Load_EXT_import_context()
+static int Load_EXT_import_context(void)
 {
 	int numFailed = 0;
 	_ptrc_glXFreeContextEXT = (void (CODEGEN_FUNCPTR *)(Display *, GLXContext))IntGetProcAddress("glXFreeContextEXT");
 	if(!_ptrc_glXFreeContextEXT) numFailed++;
 	_ptrc_glXGetContextIDEXT = (GLXContextID (CODEGEN_FUNCPTR *)(const GLXContext))IntGetProcAddress("glXGetContextIDEXT");
 	if(!_ptrc_glXGetContextIDEXT) numFailed++;
-	_ptrc_glXGetCurrentDisplayEXT = (Display * (CODEGEN_FUNCPTR *)())IntGetProcAddress("glXGetCurrentDisplayEXT");
+	_ptrc_glXGetCurrentDisplayEXT = (Display * (CODEGEN_FUNCPTR *)(void))IntGetProcAddress("glXGetCurrentDisplayEXT");
 	if(!_ptrc_glXGetCurrentDisplayEXT) numFailed++;
 	_ptrc_glXImportContextEXT = (GLXContext (CODEGEN_FUNCPTR *)(Display *, GLXContextID))IntGetProcAddress("glXImportContextEXT");
 	if(!_ptrc_glXImportContextEXT) numFailed++;
@@ -102,7 +110,7 @@ static int Load_EXT_import_context()
 
 void (CODEGEN_FUNCPTR *_ptrc_glXSwapIntervalEXT)(Display *, GLXDrawable, int) = NULL;
 
-static int Load_EXT_swap_control()
+static int Load_EXT_swap_control(void)
 {
 	int numFailed = 0;
 	_ptrc_glXSwapIntervalEXT = (void (CODEGEN_FUNCPTR *)(Display *, GLXDrawable, int))IntGetProcAddress("glXSwapIntervalEXT");
@@ -110,15 +118,16 @@ static int Load_EXT_swap_control()
 	return numFailed;
 }
 
-typedef int (*PFN_LOADFUNCPOINTERS)();
+typedef int (*PFN_LOADFUNCPOINTERS)(void);
 typedef struct glx_StrToExtMap_s
 {
-	char *extensionName;
+	const char *extensionName;
 	int *extensionVariable;
 	PFN_LOADFUNCPOINTERS LoadExtension;
 } glx_StrToExtMap;
 
-static glx_StrToExtMap ExtensionMap[12] = {
+static glx_StrToExtMap ExtensionMap[13] = {
+	{"GLX_NV_copy_image", &glx_ext_NV_copy_image, Load_NV_copy_image},
 	{"GLX_ARB_create_context", &glx_ext_ARB_create_context, Load_ARB_create_context},
 	{"GLX_ARB_create_context_profile", &glx_ext_ARB_create_context_profile, NULL},
 	{"GLX_ARB_create_context_robustness", &glx_ext_ARB_create_context_robustness, NULL},
@@ -133,7 +142,7 @@ static glx_StrToExtMap ExtensionMap[12] = {
 	{"GLX_EXT_swap_control_tear", &glx_ext_EXT_swap_control_tear, NULL},
 };
 
-static int g_extensionMapSize = 12;
+static int g_extensionMapSize = 13;
 
 static glx_StrToExtMap *FindExtEntry(const char *extensionName)
 {
@@ -148,8 +157,9 @@ static glx_StrToExtMap *FindExtEntry(const char *extensionName)
 	return NULL;
 }
 
-static void ClearExtensionVars()
+static void ClearExtensionVars(void)
 {
+	glx_ext_NV_copy_image = glx_LOAD_FAILED;
 	glx_ext_ARB_create_context = glx_LOAD_FAILED;
 	glx_ext_ARB_create_context_profile = glx_LOAD_FAILED;
 	glx_ext_ARB_create_context_robustness = glx_LOAD_FAILED;

+ 12 - 3
libobs-opengl/GL/glx_obs.h

@@ -1,3 +1,4 @@
+/* AUTOGENERATED BY glLoadGen, DO NOT EDIT */
 #ifndef POINTER_C_GENERATED_HEADER_GLXWIN_H
 #define POINTER_C_GENERATED_HEADER_GLXWIN_H
 
@@ -37,6 +38,7 @@ typedef double GLclampd;
 #endif /*GL_LOAD_GEN_BASIC_OPENGL_TYPEDEFS*/
 
 
+
 #ifndef GL_LOAD_GEN_BASIC_OPENGL_TYPEDEFS
 #define GL_LOAD_GEN_BASIC_OPENGL_TYPEDEFS
 
@@ -117,6 +119,7 @@ typedef unsigned __int64 uint64_t;
 extern "C" {
 #endif /*__cplusplus*/
 
+extern int glx_ext_NV_copy_image;
 extern int glx_ext_ARB_create_context;
 extern int glx_ext_ARB_create_context_profile;
 extern int glx_ext_ARB_create_context_robustness;
@@ -169,6 +172,12 @@ extern int glx_ext_EXT_swap_control_tear;
 
 #define GLX_LATE_SWAPS_TEAR_EXT 0x20F3
 
+#ifndef GLX_NV_copy_image
+#define GLX_NV_copy_image 1
+extern void (CODEGEN_FUNCPTR *_ptrc_glXCopyImageSubDataNV)(Display *, GLXContext, GLuint, GLenum, GLint, GLint, GLint, GLint, GLXContext, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei);
+#define glXCopyImageSubDataNV _ptrc_glXCopyImageSubDataNV
+#endif /*GLX_NV_copy_image*/ 
+
 #ifndef GLX_ARB_create_context
 #define GLX_ARB_create_context 1
 extern GLXContext (CODEGEN_FUNCPTR *_ptrc_glXCreateContextAttribsARB)(Display *, GLXFBConfig, GLXContext, Bool, const int *);
@@ -189,7 +198,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glXFreeContextEXT)(Display *, GLXContext);
 #define glXFreeContextEXT _ptrc_glXFreeContextEXT
 extern GLXContextID (CODEGEN_FUNCPTR *_ptrc_glXGetContextIDEXT)(const GLXContext);
 #define glXGetContextIDEXT _ptrc_glXGetContextIDEXT
-extern Display * (CODEGEN_FUNCPTR *_ptrc_glXGetCurrentDisplayEXT)();
+extern Display * (CODEGEN_FUNCPTR *_ptrc_glXGetCurrentDisplayEXT)(void);
 #define glXGetCurrentDisplayEXT _ptrc_glXGetCurrentDisplayEXT
 extern GLXContext (CODEGEN_FUNCPTR *_ptrc_glXImportContextEXT)(Display *, GLXContextID);
 #define glXImportContextEXT _ptrc_glXImportContextEXT
@@ -207,7 +216,7 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glXSwapIntervalEXT)(Display *, GLXDrawable,
 enum glx_LoadStatus
 {
 	glx_LOAD_FAILED = 0,
-	glx_LOAD_SUCCEEDED = 1,
+	glx_LOAD_SUCCEEDED = 1
 };
 
 int glx_LoadFunctions(Display *display, int screen);
@@ -217,4 +226,4 @@ int glx_LoadFunctions(Display *display, int screen);
 }
 #endif /*__cplusplus*/
 
-#endif //POINTER_C_GENERATED_HEADER_GLXWIN_H
+#endif /* POINTER_C_GENERATED_HEADER_GLXWIN_H */

+ 14 - 17
libobs-opengl/GL/wgl_obs.c

@@ -1,3 +1,4 @@
+/* AUTOGENERATED BY glLoadGen, DO NOT EDIT */
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
@@ -44,17 +45,13 @@ static PROC WinGetProcAddress(const char *name)
 
 /* Linux, FreeBSD, other */
 #ifndef IntGetProcAddress
-	#ifndef GLX_ARB_get_proc_address
-	#define GLX_ARB_get_proc_address 1
-
-	typedef void (*__GLXextFuncPtr)(void);
-	extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
-
-	#endif /* GLX_ARB_get_proc_address */
+	extern void ( * glXGetProcAddressARB (const GLubyte *procName)) (void);
 
 	#define IntGetProcAddress(name) (*glXGetProcAddressARB)((const GLubyte*)name)
 #endif
 
+/* TODO: Need to eventually use eglGetProcAddress */
+
 int wgl_ext_ARB_multisample = wgl_LOAD_FAILED;
 int wgl_ext_ARB_extensions_string = wgl_LOAD_FAILED;
 int wgl_ext_ARB_pixel_format = wgl_LOAD_FAILED;
@@ -71,7 +68,7 @@ int wgl_ext_NV_swap_group = wgl_LOAD_FAILED;
 
 const char * (CODEGEN_FUNCPTR *_ptrc_wglGetExtensionsStringARB)(HDC) = NULL;
 
-static int Load_ARB_extensions_string()
+static int Load_ARB_extensions_string(void)
 {
 	int numFailed = 0;
 	_ptrc_wglGetExtensionsStringARB = (const char * (CODEGEN_FUNCPTR *)(HDC))IntGetProcAddress("wglGetExtensionsStringARB");
@@ -83,7 +80,7 @@ BOOL (CODEGEN_FUNCPTR *_ptrc_wglChoosePixelFormatARB)(HDC, const int *, const FL
 BOOL (CODEGEN_FUNCPTR *_ptrc_wglGetPixelFormatAttribfvARB)(HDC, int, int, UINT, const int *, FLOAT *) = NULL;
 BOOL (CODEGEN_FUNCPTR *_ptrc_wglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const int *, int *) = NULL;
 
-static int Load_ARB_pixel_format()
+static int Load_ARB_pixel_format(void)
 {
 	int numFailed = 0;
 	_ptrc_wglChoosePixelFormatARB = (BOOL (CODEGEN_FUNCPTR *)(HDC, const int *, const FLOAT *, UINT, int *, UINT *))IntGetProcAddress("wglChoosePixelFormatARB");
@@ -97,7 +94,7 @@ static int Load_ARB_pixel_format()
 
 HGLRC (CODEGEN_FUNCPTR *_ptrc_wglCreateContextAttribsARB)(HDC, HGLRC, const int *) = NULL;
 
-static int Load_ARB_create_context()
+static int Load_ARB_create_context(void)
 {
 	int numFailed = 0;
 	_ptrc_wglCreateContextAttribsARB = (HGLRC (CODEGEN_FUNCPTR *)(HDC, HGLRC, const int *))IntGetProcAddress("wglCreateContextAttribsARB");
@@ -105,13 +102,13 @@ static int Load_ARB_create_context()
 	return numFailed;
 }
 
-int (CODEGEN_FUNCPTR *_ptrc_wglGetSwapIntervalEXT)() = NULL;
+int (CODEGEN_FUNCPTR *_ptrc_wglGetSwapIntervalEXT)(void) = NULL;
 BOOL (CODEGEN_FUNCPTR *_ptrc_wglSwapIntervalEXT)(int) = NULL;
 
-static int Load_EXT_swap_control()
+static int Load_EXT_swap_control(void)
 {
 	int numFailed = 0;
-	_ptrc_wglGetSwapIntervalEXT = (int (CODEGEN_FUNCPTR *)())IntGetProcAddress("wglGetSwapIntervalEXT");
+	_ptrc_wglGetSwapIntervalEXT = (int (CODEGEN_FUNCPTR *)(void))IntGetProcAddress("wglGetSwapIntervalEXT");
 	if(!_ptrc_wglGetSwapIntervalEXT) numFailed++;
 	_ptrc_wglSwapIntervalEXT = (BOOL (CODEGEN_FUNCPTR *)(int))IntGetProcAddress("wglSwapIntervalEXT");
 	if(!_ptrc_wglSwapIntervalEXT) numFailed++;
@@ -125,7 +122,7 @@ BOOL (CODEGEN_FUNCPTR *_ptrc_wglQueryMaxSwapGroupsNV)(HDC, GLuint *, GLuint *) =
 BOOL (CODEGEN_FUNCPTR *_ptrc_wglQuerySwapGroupNV)(HDC, GLuint *, GLuint *) = NULL;
 BOOL (CODEGEN_FUNCPTR *_ptrc_wglResetFrameCountNV)(HDC) = NULL;
 
-static int Load_NV_swap_group()
+static int Load_NV_swap_group(void)
 {
 	int numFailed = 0;
 	_ptrc_wglBindSwapBarrierNV = (BOOL (CODEGEN_FUNCPTR *)(GLuint, GLuint))IntGetProcAddress("wglBindSwapBarrierNV");
@@ -143,10 +140,10 @@ static int Load_NV_swap_group()
 	return numFailed;
 }
 
-typedef int (*PFN_LOADFUNCPOINTERS)();
+typedef int (*PFN_LOADFUNCPOINTERS)(void);
 typedef struct wgl_StrToExtMap_s
 {
-	char *extensionName;
+	const char *extensionName;
 	int *extensionVariable;
 	PFN_LOADFUNCPOINTERS LoadExtension;
 } wgl_StrToExtMap;
@@ -182,7 +179,7 @@ static wgl_StrToExtMap *FindExtEntry(const char *extensionName)
 	return NULL;
 }
 
-static void ClearExtensionVars()
+static void ClearExtensionVars(void)
 {
 	wgl_ext_ARB_multisample = wgl_LOAD_FAILED;
 	wgl_ext_ARB_extensions_string = wgl_LOAD_FAILED;

+ 5 - 3
libobs-opengl/GL/wgl_obs.h

@@ -1,3 +1,4 @@
+/* AUTOGENERATED BY glLoadGen, DO NOT EDIT */
 #ifndef POINTER_C_GENERATED_HEADER_WINDOWSGL_H
 #define POINTER_C_GENERATED_HEADER_WINDOWSGL_H
 
@@ -42,6 +43,7 @@ typedef double GLclampd;
 #endif /*GL_LOAD_GEN_BASIC_OPENGL_TYPEDEFS*/
 
 
+
 #ifndef GL_LOAD_GEN_BASIC_OPENGL_TYPEDEFS
 #define GL_LOAD_GEN_BASIC_OPENGL_TYPEDEFS
 
@@ -190,7 +192,7 @@ extern HGLRC (CODEGEN_FUNCPTR *_ptrc_wglCreateContextAttribsARB)(HDC, HGLRC, con
 
 #ifndef WGL_EXT_swap_control
 #define WGL_EXT_swap_control 1
-extern int (CODEGEN_FUNCPTR *_ptrc_wglGetSwapIntervalEXT)();
+extern int (CODEGEN_FUNCPTR *_ptrc_wglGetSwapIntervalEXT)(void);
 #define wglGetSwapIntervalEXT _ptrc_wglGetSwapIntervalEXT
 extern BOOL (CODEGEN_FUNCPTR *_ptrc_wglSwapIntervalEXT)(int);
 #define wglSwapIntervalEXT _ptrc_wglSwapIntervalEXT
@@ -218,7 +220,7 @@ extern BOOL (CODEGEN_FUNCPTR *_ptrc_wglResetFrameCountNV)(HDC);
 enum wgl_LoadStatus
 {
 	wgl_LOAD_FAILED = 0,
-	wgl_LOAD_SUCCEEDED = 1,
+	wgl_LOAD_SUCCEEDED = 1
 };
 
 int wgl_LoadFunctions(HDC hdc);
@@ -228,4 +230,4 @@ int wgl_LoadFunctions(HDC hdc);
 }
 #endif /*__cplusplus*/
 
-#endif //POINTER_C_GENERATED_HEADER_WINDOWSGL_H
+#endif /* POINTER_C_GENERATED_HEADER_WINDOWSGL_H */

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.