diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 12:16:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 12:16:17 +0200 |
| commit | 7403278d95051a554e2cbec3fafdde8ce9c6d200 (patch) | |
| tree | 0b856002c12c11744627134553ef9cdfa77faead /xorg-server/hw/xwin/glx | |
| parent | 2d042f719910c5aa1ba9f4a47b21009c729c345e (diff) | |
| download | vcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.tar.gz vcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.tar.bz2 vcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.zip | |
Synchronised files
Updated to latest gl specs
Diffstat (limited to 'xorg-server/hw/xwin/glx')
| -rw-r--r-- | xorg-server/hw/xwin/glx/genheaders.py | 15 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/gl.xml | 720 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/makefile | 14 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/reg.py | 8 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/wglext.h | 62 |
5 files changed, 754 insertions, 65 deletions
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; </group> <group name="MapBufferUsageMask"> + <enum name="GL_CLIENT_STORAGE_BIT"/> + <enum name="GL_DYNAMIC_STORAGE_BIT"/> + <enum name="GL_MAP_COHERENT_BIT"/> <enum name="GL_MAP_FLUSH_EXPLICIT_BIT"/> <enum name="GL_MAP_FLUSH_EXPLICIT_BIT_EXT"/> <enum name="GL_MAP_INVALIDATE_BUFFER_BIT"/> <enum name="GL_MAP_INVALIDATE_BUFFER_BIT_EXT"/> <enum name="GL_MAP_INVALIDATE_RANGE_BIT"/> <enum name="GL_MAP_INVALIDATE_RANGE_BIT_EXT"/> + <enum name="GL_MAP_PERSISTENT_BIT"/> <enum name="GL_MAP_READ_BIT"/> <enum name="GL_MAP_READ_BIT_EXT"/> <enum name="GL_MAP_UNSYNCHRONIZED_BIT"/> @@ -1366,6 +1370,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_ATOMIC_COUNTER_BARRIER_BIT_EXT"/> <enum name="GL_BUFFER_UPDATE_BARRIER_BIT"/> <enum name="GL_BUFFER_UPDATE_BARRIER_BIT_EXT"/> + <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/> <enum name="GL_COMMAND_BARRIER_BIT"/> <enum name="GL_COMMAND_BARRIER_BIT_EXT"/> <enum name="GL_ELEMENT_ARRAY_BARRIER_BIT"/> @@ -1374,6 +1379,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_FRAMEBUFFER_BARRIER_BIT_EXT"/> <enum name="GL_PIXEL_BUFFER_BARRIER_BIT"/> <enum name="GL_PIXEL_BUFFER_BARRIER_BIT_EXT"/> + <enum name="GL_QUERY_BUFFER_BARRIER_BIT"/> <enum name="GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV"/> <enum name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/> <enum name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT"/> @@ -2047,6 +2053,10 @@ typedef unsigned int GLhandleARB; <enum value="0x0010" name="GL_MAP_FLUSH_EXPLICIT_BIT_EXT"/> <enum value="0x0020" name="GL_MAP_UNSYNCHRONIZED_BIT"/> <enum value="0x0020" name="GL_MAP_UNSYNCHRONIZED_BIT_EXT"/> + <enum value="0x0040" name="GL_MAP_PERSISTENT_BIT"/> + <enum value="0x0080" name="GL_MAP_COHERENT_BIT"/> + <enum value="0x0100" name="GL_DYNAMIC_STORAGE_BIT"/> + <enum value="0x0200" name="GL_CLIENT_STORAGE_BIT"/> </enums> <enums namespace="GL" group="MemoryBarrierMask" type="bitmask"> @@ -2076,6 +2086,8 @@ typedef unsigned int GLhandleARB; <enum value="0x00001000" name="GL_ATOMIC_COUNTER_BARRIER_BIT"/> <enum value="0x00001000" name="GL_ATOMIC_COUNTER_BARRIER_BIT_EXT"/> <enum value="0x00002000" name="GL_SHADER_STORAGE_BARRIER_BIT"/> + <enum value="0x00004000" name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/> + <enum value="0x00008000" name="GL_QUERY_BUFFER_BARRIER_BIT"/> <enum value="0xFFFFFFFF" name="GL_ALL_BARRIER_BITS"/> <enum value="0xFFFFFFFF" name="GL_ALL_BARRIER_BITS_EXT"/> </enums> @@ -2298,6 +2310,7 @@ typedef unsigned int GLhandleARB; <enum value="0" name="GL_NO_ERROR"/> <enum value="0" name="GL_ZERO"/> <enum value="0" name="GL_NONE"/> + <enum value="0" name="GL_NONE_OES"/> <enum value="1" name="GL_TRUE"/> <enum value="1" name="GL_ONE"/> <enum value="0xFFFFFFFF" name="GL_INVALID_INDEX" type="u" comment="Tagged as uint"/> @@ -2718,6 +2731,7 @@ typedef unsigned int GLhandleARB; <enum value="0x140C" name="GL_FIXED_OES"/> <unused start="0x140D" comment="Leave gap to preserve even/odd int/uint token values"/> <enum value="0x140E" name="GL_INT64_NV"/> + <enum value="0x140F" name="GL_UNSIGNED_INT64_ARB"/> <enum value="0x140F" name="GL_UNSIGNED_INT64_NV"/> <unused start="0x1410" end="0x14FF" comment="Unused for DataType"/> <enum value="0x1500" name="GL_CLEAR"/> @@ -3120,6 +3134,7 @@ typedef unsigned int GLhandleARB; <enum value="0x8073" name="GL_MAX_3D_TEXTURE_SIZE_OES"/> <enum value="0x8074" name="GL_VERTEX_ARRAY"/> <enum value="0x8074" name="GL_VERTEX_ARRAY_EXT"/> + <enum value="0x8074" name="GL_VERTEX_ARRAY_KHR"/> <enum value="0x8075" name="GL_NORMAL_ARRAY"/> <enum value="0x8075" name="GL_NORMAL_ARRAY_EXT"/> <enum value="0x8076" name="GL_COLOR_ARRAY"/> @@ -3340,7 +3355,8 @@ typedef unsigned int GLhandleARB; <enum value="0x80EB" name="GL_PHONG_HINT_WIN"/> <enum value="0x80EC" name="GL_FOG_SPECULAR_TEXTURE_WIN"/> <enum value="0x80ED" name="GL_TEXTURE_INDEX_SIZE_EXT"/> - <unused start="0x80EE" end="0x80EF"/> + <enum value="0x80EE" name="GL_PARAMETER_BUFFER_ARB"/> + <enum value="0x80EF" name="GL_PARAMETER_BUFFER_BINDING_ARB"/> <enum value="0x80F0" name="GL_CLIP_VOLUME_CLIPPING_HINT_EXT"/> <unused start="0x80F1" end="0x810F"/> </enums> @@ -3659,7 +3675,9 @@ typedef unsigned int GLhandleARB; <enum value="0x821C" name="GL_MINOR_VERSION"/> <enum value="0x821D" name="GL_NUM_EXTENSIONS"/> <enum value="0x821E" name="GL_CONTEXT_FLAGS"/> - <unused start="0x821F" end="0x8221"/> + <enum value="0x821F" name="GL_BUFFER_IMMUTABLE_STORAGE"/> + <enum value="0x8220" name="GL_BUFFER_STORAGE_FLAGS"/> + <unused start="0x8221"/> <enum value="0x8222" name="GL_INDEX"/> <unused start="0x8223" comment="GL_DEPTH_BUFFER = 0x8223 not actually used in the API"/> <unused start="0x8224" comment="GL_STENCIL_BUFFER = 0x8224 not actually used in the API"/> @@ -3909,7 +3927,7 @@ typedef unsigned int GLhandleARB; <enum value="0x82E3" name="GL_QUERY"/> <enum value="0x82E3" name="GL_QUERY_KHR"/> <enum value="0x82E4" name="GL_PROGRAM_PIPELINE"/> - <unused start="0x82E5" comment="Reserved for future GL"/> + <enum value="0x82E5" name="GL_MAX_VERTEX_ATTRIB_STRIDE"/> <enum value="0x82E6" name="GL_SAMPLER"/> <enum value="0x82E6" name="GL_SAMPLER_KHR"/> <enum value="0x82E7" name="GL_DISPLAY_LIST"/> @@ -5044,6 +5062,7 @@ typedef unsigned int GLhandleARB; <enum value="0x8741" name="GL_PROGRAM_BINARY_LENGTH"/> <enum value="0x8742" name="GL_MIRROR_CLAMP_ATI"/> <enum value="0x8742" name="GL_MIRROR_CLAMP_EXT"/> + <enum value="0x8743" name="GL_MIRROR_CLAMP_TO_EDGE"/> <enum value="0x8743" name="GL_MIRROR_CLAMP_TO_EDGE_ATI"/> <enum value="0x8743" name="GL_MIRROR_CLAMP_TO_EDGE_EXT"/> <enum value="0x8744" name="GL_MODULATE_ADD_ATI"/> @@ -7294,6 +7313,7 @@ typedef unsigned int GLhandleARB; <enum value="0x90E1" name="GL_SYNC_X11_FENCE_EXT"/> <unused start="0x90E2" end="0x90E9"/> <enum value="0x90EA" name="GL_DEPTH_STENCIL_TEXTURE_MODE"/> + <enum value="0x90EB" name="GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB" alias="GL_MAX_COMPUTE_LOCAL_INVOCATIONS"/> <enum value="0x90EB" name="GL_MAX_COMPUTE_LOCAL_INVOCATIONS"/> <enum value="0x90EC" name="GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER"/> <enum value="0x90ED" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER"/> @@ -7428,15 +7448,25 @@ typedef unsigned int GLhandleARB; <unused start="0x9156" end="0x915F"/> <enum value="0x9160" name="GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD"/> <unused start="0x9161"/> + <enum value="0x9192" name="GL_QUERY_BUFFER"/> <enum value="0x9192" name="GL_QUERY_BUFFER_AMD"/> + <enum value="0x9193" name="GL_QUERY_BUFFER_BINDING"/> <enum value="0x9193" name="GL_QUERY_BUFFER_BINDING_AMD"/> + <enum value="0x9194" name="GL_QUERY_RESULT_NO_WAIT"/> <enum value="0x9194" name="GL_QUERY_RESULT_NO_WAIT_AMD"/> + <enum value="0x9195" name="GL_VIRTUAL_PAGE_SIZE_X_ARB"/> <enum value="0x9195" name="GL_VIRTUAL_PAGE_SIZE_X_AMD"/> + <enum value="0x9196" name="GL_VIRTUAL_PAGE_SIZE_Y_ARB"/> <enum value="0x9196" name="GL_VIRTUAL_PAGE_SIZE_Y_AMD"/> + <enum value="0x9197" name="GL_VIRTUAL_PAGE_SIZE_Z_ARB"/> <enum value="0x9197" name="GL_VIRTUAL_PAGE_SIZE_Z_AMD"/> + <enum value="0x9198" name="GL_MAX_SPARSE_TEXTURE_SIZE_ARB"/> <enum value="0x9198" name="GL_MAX_SPARSE_TEXTURE_SIZE_AMD"/> + <enum value="0x9199" name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB"/> <enum value="0x9199" name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD"/> + <enum value="0x919A" name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB"/> <enum value="0x919A" name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS"/> + <enum value="0x919B" name="GL_MIN_SPARSE_LEVEL_ARB"/> <enum value="0x919B" name="GL_MIN_SPARSE_LEVEL_AMD"/> <enum value="0x919C" name="GL_MIN_LOD_WARNING_AMD"/> <enum value="0x919D" name="GL_TEXTURE_BUFFER_OFFSET"/> @@ -7445,13 +7475,18 @@ typedef unsigned int GLhandleARB; <unused start="0x91A0" end="0x91A3"/> <enum value="0x91A4" name="GL_VERTEX_ELEMENT_SWIZZLE_AMD"/> <enum value="0x91A5" name="GL_VERTEX_ID_SWIZZLE_AMD"/> - <unused start="0x91A6" end="0x91B8"/> + <enum value="0x91A6" name="GL_TEXTURE_SPARSE_ARB"/> + <enum value="0x91A7" name="GL_VIRTUAL_PAGE_SIZE_INDEX_ARB"/> + <enum value="0x91A8" name="GL_NUM_VIRTUAL_PAGE_SIZES_ARB"/> + <enum value="0x91A9" name="GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB"/> + <unused start="0x91AA" end="0x91B8"/> <enum value="0x91B9" name="GL_COMPUTE_SHADER"/> <unused start="0x91BA"/> <enum value="0x91BB" name="GL_MAX_COMPUTE_UNIFORM_BLOCKS"/> <enum value="0x91BC" name="GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS"/> <enum value="0x91BD" name="GL_MAX_COMPUTE_IMAGE_UNIFORMS"/> <enum value="0x91BE" name="GL_MAX_COMPUTE_WORK_GROUP_COUNT"/> + <enum value="0x91BF" name="GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB" alias="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/> <enum value="0x91BF" name="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/> <unused start="0x91C0" end="0x923F"/> </enums> @@ -7500,7 +7535,58 @@ typedef unsigned int GLhandleARB; </enums> <enums namespace="GL" start="0x9280" end="0x937F" vendor="NV" comment="Khronos bug 7658"> - <unused start="0x9280" end="0x92BF"/> + <enum value="0x9280" name="GL_BLEND_PREMULTIPLIED_SRC_NV"/> + <enum value="0x9281" name="GL_BLEND_OVERLAP_NV"/> + <enum value="0x9282" name="GL_UNCORRELATED_NV"/> + <enum value="0x9283" name="GL_DISJOINT_NV"/> + <enum value="0x9284" name="GL_CONJOINT_NV"/> + <enum value="0x9285" name="GL_BLEND_ADVANCED_COHERENT_NV"/> + <enum value="0x9286" name="GL_SRC_NV"/> + <enum value="0x9287" name="GL_DST_NV"/> + <enum value="0x9288" name="GL_SRC_OVER_NV"/> + <enum value="0x9289" name="GL_DST_OVER_NV"/> + <enum value="0x928A" name="GL_SRC_IN_NV"/> + <enum value="0x928B" name="GL_DST_IN_NV"/> + <enum value="0x928C" name="GL_SRC_OUT_NV"/> + <enum value="0x928D" name="GL_DST_OUT_NV"/> + <enum value="0x928E" name="GL_SRC_ATOP_NV"/> + <enum value="0x928F" name="GL_DST_ATOP_NV"/> + <unused start="0x9290"/> + <enum value="0x9291" name="GL_PLUS_NV"/> + <enum value="0x9292" name="GL_PLUS_DARKER_NV"/> + <unused start="0x9293"/> + <enum value="0x9294" name="GL_MULTIPLY_NV"/> + <enum value="0x9295" name="GL_SCREEN_NV"/> + <enum value="0x9296" name="GL_OVERLAY_NV"/> + <enum value="0x9297" name="GL_DARKEN_NV"/> + <enum value="0x9298" name="GL_LIGHTEN_NV"/> + <enum value="0x9299" name="GL_COLORDODGE_NV"/> + <enum value="0x929A" name="GL_COLORBURN_NV"/> + <enum value="0x929B" name="GL_HARDLIGHT_NV"/> + <enum value="0x929C" name="GL_SOFTLIGHT_NV"/> + <unused start="0x929D"/> + <enum value="0x929E" name="GL_DIFFERENCE_NV"/> + <enum value="0x929F" name="GL_MINUS_NV"/> + <enum value="0x92A0" name="GL_EXCLUSION_NV"/> + <enum value="0x92A1" name="GL_CONTRAST_NV"/> + <unused start="0x92A2"/> + <enum value="0x92A3" name="GL_INVERT_RGB_NV"/> + <enum value="0x92A4" name="GL_LINEARDODGE_NV"/> + <enum value="0x92A5" name="GL_LINEARBURN_NV"/> + <enum value="0x92A6" name="GL_VIVIDLIGHT_NV"/> + <enum value="0x92A7" name="GL_LINEARLIGHT_NV"/> + <enum value="0x92A8" name="GL_PINLIGHT_NV"/> + <enum value="0x92A9" name="GL_HARDMIX_NV"/> + <unused start="0x92AA" end="0x92AC"/> + <enum value="0x92AD" name="GL_HSL_HUE_NV"/> + <enum value="0x92AE" name="GL_HSL_SATURATION_NV"/> + <enum value="0x92AF" name="GL_HSL_COLOR_NV"/> + <enum value="0x92B0" name="GL_HSL_LUMINOSITY_NV"/> + <enum value="0x92B1" name="GL_PLUS_CLAMPED_NV"/> + <enum value="0x92B2" name="GL_PLUS_CLAMPED_ALPHA_NV"/> + <enum value="0x92B3" name="GL_MINUS_CLAMPED_NV"/> + <enum value="0x92B4" name="GL_INVERT_OVG_NV"/> + <unused start="0x92B5" end="0x92BF"/> <enum value="0x92C0" name="GL_ATOMIC_COUNTER_BUFFER"/> <enum value="0x92C1" name="GL_ATOMIC_COUNTER_BUFFER_BINDING"/> <enum value="0x92C2" name="GL_ATOMIC_COUNTER_BUFFER_START"/> @@ -7589,7 +7675,16 @@ typedef unsigned int GLhandleARB; <enum value="0x9316" name="GL_MAX_FRAMEBUFFER_HEIGHT"/> <enum value="0x9317" name="GL_MAX_FRAMEBUFFER_LAYERS"/> <enum value="0x9318" name="GL_MAX_FRAMEBUFFER_SAMPLES"/> - <unused start="0x9319" end="0x937F"/> + <unused start="0x9319" end="0x9343"/> + <enum value="0x9344" name="GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB"/> + <enum value="0x9345" name="GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB"/> + <unused start="0x9346" end="0x9349"/> + <enum value="0x934A" name="GL_LOCATION_COMPONENT"/> + <enum value="0x934B" name="GL_TRANSFORM_FEEDBACK_BUFFER_INDEX"/> + <enum value="0x934C" name="GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE"/> + <unused start="0x934D" end="0x9364"/> + <enum value="0x9365" name="GL_CLEAR_TEXTURE"/> + <unused start="0x9366" end="0x937F"/> </enums> <enums namespace="GL" start="0x9380" end="0x939F" vendor="ARB"> @@ -8095,6 +8190,22 @@ typedef unsigned int GLhandleARB; <alias name="glBindBufferRange"/> </command> <command> + <proto>void <name>glBindBuffersBase</name></proto> + <param><ptype>GLenum</ptype> <name>target</name></param> + <param><ptype>GLuint</ptype> <name>first</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param>const <ptype>GLuint</ptype> *<name>buffers</name></param> + </command> + <command> + <proto>void <name>glBindBuffersRange</name></proto> + <param><ptype>GLenum</ptype> <name>target</name></param> + <param><ptype>GLuint</ptype> <name>first</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param>const <ptype>GLuint</ptype> *<name>buffers</name></param> + <param>const <ptype>GLintptr</ptype> *<name>offsets</name></param> + <param>const <ptype>GLsizeiptr</ptype> *<name>sizes</name></param> + </command> + <command> <proto>void <name>glBindFragDataLocation</name></proto> <param><ptype>GLuint</ptype> <name>program</name></param> <param><ptype>GLuint</ptype> <name>color</name></param> @@ -8156,6 +8267,12 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>format</name></param> </command> <command> + <proto>void <name>glBindImageTextures</name></proto> + <param><ptype>GLuint</ptype> <name>first</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param>const <ptype>GLuint</ptype> *<name>textures</name></param> + </command> + <command> <proto><ptype>GLuint</ptype> <name>glBindLightParameterEXT</name></proto> <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param> <param group="LightParameter"><ptype>GLenum</ptype> <name>value</name></param> @@ -8219,6 +8336,12 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>sampler</name></param> </command> <command> + <proto>void <name>glBindSamplers</name></proto> + <param><ptype>GLuint</ptype> <name>first</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param>const <ptype>GLuint</ptype> *<name>samplers</name></param> + </command> + <command> <proto><ptype>GLuint</ptype> <name>glBindTexGenParameterEXT</name></proto> <param group="TextureUnit"><ptype>GLenum</ptype> <name>unit</name></param> <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param> @@ -8243,6 +8366,12 @@ typedef unsigned int GLhandleARB; <param group="VertexShaderTextureUnitParameter"><ptype>GLenum</ptype> <name>value</name></param> </command> <command> + <proto>void <name>glBindTextures</name></proto> + <param><ptype>GLuint</ptype> <name>first</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param>const <ptype>GLuint</ptype> *<name>textures</name></param> + </command> + <command> <proto>void <name>glBindTransformFeedback</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLuint</ptype> <name>id</name></param> @@ -8274,6 +8403,14 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>stride</name></param> </command> <command> + <proto>void <name>glBindVertexBuffers</name></proto> + <param><ptype>GLuint</ptype> <name>first</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param>const <ptype>GLuint</ptype> *<name>buffers</name></param> + <param>const <ptype>GLintptr</ptype> *<name>offsets</name></param> + <param>const <ptype>GLsizei</ptype> *<name>strides</name></param> + </command> + <command> <proto>void <name>glBindVertexShaderEXT</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> </command> @@ -8555,6 +8692,14 @@ typedef unsigned int GLhandleARB; <alias name="glBlendFunci"/> </command> <command> + <proto>void <name>glBlendParameteriNV</name></proto> + <param><ptype>GLenum</ptype> <name>pname</name></param> + <param><ptype>GLint</ptype> <name>value</name></param> + </command> + <command> + <proto>void <name>glBlendBarrierNV</name></proto> + </command> + <command> <proto>void <name>glBlitFramebuffer</name></proto> <param><ptype>GLint</ptype> <name>srcX0</name></param> <param><ptype>GLint</ptype> <name>srcY0</name></param> @@ -8638,6 +8783,13 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>param</name></param> </command> <command> + <proto>void <name>glBufferStorage</name></proto> + <param><ptype>GLenum</ptype> <name>target</name></param> + <param><ptype>GLsizeiptr</ptype> <name>size</name></param> + <param>const void *<name>data</name></param> + <param><ptype>GLbitfield</ptype> <name>flags</name></param> + </command> + <command> <proto>void <name>glBufferSubData</name></proto> <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param> @@ -8855,6 +9007,28 @@ typedef unsigned int GLhandleARB; <glx type="render" opcode="131"/> </command> <command> + <proto>void <name>glClearTexImage</name></proto> + <param><ptype>GLuint</ptype> <name>texture</name></param> + <param><ptype>GLint</ptype> <name>level</name></param> + <param><ptype>GLenum</ptype> <name>format</name></param> + <param><ptype>GLenum</ptype> <name>type</name></param> + <param>const void *<name>data</name></param> + </command> + <command> + <proto>void <name>glClearTexSubImage</name></proto> + <param><ptype>GLuint</ptype> <name>texture</name></param> + <param><ptype>GLint</ptype> <name>level</name></param> + <param><ptype>GLint</ptype> <name>xoffset</name></param> + <param><ptype>GLint</ptype> <name>yoffset</name></param> + <param><ptype>GLint</ptype> <name>zoffset</name></param> + <param><ptype>GLsizei</ptype> <name>width</name></param> + <param><ptype>GLsizei</ptype> <name>height</name></param> + <param><ptype>GLsizei</ptype> <name>depth</name></param> + <param><ptype>GLenum</ptype> <name>format</name></param> + <param><ptype>GLenum</ptype> <name>type</name></param> + <param>const void *<name>data</name></param> + </command> + <command> <proto>void <name>glClientActiveTexture</name></proto> <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param> </command> @@ -8884,6 +9058,11 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint64</ptype> <name>timeout</name></param> </command> <command> + <proto>void <name>glClipControlARB</name></proto> + <param><ptype>GLenum</ptype> <name>origin</name></param> + <param><ptype>GLenum</ptype> <name>depth</name></param> + </command> + <command> <proto>void <name>glClipPlane</name></proto> <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param> <param len="4">const <ptype>GLdouble</ptype> *<name>equation</name></param> @@ -10970,6 +11149,15 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>num_groups_z</name></param> </command> <command> + <proto>void <name>glDispatchComputeGroupSizeARB</name></proto> + <param><ptype>GLuint</ptype> <name>num_groups_x</name></param> + <param><ptype>GLuint</ptype> <name>num_groups_y</name></param> + <param><ptype>GLuint</ptype> <name>num_groups_z</name></param> + <param><ptype>GLuint</ptype> <name>group_size_x</name></param> + <param><ptype>GLuint</ptype> <name>group_size_y</name></param> + <param><ptype>GLuint</ptype> <name>group_size_z</name></param> + </command> + <command> <proto>void <name>glDispatchComputeIndirect</name></proto> <param group="BufferOffset"><ptype>GLintptr</ptype> <name>indirect</name></param> </command> @@ -13240,6 +13428,14 @@ typedef unsigned int GLhandleARB; <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param> </command> <command> + <proto><ptype>GLuint64</ptype> <name>glGetImageHandleARB</name></proto> + <param><ptype>GLuint</ptype> <name>texture</name></param> + <param><ptype>GLint</ptype> <name>level</name></param> + <param><ptype>GLboolean</ptype> <name>layered</name></param> + <param><ptype>GLint</ptype> <name>layer</name></param> + <param><ptype>GLenum</ptype> <name>format</name></param> + </command> + <command> <proto><ptype>GLuint64</ptype> <name>glGetImageHandleNV</name></proto> <param><ptype>GLuint</ptype> <name>texture</name></param> <param><ptype>GLint</ptype> <name>level</name></param> @@ -14715,6 +14911,10 @@ typedef unsigned int GLhandleARB; <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param> </command> <command> + <proto><ptype>GLuint64</ptype> <name>glGetTextureHandleARB</name></proto> + <param><ptype>GLuint</ptype> <name>texture</name></param> + </command> + <command> <proto><ptype>GLuint64</ptype> <name>glGetTextureHandleNV</name></proto> <param><ptype>GLuint</ptype> <name>texture</name></param> </command> @@ -14772,6 +14972,11 @@ typedef unsigned int GLhandleARB; <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> </command> <command> + <proto><ptype>GLuint64</ptype> <name>glGetTextureSamplerHandleARB</name></proto> + <param><ptype>GLuint</ptype> <name>texture</name></param> + <param><ptype>GLuint</ptype> <name>sampler</name></param> + </command> + <command> <proto><ptype>GLuint64</ptype> <name>glGetTextureSamplerHandleNV</name></proto> <param><ptype>GLuint</ptype> <name>texture</name></param> <param><ptype>GLuint</ptype> <name>sampler</name></param> @@ -15039,6 +15244,12 @@ typedef unsigned int GLhandleARB; <param len="COMPSIZE(pname)"><ptype>GLint64EXT</ptype> *<name>params</name></param> </command> <command> + <proto>void <name>glGetVertexAttribLui64vARB</name></proto> + <param><ptype>GLuint</ptype> <name>index</name></param> + <param><ptype>GLenum</ptype> <name>pname</name></param> + <param><ptype>GLuint64EXT</ptype> *<name>params</name></param> + </command> + <command> <proto>void <name>glGetVertexAttribLui64vNV</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> @@ -15660,6 +15871,10 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>framebuffer</name></param> </command> <command> + <proto><ptype>GLboolean</ptype> <name>glIsImageHandleResidentARB</name></proto> + <param><ptype>GLuint64</ptype> <name>handle</name></param> + </command> + <command> <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsImageHandleResidentNV</name></proto> <param><ptype>GLuint64</ptype> <name>handle</name></param> </command> @@ -15788,6 +16003,10 @@ typedef unsigned int GLhandleARB; <glx type="vendor" opcode="14"/> </command> <command> + <proto><ptype>GLboolean</ptype> <name>glIsTextureHandleResidentARB</name></proto> + <param><ptype>GLuint64</ptype> <name>handle</name></param> + </command> + <command> <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsTextureHandleResidentNV</name></proto> <param><ptype>GLuint64</ptype> <name>handle</name></param> </command> @@ -16078,10 +16297,19 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>access</name></param> </command> <command> + <proto>void <name>glMakeImageHandleNonResidentARB</name></proto> + <param><ptype>GLuint64</ptype> <name>handle</name></param> + </command> + <command> <proto>void <name>glMakeImageHandleNonResidentNV</name></proto> <param><ptype>GLuint64</ptype> <name>handle</name></param> </command> <command> + <proto>void <name>glMakeImageHandleResidentARB</name></proto> + <param><ptype>GLuint64</ptype> <name>handle</name></param> + <param><ptype>GLenum</ptype> <name>access</name></param> + </command> + <command> <proto>void <name>glMakeImageHandleResidentNV</name></proto> <param><ptype>GLuint64</ptype> <name>handle</name></param> <param><ptype>GLenum</ptype> <name>access</name></param> @@ -16096,10 +16324,18 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>access</name></param> </command> <command> + <proto>void <name>glMakeTextureHandleNonResidentARB</name></proto> + <param><ptype>GLuint64</ptype> <name>handle</name></param> + </command> + <command> <proto>void <name>glMakeTextureHandleNonResidentNV</name></proto> <param><ptype>GLuint64</ptype> <name>handle</name></param> </command> <command> + <proto>void <name>glMakeTextureHandleResidentARB</name></proto> + <param><ptype>GLuint64</ptype> <name>handle</name></param> + </command> + <command> <proto>void <name>glMakeTextureHandleResidentNV</name></proto> <param><ptype>GLuint64</ptype> <name>handle</name></param> </command> @@ -16657,6 +16893,31 @@ typedef unsigned int GLhandleARB; <alias name="glMultiDrawArraysIndirect"/> </command> <command> + <proto>void <name>glMultiDrawArraysIndirectBindlessNV</name></proto> + <param><ptype>GLenum</ptype> <name>mode</name></param> + <param>const <ptype>GLvoid</ptype> *<name>indirect</name></param> + <param><ptype>GLsizei</ptype> <name>drawCount</name></param> + <param><ptype>GLsizei</ptype> <name>stride</name></param> + <param><ptype>GLint</ptype> <name>vertexBufferCount</name></param> + </command> + <command> + <proto>void <name>glMultiDrawElementsIndirectBindlessNV</name></proto> + <param><ptype>GLenum</ptype> <name>mode</name></param> + <param><ptype>GLenum</ptype> <name>type</name></param> + <param>const <ptype>GLvoid</ptype> *<name>indirect</name></param> + <param><ptype>GLsizei</ptype> <name>drawCount</name></param> + <param><ptype>GLsizei</ptype> <name>stride</name></param> + <param><ptype>GLint</ptype> <name>vertexBufferCount</name></param> + </command> + <command> + <proto>void <name>glMultiDrawArraysIndirectCountARB</name></proto> + <param><ptype>GLenum</ptype> <name>mode</name></param> + <param><ptype>GLintptr</ptype> <name>indirect</name></param> + <param><ptype>GLintptr</ptype> <name>drawcount</name></param> + <param><ptype>GLsizei</ptype> <name>maxdrawcount</name></param> + <param><ptype>GLsizei</ptype> <name>stride</name></param> + </command> + <command> <proto>void <name>glMultiDrawElementArrayAPPLE</name></proto> <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param len="primcount">const <ptype>GLint</ptype> *<name>first</name></param> @@ -16707,6 +16968,15 @@ typedef unsigned int GLhandleARB; <alias name="glMultiDrawElementsIndirect"/> </command> <command> + <proto>void <name>glMultiDrawElementsIndirectCountARB</name></proto> + <param><ptype>GLenum</ptype> <name>mode</name></param> + <param><ptype>GLenum</ptype> <name>type</name></param> + <param><ptype>GLintptr</ptype> <name>indirect</name></param> + <param><ptype>GLintptr</ptype> <name>drawcount</name></param> + <param><ptype>GLsizei</ptype> <name>maxdrawcount</name></param> + <param><ptype>GLsizei</ptype> <name>stride</name></param> + </command> + <command> <proto>void <name>glMultiDrawRangeElementArrayAPPLE</name></proto> <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLuint</ptype> <name>start</name></param> @@ -17624,6 +17894,13 @@ typedef unsigned int GLhandleARB; <param group="VertexBufferObjectUsage"><ptype>GLenum</ptype> <name>usage</name></param> </command> <command> + <proto>void <name>glNamedBufferStorageEXT</name></proto> + <param><ptype>GLuint</ptype> <name>buffer</name></param> + <param><ptype>GLsizeiptr</ptype> <name>size</name></param> + <param>const void *<name>data</name></param> + <param><ptype>GLbitfield</ptype> <name>flags</name></param> + </command> + <command> <proto>void <name>glNamedBufferSubDataEXT</name></proto> <param><ptype>GLuint</ptype> <name>buffer</name></param> <param><ptype>GLintptr</ptype> <name>offset</name></param> @@ -19632,12 +19909,25 @@ typedef unsigned int GLhandleARB; <alias name="glProgramUniform4uiv"/> </command> <command> + <proto>void <name>glProgramUniformHandleui64ARB</name></proto> + <param><ptype>GLuint</ptype> <name>program</name></param> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLuint64</ptype> <name>value</name></param> + </command> + <command> <proto>void <name>glProgramUniformHandleui64NV</name></proto> <param><ptype>GLuint</ptype> <name>program</name></param> <param><ptype>GLint</ptype> <name>location</name></param> <param><ptype>GLuint64</ptype> <name>value</name></param> </command> <command> + <proto>void <name>glProgramUniformHandleui64vARB</name></proto> + <param><ptype>GLuint</ptype> <name>program</name></param> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param>const <ptype>GLuint64</ptype> *<name>values</name></param> + </command> + <command> <proto>void <name>glProgramUniformHandleui64vNV</name></proto> <param><ptype>GLuint</ptype> <name>program</name></param> <param><ptype>GLint</ptype> <name>location</name></param> @@ -22265,6 +22555,18 @@ typedef unsigned int GLhandleARB; <glx type="render" opcode="2057"/> </command> <command> + <proto>void <name>glTexPageCommitmentARB</name></proto> + <param><ptype>GLenum</ptype> <name>target</name></param> + <param><ptype>GLint</ptype> <name>level</name></param> + <param><ptype>GLint</ptype> <name>xoffset</name></param> + <param><ptype>GLint</ptype> <name>yoffset</name></param> + <param><ptype>GLint</ptype> <name>zoffset</name></param> + <param><ptype>GLsizei</ptype> <name>width</name></param> + <param><ptype>GLsizei</ptype> <name>height</name></param> + <param><ptype>GLsizei</ptype> <name>depth</name></param> + <param><ptype>GLboolean</ptype> <name>resident</name></param> + </command> + <command> <proto>void <name>glTexParameterIiv</name></proto> <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param> @@ -22666,6 +22968,19 @@ typedef unsigned int GLhandleARB; <param group="TextureNormalModeEXT"><ptype>GLenum</ptype> <name>mode</name></param> </command> <command> + <proto>void <name>glTexturePageCommitmentEXT</name></proto> + <param><ptype>GLuint</ptype> <name>texture</name></param> + <param><ptype>GLenum</ptype> <name>target</name></param> + <param><ptype>GLint</ptype> <name>level</name></param> + <param><ptype>GLint</ptype> <name>xoffset</name></param> + <param><ptype>GLint</ptype> <name>yoffset</name></param> + <param><ptype>GLint</ptype> <name>zoffset</name></param> + <param><ptype>GLsizei</ptype> <name>width</name></param> + <param><ptype>GLsizei</ptype> <name>height</name></param> + <param><ptype>GLsizei</ptype> <name>depth</name></param> + <param><ptype>GLboolean</ptype> <name>resident</name></param> + </command> + <command> <proto>void <name>glTextureParameterIivEXT</name></proto> <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param> <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param> @@ -23394,11 +23709,22 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>buffer</name></param> </command> <command> + <proto>void <name>glUniformHandleui64ARB</name></proto> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLuint64</ptype> <name>value</name></param> + </command> + <command> <proto>void <name>glUniformHandleui64NV</name></proto> <param><ptype>GLint</ptype> <name>location</name></param> <param><ptype>GLuint64</ptype> <name>value</name></param> </command> <command> + <proto>void <name>glUniformHandleui64vARB</name></proto> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param>const <ptype>GLuint64</ptype> *<name>value</name></param> + </command> + <command> <proto>void <name>glUniformHandleui64vNV</name></proto> <param><ptype>GLint</ptype> <name>location</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> @@ -25288,11 +25614,21 @@ typedef unsigned int GLhandleARB; <param len="1">const <ptype>GLint64EXT</ptype> *<name>v</name></param> </command> <command> + <proto>void <name>glVertexAttribL1ui64ARB</name></proto> + <param><ptype>GLuint</ptype> <name>index</name></param> + <param><ptype>GLuint64EXT</ptype> <name>x</name></param> + </command> + <command> <proto>void <name>glVertexAttribL1ui64NV</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param><ptype>GLuint64EXT</ptype> <name>x</name></param> </command> <command> + <proto>void <name>glVertexAttribL1ui64vARB</name></proto> + <param><ptype>GLuint</ptype> <name>index</name></param> + <param>const <ptype>GLuint64EXT</ptype> *<name>v</name></param> + </command> + <command> <proto>void <name>glVertexAttribL1ui64vNV</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param len="1">const <ptype>GLuint64EXT</ptype> *<name>v</name></param> @@ -27395,8 +27731,6 @@ typedef unsigned int GLhandleARB; <enum name="GL_SINGLE_COLOR"/> <enum name="GL_SEPARATE_SPECULAR_COLOR"/> <enum name="GL_ALIASED_POINT_SIZE_RANGE"/> - <command name="glBlendColor"/> - <command name="glBlendEquation"/> <command name="glDrawRangeElements"/> <command name="glTexImage3D"/> <command name="glTexSubImage3D"/> @@ -27636,6 +27970,19 @@ typedef unsigned int GLhandleARB; <command name="glWindowPos3s"/> <command name="glWindowPos3sv"/> </require> + <require comment="Promoted from ARB_imaging subset to core"> + <enum name="GL_FUNC_ADD"/> + <enum name="GL_FUNC_SUBTRACT"/> + <enum name="GL_FUNC_REVERSE_SUBTRACT"/> + <enum name="GL_MIN"/> + <enum name="GL_MAX"/> + <enum name="GL_CONSTANT_COLOR"/> + <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/> + <enum name="GL_CONSTANT_ALPHA"/> + <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/> + <command name="glBlendColor"/> + <command name="glBlendEquation"/> + </require> </feature> <feature api="gl" name="GL_VERSION_1_5" number="1.5"> <require> @@ -29781,7 +30128,7 @@ typedef unsigned int GLhandleARB; <require comment="Reuse commands from ARB_conservative_depth (none)"> </require> <require comment="Reuse commands from ARB_internalformat_query"> - <command name="glGetInternalformati64v"/> + <command name="glGetInternalformativ"/> </require> <require comment="Reuse commands from ARB_map_buffer_alignment (none)"> </require> @@ -29894,6 +30241,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_BUFFER"/> <enum name="GL_SHADER"/> <enum name="GL_PROGRAM"/> + <enum name="GL_VERTEX_ARRAY"/> <enum name="GL_QUERY"/> <enum name="GL_PROGRAM_PIPELINE"/> <enum name="GL_SAMPLER"/> @@ -30220,6 +30568,58 @@ typedef unsigned int GLhandleARB; </deprecate> --> </feature> + <feature api="gl" name="GL_VERSION_4_4" number="4.4"> + <require> + <enum name="GL_MAX_VERTEX_ATTRIB_STRIDE"/> + </require> + <require comment="Reuse GL_ARB_buffer_storage"> + <enum name="GL_MAP_READ_BIT"/> + <enum name="GL_MAP_WRITE_BIT"/> + <enum name="GL_MAP_PERSISTENT_BIT"/> + <enum name="GL_MAP_COHERENT_BIT"/> + <enum name="GL_DYNAMIC_STORAGE_BIT"/> + <enum name="GL_CLIENT_STORAGE_BIT"/> + <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/> + <enum name="GL_BUFFER_IMMUTABLE_STORAGE"/> + <enum name="GL_BUFFER_STORAGE_FLAGS"/> + <command name="glBufferStorage"/> + </require> + <require comment="Reuse GL_ARB_clear_texture"> + <enum name="GL_CLEAR_TEXTURE"/> + <command name="glClearTexImage"/> + <command name="glClearTexSubImage"/> + </require> + <require comment="Reuse GL_ARB_enhanced_layouts"> + <enum name="GL_LOCATION_COMPONENT"/> + <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/> + <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_INDEX"/> + <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE"/> + </require> + <require comment="Reuse GL_ARB_multi_bind (none)"> + <command name="glBindBuffersBase"/> + <command name="glBindBuffersRange"/> + <command name="glBindTextures"/> + <command name="glBindSamplers"/> + <command name="glBindImageTextures"/> + <command name="glBindVertexBuffers"/> + </require> + <require comment="Reuse GL_ARB_query_buffer_object"> + <enum name="GL_QUERY_BUFFER"/> + <enum name="GL_QUERY_BUFFER_BARRIER_BIT"/> + <enum name="GL_QUERY_BUFFER_BINDING"/> + <enum name="GL_QUERY_RESULT_NO_WAIT"/> + </require> + <require comment="Reuse GL_ARB_texture_mirror_clamp_to_edge"> + <enum name="GL_MIRROR_CLAMP_TO_EDGE"/> + </require> + <require comment="Reuse GL_ARB_texture_stencil8"> + <enum name="GL_STENCIL_INDEX"/> + <enum name="GL_STENCIL_INDEX8"/> + </require> + <require comment="Reuse GL_ARB_vertex_type_10f_11f_11f_rev"> + <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/> + </require> + </feature> <!-- SECTION: OpenGL ES 1.0/1.1 API interface definitions. --> <feature api="gles1" name="GL_VERSION_ES_CM_1_0" number="1.0"> @@ -31731,6 +32131,10 @@ typedef unsigned int GLhandleARB; <enum name="GL_TEXTURE_CUBE_MAP_SEAMLESS"/> </require> </extension> + <extension name="GL_AMD_shader_atomic_counter_ops" supported="gl"> + <require> + </require> + </extension> <extension name="GL_AMD_shader_stencil_export" supported="gl"> <require> </require> @@ -32134,6 +32538,27 @@ typedef unsigned int GLhandleARB; <command name="glDrawElementsInstancedBaseVertexBaseInstance"/> </require> </extension> + <extension name="GL_ARB_bindless_texture" supported="gl|glcore"> + <require> + <enum name="GL_UNSIGNED_INT64_ARB"/> + <command name="glGetTextureHandleARB"/> + <command name="glGetTextureSamplerHandleARB"/> + <command name="glMakeTextureHandleResidentARB"/> + <command name="glMakeTextureHandleNonResidentARB"/> + <command name="glGetImageHandleARB"/> + <command name="glMakeImageHandleResidentARB"/> + <command name="glMakeImageHandleNonResidentARB"/> + <command name="glUniformHandleui64ARB"/> + <command name="glUniformHandleui64vARB"/> + <command name="glProgramUniformHandleui64ARB"/> + <command name="glProgramUniformHandleui64vARB"/> + <command name="glIsTextureHandleResidentARB"/> + <command name="glIsImageHandleResidentARB"/> + <command name="glVertexAttribL1ui64ARB"/> + <command name="glVertexAttribL1ui64vARB"/> + <command name="glGetVertexAttribLui64vARB"/> + </require> + </extension> <extension name="GL_ARB_blend_func_extended" supported="gl|glcore"> <require> <enum name="GL_SRC1_COLOR"/> @@ -32145,6 +32570,20 @@ typedef unsigned int GLhandleARB; <command name="glGetFragDataIndex"/> </require> </extension> + <extension name="GL_ARB_buffer_storage" supported="gl|glcore"> + <require> + <enum name="GL_MAP_READ_BIT"/> + <enum name="GL_MAP_WRITE_BIT"/> + <enum name="GL_MAP_PERSISTENT_BIT"/> + <enum name="GL_MAP_COHERENT_BIT"/> + <enum name="GL_DYNAMIC_STORAGE_BIT"/> + <enum name="GL_CLIENT_STORAGE_BIT"/> + <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/> + <enum name="GL_BUFFER_IMMUTABLE_STORAGE"/> + <enum name="GL_BUFFER_STORAGE_FLAGS"/> + <command name="glBufferStorage"/> + </require> + </extension> <extension name="GL_ARB_cl_event" supported="gl|glcore"> <require> <enum name="GL_SYNC_CL_EVENT_ARB"/> @@ -32158,6 +32597,13 @@ typedef unsigned int GLhandleARB; <command name="glClearBufferSubData"/> </require> </extension> + <extension name="GL_ARB_clear_texture" supported="gl|glcore"> + <require> + <enum name="GL_CLEAR_TEXTURE"/> + <command name="glClearTexImage"/> + <command name="glClearTexSubImage"/> + </require> + </extension> <extension name="GL_ARB_color_buffer_float" supported="gl"> <require> <enum name="GL_RGBA_FLOAT_MODE_ARB"/> @@ -32208,6 +32654,15 @@ typedef unsigned int GLhandleARB; <command name="glDispatchComputeIndirect"/> </require> </extension> + <extension name="GL_ARB_compute_variable_group_size" supported="gl|glcore"> + <require> + <enum name="GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB"/> + <enum name="GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB"/> + <enum name="GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB"/> + <enum name="GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB"/> + <command name="glDispatchComputeGroupSizeARB"/> + </require> + </extension> <extension name="GL_ARB_conservative_depth" supported="gl|glcore"> <require> </require> @@ -32329,6 +32784,14 @@ typedef unsigned int GLhandleARB; <command name="glDrawElementsInstancedARB"/> </require> </extension> + <extension name="GL_ARB_enhanced_layouts" supported="gl|glcore"> + <require> + <enum name="GL_LOCATION_COMPONENT"/> + <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/> + <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_INDEX"/> + <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE"/> + </require> + </extension> <extension name="GL_ARB_explicit_attrib_location" supported="gl|glcore"> <require> </require> @@ -32695,6 +33158,8 @@ typedef unsigned int GLhandleARB; <enum name="GL_BLEND_EQUATION"/> <enum name="GL_FUNC_SUBTRACT"/> <enum name="GL_FUNC_REVERSE_SUBTRACT"/> + <command name="glBlendColor"/> + <command name="glBlendEquation"/> </require> <require api="gl" profile="compatibility"> <enum name="GL_CONVOLUTION_1D"/> @@ -32795,6 +33260,14 @@ typedef unsigned int GLhandleARB; <command name="glResetMinmax"/> </require> </extension> + <extension name="GL_ARB_indirect_parameters" supported="gl|glcore"> + <require> + <enum name="GL_PARAMETER_BUFFER_ARB"/> + <enum name="GL_PARAMETER_BUFFER_BINDING_ARB"/> + <command name="glMultiDrawArraysIndirectCountARB"/> + <command name="glMultiDrawElementsIndirectCountARB"/> + </require> + </extension> <extension name="GL_ARB_instanced_arrays" supported="gl"> <require> <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB"/> @@ -32973,6 +33446,16 @@ typedef unsigned int GLhandleARB; <command name="glMatrixIndexPointerARB"/> </require> </extension> + <extension name="GL_ARB_multi_bind" supported="gl|glcore"> + <require> + <command name="glBindBuffersBase"/> + <command name="glBindBuffersRange"/> + <command name="glBindTextures"/> + <command name="glBindSamplers"/> + <command name="glBindImageTextures"/> + <command name="glBindVertexBuffers"/> + </require> + </extension> <extension name="GL_ARB_multi_draw_indirect" supported="gl|glcore"> <require> <command name="glMultiDrawArraysIndirect"/> @@ -33181,6 +33664,14 @@ typedef unsigned int GLhandleARB; <command name="glProvokingVertex"/> </require> </extension> + <extension name="GL_ARB_query_buffer_object" supported="gl|glcore"> + <require> + <enum name="GL_QUERY_BUFFER"/> + <enum name="GL_QUERY_BUFFER_BARRIER_BIT"/> + <enum name="GL_QUERY_BUFFER_BINDING"/> + <enum name="GL_QUERY_RESULT_NO_WAIT"/> + </require> + </extension> <extension name="GL_ARB_robust_buffer_access_behavior" supported="gl|glcore"> <require> </require> @@ -33254,6 +33745,11 @@ typedef unsigned int GLhandleARB; <enum name="GL_TEXTURE_CUBE_MAP_SEAMLESS"/> </require> </extension> + <extension name="GL_ARB_seamless_cubemap_per_texture" supported="gl|glcore"> + <require> + <enum name="GL_TEXTURE_CUBE_MAP_SEAMLESS"/> + </require> + </extension> <extension name="GL_ARB_separate_shader_objects" supported="gl|glcore"> <require> <enum name="GL_VERTEX_SHADER_BIT"/> @@ -33365,6 +33861,10 @@ typedef unsigned int GLhandleARB; <require> </require> </extension> + <extension name="GL_ARB_shader_draw_parameters" supported="gl|glcore"> + </extension> + <extension name="GL_ARB_shader_group_vote" supported="gl|glcore"> + </extension> <extension name="GL_ARB_shader_image_load_store" supported="gl|glcore"> <require> <enum name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT"/> @@ -33611,6 +34111,22 @@ typedef unsigned int GLhandleARB; <enum name="GL_TEXTURE_COMPARE_FAIL_VALUE_ARB"/> </require> </extension> + <extension name="GL_ARB_sparse_texture" supported="gl|glcore"> + <require> + <enum name="GL_TEXTURE_SPARSE_ARB"/> + <enum name="GL_VIRTUAL_PAGE_SIZE_INDEX_ARB"/> + <enum name="GL_MIN_SPARSE_LEVEL_ARB"/> + <enum name="GL_NUM_VIRTUAL_PAGE_SIZES_ARB"/> + <enum name="GL_VIRTUAL_PAGE_SIZE_X_ARB"/> + <enum name="GL_VIRTUAL_PAGE_SIZE_Y_ARB"/> + <enum name="GL_VIRTUAL_PAGE_SIZE_Z_ARB"/> + <enum name="GL_MAX_SPARSE_TEXTURE_SIZE_ARB"/> + <enum name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB"/> + <enum name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB"/> + <enum name="GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB"/> + <command name="glTexPageCommitmentARB"/> + </require> + </extension> <extension name="GL_ARB_stencil_texturing" supported="gl|glcore"> <require> <enum name="GL_DEPTH_STENCIL_TEXTURE_MODE"/> @@ -33853,6 +34369,11 @@ typedef unsigned int GLhandleARB; <enum name="GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB"/> </require> </extension> + <extension name="GL_ARB_texture_mirror_clamp_to_edge" supported="gl|glcore"> + <require> + <enum name="GL_MIRROR_CLAMP_TO_EDGE"/> + </require> + </extension> <extension name="GL_ARB_texture_mirrored_repeat" supported="gl"> <require> <enum name="GL_MIRRORED_REPEAT_ARB"/> @@ -33938,6 +34459,12 @@ typedef unsigned int GLhandleARB; <enum name="GL_RGB10_A2UI"/> </require> </extension> + <extension name="GL_ARB_texture_stencil8" supported="gl|glcore"> + <require> + <enum name="GL_STENCIL_INDEX"/> + <enum name="GL_STENCIL_INDEX8"/> + </require> + </extension> <extension name="GL_ARB_texture_storage" supported="gl|glcore"> <require> <enum name="GL_TEXTURE_IMMUTABLE_FORMAT"/> @@ -34383,9 +34910,76 @@ typedef unsigned int GLhandleARB; <enum name="GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB"/> <enum name="GL_OBJECT_ACTIVE_ATTRIBUTES_ARB"/> <enum name="GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB"/> + <enum name="GL_MAX_VERTEX_ATTRIBS_ARB"/> + <enum name="GL_MAX_TEXTURE_IMAGE_UNITS_ARB"/> + <enum name="GL_MAX_TEXTURE_COORDS_ARB"/> + <enum name="GL_VERTEX_PROGRAM_POINT_SIZE_ARB"/> + <enum name="GL_VERTEX_PROGRAM_TWO_SIDE_ARB"/> + <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB"/> + <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB"/> + <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB"/> + <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB"/> + <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB"/> + <enum name="GL_CURRENT_VERTEX_ATTRIB_ARB"/> + <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB"/> + <enum name="GL_FLOAT"/> + <enum name="GL_FLOAT_VEC2_ARB"/> + <enum name="GL_FLOAT_VEC3_ARB"/> + <enum name="GL_FLOAT_VEC4_ARB"/> + <enum name="GL_FLOAT_MAT2_ARB"/> + <enum name="GL_FLOAT_MAT3_ARB"/> + <enum name="GL_FLOAT_MAT4_ARB"/> + <command name="glVertexAttrib1fARB"/> + <command name="glVertexAttrib1sARB"/> + <command name="glVertexAttrib1dARB"/> + <command name="glVertexAttrib2fARB"/> + <command name="glVertexAttrib2sARB"/> + <command name="glVertexAttrib2dARB"/> + <command name="glVertexAttrib3fARB"/> + <command name="glVertexAttrib3sARB"/> + <command name="glVertexAttrib3dARB"/> + <command name="glVertexAttrib4fARB"/> + <command name="glVertexAttrib4sARB"/> + <command name="glVertexAttrib4dARB"/> + <command name="glVertexAttrib4NubARB"/> + <command name="glVertexAttrib1fvARB"/> + <command name="glVertexAttrib1svARB"/> + <command name="glVertexAttrib1dvARB"/> + <command name="glVertexAttrib2fvARB"/> + <command name="glVertexAttrib2svARB"/> + <command name="glVertexAttrib2dvARB"/> + <command name="glVertexAttrib3fvARB"/> + <command name="glVertexAttrib3svARB"/> + <command name="glVertexAttrib3dvARB"/> + <command name="glVertexAttrib4fvARB"/> + <command name="glVertexAttrib4svARB"/> + <command name="glVertexAttrib4dvARB"/> + <command name="glVertexAttrib4ivARB"/> + <command name="glVertexAttrib4bvARB"/> + <command name="glVertexAttrib4ubvARB"/> + <command name="glVertexAttrib4usvARB"/> + <command name="glVertexAttrib4uivARB"/> + <command name="glVertexAttrib4NbvARB"/> + <command name="glVertexAttrib4NsvARB"/> + <command name="glVertexAttrib4NivARB"/> + <command name="glVertexAttrib4NubvARB"/> + <command name="glVertexAttrib4NusvARB"/> + <command name="glVertexAttrib4NuivARB"/> + <command name="glVertexAttribPointerARB"/> + <command name="glEnableVertexAttribArrayARB"/> + <command name="glDisableVertexAttribArrayARB"/> <command name="glBindAttribLocationARB"/> <command name="glGetActiveAttribARB"/> <command name="glGetAttribLocationARB"/> + <command name="glGetVertexAttribdvARB"/> + <command name="glGetVertexAttribfvARB"/> + <command name="glGetVertexAttribivARB"/> + <command name="glGetVertexAttribPointervARB"/> + </require> + </extension> + <extension name="GL_ARB_vertex_type_10f_11f_11f_rev" supported="gl|glcore"> + <require> + <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/> </require> </extension> <extension name="GL_ARB_vertex_type_2_10_10_10_rev" supported="gl|glcore"> @@ -35289,7 +35883,7 @@ typedef unsigned int GLhandleARB; <command name="glGetDoublei_vEXT"/> <command name="glGetPointeri_vEXT"/> </require> - <require comment="Extend ARB_vertex_program commands"> + <require comment="Extend GL_ARB_vertex_program commands"> <command name="glNamedProgramStringEXT"/> <command name="glNamedProgramLocalParameter4dEXT"/> <command name="glNamedProgramLocalParameter4dvEXT"/> @@ -35369,15 +35963,15 @@ typedef unsigned int GLhandleARB; <command name="glMapNamedBufferRangeEXT"/> <command name="glFlushMappedNamedBufferRangeEXT"/> </require> - <require comment="Extend GL_ARB_clear_buffer_object"> + <require comment="Extended by GL_ARB_clear_buffer_object"> <command name="glClearNamedBufferDataEXT"/> <command name="glClearNamedBufferSubDataEXT"/> </require> - <require comment="Extend GL_ARB_framebuffer_no_attachments"> + <require comment="Extended by GL_ARB_framebuffer_no_attachments"> <command name="glNamedFramebufferParameteriEXT"/> <command name="glGetNamedFramebufferParameterivEXT"/> </require> - <require comment="Extend GL_ARB_gpu_shader_fp64"> + <require comment="Extended by GL_ARB_gpu_shader_fp64"> <command name="glProgramUniform1dEXT"/> <command name="glProgramUniform2dEXT"/> <command name="glProgramUniform3dEXT"/> @@ -35396,19 +35990,19 @@ typedef unsigned int GLhandleARB; <command name="glProgramUniformMatrix4x2dvEXT"/> <command name="glProgramUniformMatrix4x3dvEXT"/> </require> - <require comment="Extend GL_ARB_texture_buffer_range"> + <require comment="Extended by GL_ARB_texture_buffer_range"> <command name="glTextureBufferRangeEXT"/> </require> - <require comment="Extend GL_ARB_texture_storage"> + <require comment="Extended by GL_ARB_texture_storage"> <command name="glTextureStorage1DEXT"/> <command name="glTextureStorage2DEXT"/> <command name="glTextureStorage3DEXT"/> </require> - <require comment="Extend GL_ARB_texture_storage_multisample"> + <require comment="Extended by GL_ARB_texture_storage_multisample"> <command name="glTextureStorage2DMultisampleEXT"/> <command name="glTextureStorage3DMultisampleEXT"/> </require> - <require comment="Extend GL_ARB_vertex_attrib_binding"> + <require comment="Extended by GL_ARB_vertex_attrib_binding"> <command name="glVertexArrayBindVertexBufferEXT"/> <command name="glVertexArrayVertexAttribFormatEXT"/> <command name="glVertexArrayVertexAttribIFormatEXT"/> @@ -35416,9 +36010,12 @@ typedef unsigned int GLhandleARB; <command name="glVertexArrayVertexAttribBindingEXT"/> <command name="glVertexArrayVertexBindingDivisorEXT"/> </require> - <require comment="Extend GL_EXT_vertex_attrib_64bit"> + <require comment="Extended by GL_EXT_vertex_attrib_64bit"> <command name="glVertexArrayVertexAttribLOffsetEXT"/> </require> + <require comment="Extended by GL_ARB_sparse_texture"> + <command name="glTexturePageCommitmentEXT"/> + </require> </extension> <extension name="GL_EXT_discard_framebuffer" supported="gles1|gles2"> <require> @@ -35437,7 +36034,6 @@ typedef unsigned int GLhandleARB; <enum name="GL_TIME_ELAPSED_EXT"/> <enum name="GL_TIMESTAMP_EXT"/> <enum name="GL_GPU_DISJOINT_EXT"/> - <command name="glDiscardFramebufferEXT"/> <command name="glGenQueriesEXT"/> <command name="glDeleteQueriesEXT"/> <command name="glIsQueryEXT"/> @@ -37133,6 +37729,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_BUFFER"/> <enum name="GL_SHADER"/> <enum name="GL_PROGRAM"/> + <enum name="GL_VERTEX_ARRAY"/> <enum name="GL_QUERY"/> <enum name="GL_SAMPLER"/> <enum name="GL_MAX_LABEL_LENGTH"/> @@ -37184,6 +37781,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_BUFFER_KHR"/> <enum name="GL_SHADER_KHR"/> <enum name="GL_PROGRAM_KHR"/> + <enum name="GL_VERTEX_ARRAY_KHR"/> <enum name="GL_QUERY_KHR"/> <enum name="GL_SAMPLER_KHR"/> <enum name="GL_MAX_LABEL_LENGTH_KHR"/> @@ -37309,6 +37907,12 @@ typedef unsigned int GLhandleARB; <command name="glEndConditionalRenderNVX"/> </require> </extension> + <extension name="GL_NV_bindless_multi_draw_indirect" supported="gl"> + <require> + <command name="glMultiDrawArraysIndirectBindlessNV"/> + <command name="glMultiDrawElementsIndirectBindlessNV"/> + </require> + </extension> <extension name="GL_NV_bindless_texture" supported="gl"> <require> <command name="glGetTextureHandleNV"/> @@ -37326,6 +37930,68 @@ typedef unsigned int GLhandleARB; <command name="glIsImageHandleResidentNV"/> </require> </extension> + <extension name="GL_NV_blend_equation_advanced" supported="gl"> + <require> + <enum name="GL_BLEND_ADVANCED_COHERENT_NV"/> + <enum name="GL_BLEND_OVERLAP_NV"/> + <enum name="GL_BLEND_PREMULTIPLIED_SRC_NV"/> + <enum name="GL_BLUE"/> + <enum name="GL_COLORBURN_NV"/> + <enum name="GL_COLORDODGE_NV"/> + <enum name="GL_CONJOINT_NV"/> + <enum name="GL_CONTRAST_NV"/> + <enum name="GL_DARKEN_NV"/> + <enum name="GL_DIFFERENCE_NV"/> + <enum name="GL_DISJOINT_NV"/> + <enum name="GL_DST_ATOP_NV"/> + <enum name="GL_DST_IN_NV"/> + <enum name="GL_DST_NV"/> + <enum name="GL_DST_OUT_NV"/> + <enum name="GL_DST_OVER_NV"/> + <enum name="GL_EXCLUSION_NV"/> + <enum name="GL_GREEN"/> + <enum name="GL_HARDLIGHT_NV"/> + <enum name="GL_HARDMIX_NV"/> + <enum name="GL_HSL_COLOR_NV"/> + <enum name="GL_HSL_HUE_NV"/> + <enum name="GL_HSL_LUMINOSITY_NV"/> + <enum name="GL_HSL_SATURATION_NV"/> + <enum name="GL_INVERT"/> + <enum name="GL_INVERT_OVG_NV"/> + <enum name="GL_INVERT_RGB_NV"/> + <enum name="GL_LIGHTEN_NV"/> + <enum name="GL_LINEARBURN_NV"/> + <enum name="GL_LINEARDODGE_NV"/> + <enum name="GL_LINEARLIGHT_NV"/> + <enum name="GL_MINUS_CLAMPED_NV"/> + <enum name="GL_MINUS_NV"/> + <enum name="GL_MULTIPLY_NV"/> + <enum name="GL_OVERLAY_NV"/> + <enum name="GL_PINLIGHT_NV"/> + <enum name="GL_PLUS_CLAMPED_ALPHA_NV"/> + <enum name="GL_PLUS_CLAMPED_NV"/> + <enum name="GL_PLUS_DARKER_NV"/> + <enum name="GL_PLUS_NV"/> + <enum name="GL_RED"/> + <enum name="GL_SCREEN_NV"/> + <enum name="GL_SOFTLIGHT_NV"/> + <enum name="GL_SRC_ATOP_NV"/> + <enum name="GL_SRC_IN_NV"/> + <enum name="GL_SRC_NV"/> + <enum name="GL_SRC_OUT_NV"/> + <enum name="GL_SRC_OVER_NV"/> + <enum name="GL_UNCORRELATED_NV"/> + <enum name="GL_VIVIDLIGHT_NV"/> + <enum name="GL_XOR"/> + <enum name="GL_ZERO"/> + <command name="glBlendParameteriNV"/> + <command name="glBlendBarrierNV"/> + </require> + </extension> + <extension name="GL_NV_blend_equation_advanced_coherent" supported="gl"> + <require comment="Identical to GL_NV_blend_equation_advanced, just different semantic behavior"> + </require> + </extension> <extension name="GL_NV_blend_square" supported="gl"> <require> </require> @@ -37699,6 +38365,10 @@ typedef unsigned int GLhandleARB; <command name="glGetProgramSubroutineParameteruivNV"/> </require> </extension> + <extension name="GL_NV_gpu_program5_mem_extended" supported="gl"> + <require> + </require> + </extension> <extension name="GL_NV_gpu_shader5" supported="gl"> <require> <enum name="GL_INT64_NV"/> @@ -38484,11 +39154,6 @@ typedef unsigned int GLhandleARB; <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_NV"/> <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV"/> <enum name="GL_LAYER_NV"/> - <enum name="GL_NEXT_BUFFER_NV"/> - <enum name="GL_SKIP_COMPONENTS4_NV"/> - <enum name="GL_SKIP_COMPONENTS3_NV"/> - <enum name="GL_SKIP_COMPONENTS2_NV"/> - <enum name="GL_SKIP_COMPONENTS1_NV"/> <command name="glBeginTransformFeedbackNV"/> <command name="glEndTransformFeedbackNV"/> <command name="glTransformFeedbackAttribsNV"/> @@ -38500,6 +39165,13 @@ typedef unsigned int GLhandleARB; <command name="glGetVaryingLocationNV"/> <command name="glGetActiveVaryingNV"/> <command name="glGetTransformFeedbackVaryingNV"/> + </require> + <require comment="Extended by GL_ARB_transform_feedback3"> + <enum name="GL_NEXT_BUFFER_NV"/> + <enum name="GL_SKIP_COMPONENTS4_NV"/> + <enum name="GL_SKIP_COMPONENTS3_NV"/> + <enum name="GL_SKIP_COMPONENTS2_NV"/> + <enum name="GL_SKIP_COMPONENTS1_NV"/> <command name="glTransformFeedbackStreamAttribsNV"/> </require> </extension> 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 <windows.h> #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); |