From 7403278d95051a554e2cbec3fafdde8ce9c6d200 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Aug 2013 12:16:17 +0200 Subject: Synchronised files Updated to latest gl specs --- xorg-server/hw/xwin/glx/genheaders.py | 15 +- xorg-server/hw/xwin/glx/gl.xml | 720 ++++++++++++++++++++++++++++++++-- xorg-server/hw/xwin/glx/makefile | 14 +- xorg-server/hw/xwin/glx/reg.py | 8 +- xorg-server/hw/xwin/glx/wglext.h | 62 +-- 5 files changed, 754 insertions(+), 65 deletions(-) (limited to 'xorg-server/hw') diff --git a/xorg-server/hw/xwin/glx/genheaders.py b/xorg-server/hw/xwin/glx/genheaders.py index 61be85156..3fa16ea36 100644 --- a/xorg-server/hw/xwin/glx/genheaders.py +++ b/xorg-server/hw/xwin/glx/genheaders.py @@ -274,6 +274,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GL_GLEXT_PROTOTYPES', apicall = 'GLAPI ', apientry = 'APIENTRY ', apientryp = 'APIENTRYP '), @@ -292,6 +293,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GL_GLEXT_PROTOTYPES', apicall = 'GLAPI ', apientry = 'APIENTRY ', apientryp = 'APIENTRYP '), @@ -310,6 +312,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GL_GLEXT_PROTOTYPES', apicall = 'GL_API ', apientry = 'GL_APIENTRY ', apientryp = 'GL_APIENTRYP '), @@ -328,6 +331,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GL_GLEXT_PROTOTYPES', apicall = 'GL_API ', apientry = 'GL_APIENTRY ', apientryp = 'GL_APIENTRYP '), @@ -346,6 +350,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GL_GLEXT_PROTOTYPES', apicall = 'GL_APICALL ', apientry = 'GL_APIENTRY ', apientryp = 'GL_APIENTRYP '), @@ -364,6 +369,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GL_GLEXT_PROTOTYPES', apicall = 'GL_APICALL ', apientry = 'GL_APIENTRY ', apientryp = 'GL_APIENTRYP '), @@ -382,6 +388,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GL_GLEXT_PROTOTYPES', apicall = 'GL_APICALL ', apientry = 'GL_APIENTRY ', apientryp = 'GL_APIENTRYP '), @@ -400,6 +407,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'EGL_EGLEXT_PROTOTYPES', apicall = 'EGLAPI ', apientry = 'EGLAPIENTRY ', apientryp = 'EGLAPIENTRYP '), @@ -414,10 +422,11 @@ buildList = [ addExtensions = None, removeExtensions = None, prefixText = prefixStrings + eglPlatformStrings + eglextVersionStrings, - genFuncPointers = False, + genFuncPointers = True, protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'EGL_EGLEXT_PROTOTYPES', apicall = 'EGLAPI ', apientry = 'EGLAPIENTRY ', apientryp = 'EGLAPIENTRYP '), @@ -437,6 +446,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GLX_GLXEXT_PROTOTYPES', apicall = '', apientry = '', apientryp = ' *'), @@ -456,6 +466,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'GLX_GLXEXT_PROTOTYPES', apicall = '', apientry = '', apientryp = ' *'), @@ -474,6 +485,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'WGL_WGLEXT_PROTOTYPES', apicall = '', apientry = 'WINAPI ', apientryp = 'WINAPI * '), @@ -492,6 +504,7 @@ buildList = [ protectFile = protectFile, protectFeature = protectFeature, protectProto = protectProto, + protectProtoStr = 'WGL_WGLEXT_PROTOTYPES', apicall = '', apientry = 'WINAPI ', apientryp = 'WINAPI * '), diff --git a/xorg-server/hw/xwin/glx/gl.xml b/xorg-server/hw/xwin/glx/gl.xml index 47d32b9d0..c33041fe3 100644 --- a/xorg-server/hw/xwin/glx/gl.xml +++ b/xorg-server/hw/xwin/glx/gl.xml @@ -1293,12 +1293,16 @@ typedef unsigned int GLhandleARB; + + + + @@ -1366,6 +1370,7 @@ typedef unsigned int GLhandleARB; + @@ -1374,6 +1379,7 @@ typedef unsigned int GLhandleARB; + @@ -2047,6 +2053,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -2076,6 +2086,8 @@ typedef unsigned int GLhandleARB; + + @@ -2298,6 +2310,7 @@ typedef unsigned int GLhandleARB; + @@ -2718,6 +2731,7 @@ typedef unsigned int GLhandleARB; + @@ -3120,6 +3134,7 @@ typedef unsigned int GLhandleARB; + @@ -3340,7 +3355,8 @@ typedef unsigned int GLhandleARB; - + + @@ -3659,7 +3675,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -3909,7 +3927,7 @@ typedef unsigned int GLhandleARB; - + @@ -5044,6 +5062,7 @@ typedef unsigned int GLhandleARB; + @@ -7294,6 +7313,7 @@ typedef unsigned int GLhandleARB; + @@ -7428,15 +7448,25 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + @@ -7445,13 +7475,18 @@ typedef unsigned int GLhandleARB; - + + + + + + @@ -7500,7 +7535,58 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7589,7 +7675,16 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + @@ -8094,6 +8189,22 @@ typedef unsigned int GLhandleARB; GLsizeiptr size + + void glBindBuffersBase + GLenum target + GLuint first + GLsizei count + const GLuint *buffers + + + void glBindBuffersRange + GLenum target + GLuint first + GLsizei count + const GLuint *buffers + const GLintptr *offsets + const GLsizeiptr *sizes + void glBindFragDataLocation GLuint program @@ -8155,6 +8266,12 @@ typedef unsigned int GLhandleARB; GLenum access GLint format + + void glBindImageTextures + GLuint first + GLsizei count + const GLuint *textures + GLuint glBindLightParameterEXT GLenum light @@ -8218,6 +8335,12 @@ typedef unsigned int GLhandleARB; GLuint unit GLuint sampler + + void glBindSamplers + GLuint first + GLsizei count + const GLuint *samplers + GLuint glBindTexGenParameterEXT GLenum unit @@ -8242,6 +8365,12 @@ typedef unsigned int GLhandleARB; GLenum unit GLenum value + + void glBindTextures + GLuint first + GLsizei count + const GLuint *textures + void glBindTransformFeedback GLenum target @@ -8273,6 +8402,14 @@ typedef unsigned int GLhandleARB; GLintptr offset GLsizei stride + + void glBindVertexBuffers + GLuint first + GLsizei count + const GLuint *buffers + const GLintptr *offsets + const GLsizei *strides + void glBindVertexShaderEXT GLuint id @@ -8554,6 +8691,14 @@ typedef unsigned int GLhandleARB; GLenum dst + + void glBlendParameteriNV + GLenum pname + GLint value + + + void glBlendBarrierNV + void glBlitFramebuffer GLint srcX0 @@ -8637,6 +8782,13 @@ typedef unsigned int GLhandleARB; GLenum pname GLint param + + void glBufferStorage + GLenum target + GLsizeiptr size + const void *data + GLbitfield flags + void glBufferSubData GLenum target @@ -8854,6 +9006,28 @@ typedef unsigned int GLhandleARB; GLint s + + void glClearTexImage + GLuint texture + GLint level + GLenum format + GLenum type + const void *data + + + void glClearTexSubImage + GLuint texture + GLint level + GLint xoffset + GLint yoffset + GLint zoffset + GLsizei width + GLsizei height + GLsizei depth + GLenum format + GLenum type + const void *data + void glClientActiveTexture GLenum texture @@ -8883,6 +9057,11 @@ typedef unsigned int GLhandleARB; GLbitfield flags GLuint64 timeout + + void glClipControlARB + GLenum origin + GLenum depth + void glClipPlane GLenum plane @@ -10969,6 +11148,15 @@ typedef unsigned int GLhandleARB; GLuint num_groups_y GLuint num_groups_z + + void glDispatchComputeGroupSizeARB + GLuint num_groups_x + GLuint num_groups_y + GLuint num_groups_z + GLuint group_size_x + GLuint group_size_y + GLuint group_size_z + void glDispatchComputeIndirect GLintptr indirect @@ -13239,6 +13427,14 @@ typedef unsigned int GLhandleARB; GLenum pname GLfixed *params + + GLuint64 glGetImageHandleARB + GLuint texture + GLint level + GLboolean layered + GLint layer + GLenum format + GLuint64 glGetImageHandleNV GLuint texture @@ -14714,6 +14910,10 @@ typedef unsigned int GLhandleARB; GLenum pname GLfixed *params + + GLuint64 glGetTextureHandleARB + GLuint texture + GLuint64 glGetTextureHandleNV GLuint texture @@ -14771,6 +14971,11 @@ typedef unsigned int GLhandleARB; GLenum pname GLint *params + + GLuint64 glGetTextureSamplerHandleARB + GLuint texture + GLuint sampler + GLuint64 glGetTextureSamplerHandleNV GLuint texture @@ -15038,6 +15243,12 @@ typedef unsigned int GLhandleARB; GLenum pname GLint64EXT *params + + void glGetVertexAttribLui64vARB + GLuint index + GLenum pname + GLuint64EXT *params + void glGetVertexAttribLui64vNV GLuint index @@ -15659,6 +15870,10 @@ typedef unsigned int GLhandleARB; GLboolean glIsFramebufferOES GLuint framebuffer + + GLboolean glIsImageHandleResidentARB + GLuint64 handle + GLboolean glIsImageHandleResidentNV GLuint64 handle @@ -15787,6 +16002,10 @@ typedef unsigned int GLhandleARB; GLuint texture + + GLboolean glIsTextureHandleResidentARB + GLuint64 handle + GLboolean glIsTextureHandleResidentNV GLuint64 handle @@ -16077,10 +16296,19 @@ typedef unsigned int GLhandleARB; GLenum target GLenum access + + void glMakeImageHandleNonResidentARB + GLuint64 handle + void glMakeImageHandleNonResidentNV GLuint64 handle + + void glMakeImageHandleResidentARB + GLuint64 handle + GLenum access + void glMakeImageHandleResidentNV GLuint64 handle @@ -16095,10 +16323,18 @@ typedef unsigned int GLhandleARB; GLuint buffer GLenum access + + void glMakeTextureHandleNonResidentARB + GLuint64 handle + void glMakeTextureHandleNonResidentNV GLuint64 handle + + void glMakeTextureHandleResidentARB + GLuint64 handle + void glMakeTextureHandleResidentNV GLuint64 handle @@ -16656,6 +16892,31 @@ typedef unsigned int GLhandleARB; GLsizei stride + + void glMultiDrawArraysIndirectBindlessNV + GLenum mode + const GLvoid *indirect + GLsizei drawCount + GLsizei stride + GLint vertexBufferCount + + + void glMultiDrawElementsIndirectBindlessNV + GLenum mode + GLenum type + const GLvoid *indirect + GLsizei drawCount + GLsizei stride + GLint vertexBufferCount + + + void glMultiDrawArraysIndirectCountARB + GLenum mode + GLintptr indirect + GLintptr drawcount + GLsizei maxdrawcount + GLsizei stride + void glMultiDrawElementArrayAPPLE GLenum mode @@ -16706,6 +16967,15 @@ typedef unsigned int GLhandleARB; GLsizei stride + + void glMultiDrawElementsIndirectCountARB + GLenum mode + GLenum type + GLintptr indirect + GLintptr drawcount + GLsizei maxdrawcount + GLsizei stride + void glMultiDrawRangeElementArrayAPPLE GLenum mode @@ -17623,6 +17893,13 @@ typedef unsigned int GLhandleARB; const GLvoid *data GLenum usage + + void glNamedBufferStorageEXT + GLuint buffer + GLsizeiptr size + const void *data + GLbitfield flags + void glNamedBufferSubDataEXT GLuint buffer @@ -19631,12 +19908,25 @@ typedef unsigned int GLhandleARB; const GLuint *value + + void glProgramUniformHandleui64ARB + GLuint program + GLint location + GLuint64 value + void glProgramUniformHandleui64NV GLuint program GLint location GLuint64 value + + void glProgramUniformHandleui64vARB + GLuint program + GLint location + GLsizei count + const GLuint64 *values + void glProgramUniformHandleui64vNV GLuint program @@ -22264,6 +22554,18 @@ typedef unsigned int GLhandleARB; const GLvoid *pixels + + void glTexPageCommitmentARB + GLenum target + GLint level + GLint xoffset + GLint yoffset + GLint zoffset + GLsizei width + GLsizei height + GLsizei depth + GLboolean resident + void glTexParameterIiv GLenum target @@ -22665,6 +22967,19 @@ typedef unsigned int GLhandleARB; void glTextureNormalEXT GLenum mode + + void glTexturePageCommitmentEXT + GLuint texture + GLenum target + GLint level + GLint xoffset + GLint yoffset + GLint zoffset + GLsizei width + GLsizei height + GLsizei depth + GLboolean resident + void glTextureParameterIivEXT GLuint texture @@ -23393,11 +23708,22 @@ typedef unsigned int GLhandleARB; GLint location GLuint buffer + + void glUniformHandleui64ARB + GLint location + GLuint64 value + void glUniformHandleui64NV GLint location GLuint64 value + + void glUniformHandleui64vARB + GLint location + GLsizei count + const GLuint64 *value + void glUniformHandleui64vNV GLint location @@ -25287,11 +25613,21 @@ typedef unsigned int GLhandleARB; GLuint index const GLint64EXT *v + + void glVertexAttribL1ui64ARB + GLuint index + GLuint64EXT x + void glVertexAttribL1ui64NV GLuint index GLuint64EXT x + + void glVertexAttribL1ui64vARB + GLuint index + const GLuint64EXT *v + void glVertexAttribL1ui64vNV GLuint index @@ -27395,8 +27731,6 @@ typedef unsigned int GLhandleARB; - - @@ -27636,6 +27970,19 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + @@ -29781,7 +30128,7 @@ typedef unsigned int GLhandleARB; - + @@ -29894,6 +30241,7 @@ typedef unsigned int GLhandleARB; + @@ -30220,6 +30568,58 @@ typedef unsigned int GLhandleARB; --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -31731,6 +32131,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -32134,6 +32538,27 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + @@ -32145,6 +32570,20 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + @@ -32158,6 +32597,13 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -32208,6 +32654,15 @@ typedef unsigned int GLhandleARB; + + + + + + + + + @@ -32329,6 +32784,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -32695,6 +33158,8 @@ typedef unsigned int GLhandleARB; + + @@ -32795,6 +33260,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -32973,6 +33446,16 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + @@ -33181,6 +33664,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -33254,6 +33745,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -33365,6 +33861,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -33611,6 +34111,22 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + @@ -33853,6 +34369,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -33938,6 +34459,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -34383,9 +34910,76 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -35289,7 +35883,7 @@ typedef unsigned int GLhandleARB; - + @@ -35369,15 +35963,15 @@ typedef unsigned int GLhandleARB; - + - + - + @@ -35396,19 +35990,19 @@ typedef unsigned int GLhandleARB; - + - + - + - + @@ -35416,9 +36010,12 @@ typedef unsigned int GLhandleARB; - + + + + @@ -35437,7 +36034,6 @@ typedef unsigned int GLhandleARB; - @@ -37133,6 +37729,7 @@ typedef unsigned int GLhandleARB; + @@ -37184,6 +37781,7 @@ typedef unsigned int GLhandleARB; + @@ -37309,6 +37907,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -37326,6 +37930,68 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37699,6 +38365,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -38484,11 +39154,6 @@ typedef unsigned int GLhandleARB; - - - - - @@ -38500,6 +39165,13 @@ typedef unsigned int GLhandleARB; + + + + + + + diff --git a/xorg-server/hw/xwin/glx/makefile b/xorg-server/hw/xwin/glx/makefile index 30b4ab3cb..3b0413312 100644 --- a/xorg-server/hw/xwin/glx/makefile +++ b/xorg-server/hw/xwin/glx/makefile @@ -20,19 +20,19 @@ CSRCS = \ .PHONY: getspecfiles getspecfiles: - -del wglext.h + del -e wglext.h wget http://www.opengl.org/registry/api/GL/wglext.h - -del glxext.h + del -e glxext.h wget http://www.opengl.org/registry/api/GL/glxext.h - -del glext.h + del -e glext.h wget http://www.opengl.org/registry/api/GL/glext.h - -del genheaders.py + del -e genheaders.py wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/genheaders.py - -del reg.py + del -e reg.py wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/reg.py - -del gl.xml + del -e gl.xml wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml - -del wgl.xml + del -e wgl.xml wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml $(OBJDIR)\generated_gl_wrappers.c: gen_gl_wrappers.py gl.xml gen_gl_wrappers.py reg.py diff --git a/xorg-server/hw/xwin/glx/reg.py b/xorg-server/hw/xwin/glx/reg.py index 4977710e5..2aeecc8d1 100644 --- a/xorg-server/hw/xwin/glx/reg.py +++ b/xorg-server/hw/xwin/glx/reg.py @@ -269,8 +269,10 @@ class GeneratorOptions: # generated around a feature interface in the header file. # genFuncPointers - True if function pointer typedefs should be # generated -# protectProto - True if #ifndef..#endif protection should be +# protectProto - True if #ifdef..#endif protection should be # generated around prototype declarations +# protectProtoStr - #ifdef symbol to use around prototype +# declarations, if protected # apicall - string to use for the function declaration prefix, # such as APICALL on Windows. # apientry - string to use for the calling convention macro, @@ -294,6 +296,7 @@ class CGeneratorOptions(GeneratorOptions): protectFile = True, protectFeature = True, protectProto = True, + protectProtoStr = True, apicall = '', apientry = '', apientryp = ''): @@ -305,6 +308,7 @@ class CGeneratorOptions(GeneratorOptions): self.protectFile = protectFile self.protectFeature = protectFeature self.protectProto = protectProto + self.protectProtoStr = protectProtoStr self.apicall = apicall self.apientry = apientry self.apientryp = apientryp @@ -579,7 +583,7 @@ class COutputGenerator(OutputGenerator): print(self.cmdPointerBody, end='', file=self.outFile) if (self.cmdBody != ''): if (self.genOpts.protectProto): - print('#ifdef GL_GLEXT_PROTOTYPES', file=self.outFile) + print('#ifdef', self.genOpts.protectProtoStr, file=self.outFile) print(self.cmdBody, end='', file=self.outFile) if (self.genOpts.protectProto): print('#endif', file=self.outFile) diff --git a/xorg-server/hw/xwin/glx/wglext.h b/xorg-server/hw/xwin/glx/wglext.h index 828bcb519..c23568570 100644 --- a/xorg-server/hw/xwin/glx/wglext.h +++ b/xorg-server/hw/xwin/glx/wglext.h @@ -41,7 +41,7 @@ extern "C" { #include #endif -#define WGL_WGLEXT_VERSION 20130708 +#define WGL_WGLEXT_VERSION 20130710 /* Generated C header for: * API: wgl @@ -62,7 +62,7 @@ typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPl typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion); typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height); typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES HANDLE WINAPI wglCreateBufferRegionARB (HDC hDC, int iLayerPlane, UINT uType); VOID WINAPI wglDeleteBufferRegionARB (HANDLE hRegion); BOOL WINAPI wglSaveBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height); @@ -80,7 +80,7 @@ BOOL WINAPI wglRestoreBufferRegionARB (HANDLE hRegion, int x, int y, int width, #define WGL_CONTEXT_FLAGS_ARB 0x2094 #define ERROR_INVALID_VERSION_ARB 0x2095 typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int *attribList); #endif #endif /* WGL_ARB_create_context */ @@ -104,7 +104,7 @@ HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int #ifndef WGL_ARB_extensions_string #define WGL_ARB_extensions_string 1 typedef const char *(WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES const char *WINAPI wglGetExtensionsStringARB (HDC hdc); #endif #endif /* WGL_ARB_extensions_string */ @@ -120,7 +120,7 @@ const char *WINAPI wglGetExtensionsStringARB (HDC hdc); #define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054 typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglMakeContextCurrentARB (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); HDC WINAPI wglGetCurrentReadDCARB (void); #endif @@ -148,7 +148,7 @@ typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer); typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC); typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer); typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES HPBUFFERARB WINAPI wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB hPbuffer); int WINAPI wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); @@ -211,7 +211,7 @@ BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piVal typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); BOOL WINAPI wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); @@ -261,7 +261,7 @@ BOOL WINAPI wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FL typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); @@ -290,7 +290,7 @@ BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribLis #define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057 #define WGL_STEREO_POLARITY_INVERT_3DL 0x2058 typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglSetStereoEmitterState3DL (HDC hDC, UINT uState); #endif #endif /* WGL_3DL_stereo_control */ @@ -316,7 +316,7 @@ typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc); typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc); typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void); typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES UINT WINAPI wglGetGPUIDsAMD (UINT maxCount, UINT *ids); INT WINAPI wglGetGPUInfoAMD (UINT id, int property, GLenum dataType, UINT size, void *data); UINT WINAPI wglGetContextGPUIDAMD (HGLRC hglrc); @@ -355,7 +355,7 @@ typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id); typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length); typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id); typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort id); GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *table, GLuint length); GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort id); @@ -366,7 +366,7 @@ VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort id); #ifndef WGL_EXT_extensions_string #define WGL_EXT_extensions_string 1 typedef const char *(WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES const char *WINAPI wglGetExtensionsStringEXT (void); #endif #endif /* WGL_EXT_extensions_string */ @@ -381,7 +381,7 @@ const char *WINAPI wglGetExtensionsStringEXT (void); #define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043 typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglMakeContextCurrentEXT (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); HDC WINAPI wglGetCurrentReadDCEXT (void); #endif @@ -410,7 +410,7 @@ typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer); typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC); typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer); typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT hPbuffer); int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT hPbuffer, HDC hDC); @@ -469,7 +469,7 @@ BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT hPbuffer, int iAttribute, int *piVal typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); BOOL WINAPI wglChoosePixelFormatEXT (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); @@ -485,7 +485,7 @@ BOOL WINAPI wglChoosePixelFormatEXT (HDC hdc, const int *piAttribIList, const FL #define WGL_EXT_swap_control 1 typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval); typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglSwapIntervalEXT (int interval); int WINAPI wglGetSwapIntervalEXT (void); #endif @@ -503,7 +503,7 @@ int WINAPI wglGetSwapIntervalEXT (void); #define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053 typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue); typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC hDC, int iAttribute, int *piValue); BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC hDC, int iAttribute, const int *piValue); #endif @@ -517,7 +517,7 @@ typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttr typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue); typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue); typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglGetGammaTableParametersI3D (HDC hDC, int iAttribute, int *piValue); BOOL WINAPI wglSetGammaTableParametersI3D (HDC hDC, int iAttribute, const int *piValue); BOOL WINAPI wglGetGammaTableI3D (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue); @@ -548,7 +548,7 @@ typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate) typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay); typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay); typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglEnableGenlockI3D (HDC hDC); BOOL WINAPI wglDisableGenlockI3D (HDC hDC); BOOL WINAPI wglIsEnabledGenlockI3D (HDC hDC, BOOL *pFlag); @@ -572,7 +572,7 @@ typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress); typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count); typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES LPVOID WINAPI wglCreateImageBufferI3D (HDC hDC, DWORD dwSize, UINT uFlags); BOOL WINAPI wglDestroyImageBufferI3D (HDC hDC, LPVOID pAddress); BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count); @@ -586,7 +586,7 @@ typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void); typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void); typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag); typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglEnableFrameLockI3D (void); BOOL WINAPI wglDisableFrameLockI3D (void); BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *pFlag); @@ -600,7 +600,7 @@ typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage); typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void); typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void); typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglGetFrameUsageI3D (float *pUsage); BOOL WINAPI wglBeginFrameTrackingI3D (void); BOOL WINAPI wglEndFrameTrackingI3D (void); @@ -621,7 +621,7 @@ typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE h typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access); typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglDXSetResourceShareHandleNV (void *dxObject, HANDLE shareHandle); HANDLE WINAPI wglDXOpenDeviceNV (void *dxDevice); BOOL WINAPI wglDXCloseDeviceNV (HANDLE hDevice); @@ -640,7 +640,7 @@ BOOL WINAPI wglDXUnlockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects) #ifndef WGL_NV_copy_image #define WGL_NV_copy_image 1 typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); #endif #endif /* WGL_NV_copy_image */ @@ -676,7 +676,7 @@ typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceInd typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList); typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglEnumGpusNV (UINT iGpuIndex, HGPUNV *phGpu); BOOL WINAPI wglEnumGpuDevicesNV (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); HDC WINAPI wglCreateAffinityDCNV (const HGPUNV *phGpuList); @@ -698,7 +698,7 @@ DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV); typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList); typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int *piValue); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES int WINAPI wglEnumerateVideoDevicesNV (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList); BOOL WINAPI wglBindVideoDeviceNV (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue); @@ -729,7 +729,7 @@ typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint *group, GLui typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers); typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint *count); typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglJoinSwapGroupNV (HDC hDC, GLuint group); BOOL WINAPI wglBindSwapBarrierNV (GLuint group, GLuint barrier); BOOL WINAPI wglQuerySwapGroupNV (HDC hDC, GLuint *group, GLuint *barrier); @@ -743,7 +743,7 @@ BOOL WINAPI wglResetFrameCountNV (HDC hDC); #define WGL_NV_vertex_array_range 1 typedef void *(WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES void *WINAPI wglAllocateMemoryNV (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); void WINAPI wglFreeMemoryNV (void *pointer); #endif @@ -759,7 +759,7 @@ typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDE typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue); typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglBindVideoCaptureDeviceNV (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); UINT WINAPI wglEnumerateVideoCaptureDevicesNV (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList); BOOL WINAPI wglLockVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice); @@ -790,7 +790,7 @@ typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPB typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer); typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock); typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglGetVideoDeviceNV (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice); BOOL WINAPI wglReleaseVideoDeviceNV (HPVIDEODEV hVideoDevice); BOOL WINAPI wglBindVideoImageNV (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); @@ -808,7 +808,7 @@ typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); -#ifdef GL_GLEXT_PROTOTYPES +#ifdef WGL_WGLEXT_PROTOTYPES BOOL WINAPI wglGetSyncValuesOML (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); BOOL WINAPI wglGetMscRateOML (HDC hdc, INT32 *numerator, INT32 *denominator); INT64 WINAPI wglSwapBuffersMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -- cgit v1.2.3