diff options
| author | Eric Anholt <eric@anholt.net> | 2014-01-20 09:28:28 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-01-20 09:29:16 -0800 |
| commit | 8067f15e97573c053bd28e1a18f70d02a4192513 (patch) | |
| tree | 59f69ba9e89d94d53da1cb6369b7d416eb013069 | |
| parent | cfdb26c2a47dd2659e5a9e76480f43150304ce48 (diff) | |
| parent | 46ad30c54f4c4c3290c5ca1740b4919feec16230 (diff) | |
Merge branch 'registry'
Conflicts:
registry/egl.xml
registry/gl.xml
The only diff we now have from the source is glUnmapBufferOES()'s
alias to normal glUnmapBuffer().
| -rw-r--r-- | registry/egl.xml | 89 | ||||
| -rw-r--r-- | registry/gl.xml | 1208 | ||||
| -rw-r--r-- | registry/glx.xml | 13 |
3 files changed, 918 insertions, 392 deletions
diff --git a/registry/egl.xml b/registry/egl.xml index 0a32280..9b0c9a3 100644 --- a/registry/egl.xml +++ b/registry/egl.xml @@ -52,6 +52,7 @@ <!-- These are actual EGL types. --> <type>typedef unsigned int <name>EGLBoolean</name>;</type> <type>typedef unsigned int <name>EGLenum</name>;</type> + <type requires="khrplatform">typedef intptr_t <name>EGLAttribKHR</name>;</type> <type>typedef void *<name>EGLConfig</name>;</type> <type>typedef void *<name>EGLContext</name>;</type> <type>typedef void *<name>EGLDisplay</name>;</type> @@ -269,8 +270,10 @@ <enum value="0x3088" name="EGL_ALPHA_FORMAT" alias="EGL_VG_ALPHA_FORMAT"/> <enum value="0x3088" name="EGL_VG_ALPHA_FORMAT"/> <enum value="0x3089" name="EGL_COLORSPACE_sRGB" alias="EGL_VG_COLORSPACE_sRGB"/> + <enum value="0x3089" name="EGL_GL_COLORSPACE_SRGB_KHR" alias="EGL_VG_COLORSPACE_sRGB"/> <enum value="0x3089" name="EGL_VG_COLORSPACE_sRGB"/> <enum value="0x308A" name="EGL_COLORSPACE_LINEAR" alias="EGL_VG_COLORSPACE_LINEAR"/> + <enum value="0x308A" name="EGL_GL_COLORSPACE_LINEAR_KHR" alias="EGL_VG_COLORSPACE_LINEAR"/> <enum value="0x308A" name="EGL_VG_COLORSPACE_LINEAR"/> <enum value="0x308B" name="EGL_ALPHA_FORMAT_NONPRE" alias="EGL_VG_ALPHA_FORMAT_NONPRE"/> <enum value="0x308B" name="EGL_VG_ALPHA_FORMAT_NONPRE"/> @@ -293,7 +296,8 @@ <enum value="0x309A" name="EGL_MULTISAMPLE_RESOLVE_DEFAULT"/> <enum value="0x309B" name="EGL_MULTISAMPLE_RESOLVE_BOX"/> <enum value="0x309C" name="EGL_CL_EVENT_HANDLE_KHR"/> - <unused start="0x309D" end="0x309F"/> + <enum value="0x309D" name="EGL_GL_COLORSPACE_KHR"/> + <unused start="0x309E" end="0x309F" comment="Placeholders for draft extensions follow"/> <enum value="0x30A0" name="EGL_OPENGL_ES_API"/> <enum value="0x30A1" name="EGL_OPENVG_API"/> <enum value="0x30A2" name="EGL_OPENGL_API"/> @@ -462,7 +466,9 @@ <enum value="0x31D4" name="EGL_DRM_BUFFER_STRIDE_MESA"/> <enum value="0x31D5" name="EGL_PLATFORM_X11_EXT"/> <enum value="0x31D6" name="EGL_PLATFORM_X11_SCREEN_EXT"/> - <unused start="0x31D5" end="0x31DF"/> + <enum value="0x31D7" name="EGL_PLATFORM_GBM_MESA"/> + <enum value="0x31D8" name="EGL_PLATFORM_WAYLAND_EXT"/> + <unused start="0x31D9" end="0x31DF"/> </enums> <enums namespace="EGL" start="0x31E0" end="0x31EF" vendor="HI" comment="Reserved for Mark Callow (Khronos bug 6799)"> @@ -721,6 +727,12 @@ <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param> </command> <command> + <proto><ptype>EGLSyncKHR</ptype> <name>eglCreateSync64KHR</name></proto> + <param><ptype>EGLDisplay</ptype> <name>dpy</name></param> + <param><ptype>EGLenum</ptype> <name>type</name></param> + <param>const <ptype>EGLAttribKHR</ptype> *<name>attrib_list</name></param> + </command> + <command> <proto><ptype>EGLSurface</ptype> <name>eglCreateWindowSurface</name></proto> <param><ptype>EGLDisplay</ptype> <name>dpy</name></param> <param><ptype>EGLConfig</ptype> <name>config</name></param> @@ -846,7 +858,7 @@ </command> <command> <proto><ptype>EGLBoolean</ptype> <name>eglLockSurfaceKHR</name></proto> - <param><ptype>EGLDisplay</ptype> <name>display</name></param> + <param><ptype>EGLDisplay</ptype> <name>dpy</name></param> <param><ptype>EGLSurface</ptype> <name>surface</name></param> <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param> </command> @@ -927,6 +939,13 @@ <param><ptype>EGLint</ptype> *<name>value</name></param> </command> <command> + <proto><ptype>EGLBoolean</ptype> <name>eglQuerySurface64KHR</name></proto> + <param><ptype>EGLDisplay</ptype> <name>dpy</name></param> + <param><ptype>EGLSurface</ptype> <name>surface</name></param> + <param><ptype>EGLint</ptype> <name>attribute</name></param> + <param><ptype>EGLAttribKHR</ptype> *<name>value</name></param> + </command> + <command> <proto><ptype>EGLBoolean</ptype> <name>eglQuerySurfacePointerANGLE</name></proto> <param><ptype>EGLDisplay</ptype> <name>dpy</name></param> <param><ptype>EGLSurface</ptype> <name>surface</name></param> @@ -1011,7 +1030,7 @@ </command> <command> <proto><ptype>EGLBoolean</ptype> <name>eglUnlockSurfaceKHR</name></proto> - <param><ptype>EGLDisplay</ptype> <name>display</name></param> + <param><ptype>EGLDisplay</ptype> <name>dpy</name></param> <param><ptype>EGLSurface</ptype> <name>surface</name></param> </command> <command> @@ -1316,6 +1335,11 @@ <command name="eglCreatePlatformPixmapSurfaceEXT"/> </require> </extension> + <extension name="EGL_EXT_platform_wayland" supported="egl"> + <require> + <enum name="EGL_PLATFORM_WAYLAND_EXT"/> + </require> + </extension> <extension name="EGL_EXT_platform_x11" supported="egl"> <require> <enum name="EGL_PLATFORM_X11_EXT"/> @@ -1356,6 +1380,14 @@ <enum name="EGL_SYNC_CL_EVENT_COMPLETE_KHR"/> </require> </extension> + <extension name="EGL_KHR_cl_event2" supported="egl"> + <require> + <enum name="EGL_CL_EVENT_HANDLE_KHR"/> + <enum name="EGL_SYNC_CL_EVENT_KHR"/> + <enum name="EGL_SYNC_CL_EVENT_COMPLETE_KHR"/> + <command name="eglCreateSync64KHR"/> + </require> + </extension> <extension name="EGL_KHR_config_attribs" supported="egl"> <require> <enum name="EGL_CONFORMANT_KHR"/> @@ -1363,6 +1395,10 @@ <enum name="EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR"/> </require> </extension> + <extension name="EGL_KHR_client_get_all_proc_addresses" supported="egl" comment="Alias of EGL_KHR_get_all_proc_addresses"> + <require> + </require> + </extension> <extension name="EGL_KHR_create_context" supported="egl"> <require> <enum name="EGL_CONTEXT_MAJOR_VERSION_KHR"/> @@ -1392,6 +1428,13 @@ <require> </require> </extension> + <extension name="EGL_KHR_gl_colorspace" supported="egl"> + <require> + <enum name="EGL_GL_COLORSPACE_KHR"/> + <enum name="EGL_GL_COLORSPACE_SRGB_KHR"/> + <enum name="EGL_GL_COLORSPACE_LINEAR_KHR"/> + </require> + </extension> <extension name="EGL_KHR_gl_renderbuffer_image" supported="egl"> <require> <enum name="EGL_GL_RENDERBUFFER_KHR"/> @@ -1429,15 +1472,15 @@ </extension> <extension name="EGL_KHR_image_base" supported="egl"> <require> - <!-- @ Most interfaces defined by EGL_KHR_image above --> <enum name="EGL_IMAGE_PRESERVED_KHR"/> + <enum name="EGL_NO_IMAGE_KHR"/> <command name="eglCreateImageKHR"/> <command name="eglDestroyImageKHR"/> </require> </extension> <extension name="EGL_KHR_image_pixmap" supported="egl"> <require> - <!-- @ Most interfaces defined by EGL_KHR_image above --> + <enum name="EGL_NATIVE_PIXMAP_KHR"/> </require> </extension> <extension name="EGL_KHR_lock_surface" supported="egl"> @@ -1472,6 +1515,35 @@ <enum name="EGL_BITMAP_PIXEL_SIZE_KHR"/> </require> </extension> + <extension name="EGL_KHR_lock_surface3" supported="egl"> + <require> + <enum name="EGL_READ_SURFACE_BIT_KHR"/> + <enum name="EGL_WRITE_SURFACE_BIT_KHR"/> + <enum name="EGL_LOCK_SURFACE_BIT_KHR"/> + <enum name="EGL_OPTIMAL_FORMAT_BIT_KHR"/> + <enum name="EGL_MATCH_FORMAT_KHR"/> + <enum name="EGL_FORMAT_RGB_565_EXACT_KHR"/> + <enum name="EGL_FORMAT_RGB_565_KHR"/> + <enum name="EGL_FORMAT_RGBA_8888_EXACT_KHR"/> + <enum name="EGL_FORMAT_RGBA_8888_KHR"/> + <enum name="EGL_MAP_PRESERVE_PIXELS_KHR"/> + <enum name="EGL_LOCK_USAGE_HINT_KHR"/> + <enum name="EGL_BITMAP_PITCH_KHR"/> + <enum name="EGL_BITMAP_ORIGIN_KHR"/> + <enum name="EGL_BITMAP_PIXEL_RED_OFFSET_KHR"/> + <enum name="EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR"/> + <enum name="EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR"/> + <enum name="EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR"/> + <enum name="EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR"/> + <enum name="EGL_BITMAP_PIXEL_SIZE_KHR"/> + <enum name="EGL_BITMAP_POINTER_KHR"/> + <enum name="EGL_LOWER_LEFT_KHR"/> + <enum name="EGL_UPPER_LEFT_KHR"/> + <command name="eglLockSurfaceKHR"/> + <command name="eglUnlockSurfaceKHR"/> + <command name="eglQuerySurface64KHR"/> + </require> + </extension> <extension name="EGL_KHR_reusable_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl"> <require> <enum name="EGL_SYNC_STATUS_KHR"/> @@ -1575,6 +1647,11 @@ <command name="eglExportDRMImageMESA"/> </require> </extension> + <extension name="EGL_MESA_platform_gbm" supported="egl"> + <require> + <enum name="EGL_PLATFORM_GBM_MESA"/> + </require> + </extension> <extension name="EGL_NV_3dvision_surface" supported="egl"> <require> <enum name="EGL_AUTO_STEREO_NV"/> diff --git a/registry/gl.xml b/registry/gl.xml index 73d3dc4..6ae53e2 100644 --- a/registry/gl.xml +++ b/registry/gl.xml @@ -79,7 +79,7 @@ typedef unsigned __int64 uint64_t; <type>typedef unsigned int <name>GLenum</name>;</type> <type>typedef unsigned char <name>GLboolean</name>;</type> <type>typedef unsigned int <name>GLbitfield</name>;</type> - <type>typedef void <name>GLvoid</name>;</type> + <type comment="Not an actual GL type, though used in headers in the past">typedef void <name>GLvoid</name>;</type> <type>typedef signed char <name>GLbyte</name>;</type> <type>typedef short <name>GLshort</name>;</type> <type>typedef int <name>GLint</name>;</type> @@ -304,10 +304,8 @@ typedef unsigned int GLhandleARB; <group name="ColorTableParameterPNameSGI"> <enum name="GL_COLOR_TABLE_BIAS"/> <enum name="GL_COLOR_TABLE_BIAS_SGI"/> - <enum name="GL_COLOR_TABLE_BIAS_SGI"/> <enum name="GL_COLOR_TABLE_SCALE"/> <enum name="GL_COLOR_TABLE_SCALE_SGI"/> - <enum name="GL_COLOR_TABLE_SCALE_SGI"/> </group> <group name="ColorTableTargetSGI"> @@ -548,6 +546,11 @@ typedef unsigned int GLhandleARB; <enum name="GL_TEXTURE_DEFORMATION_SGIX"/> </group> + <group name="FogCoordinatePointerType"> + <enum name="GL_FLOAT"/> + <enum name="GL_DOUBLE"/> + </group> + <group name="FogMode"> <enum name="GL_EXP"/> <enum name="GL_EXP2"/> @@ -565,6 +568,16 @@ typedef unsigned int GLhandleARB; <enum name="GL_FOG_START"/> </group> + <group name="FogPointerTypeEXT"> + <enum name="GL_FLOAT"/> + <enum name="GL_DOUBLE"/> + </group> + + <group name="FogPointerTypeIBM"> + <enum name="GL_FLOAT"/> + <enum name="GL_DOUBLE"/> + </group> + <group name="FragmentLightModelParameterSGIX"> <enum name="GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX"/> <enum name="GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX"/> @@ -1728,6 +1741,14 @@ typedef unsigned int GLhandleARB; <enum name="GL_TRIANGLE_STRIP_ADJACENCY_EXT"/> </group> + <group name="OcclusionQueryEventMaskAMD"> + <enum name="GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD"/> + <enum name="GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD"/> + <enum name="GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD"/> + <enum name="GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD"/> + <enum name="GL_QUERY_ALL_EVENT_BITS_AMD"/> + </group> + <group name="ReadBufferMode"> <enum name="GL_AUX0"/> <enum name="GL_AUX1"/> @@ -2092,6 +2113,14 @@ typedef unsigned int GLhandleARB; <enum value="0xFFFFFFFF" name="GL_ALL_BARRIER_BITS_EXT"/> </enums> + <enums namespace="OcclusionQueryEventMaskAMD"> + <enum value="0x00000001" name="GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD"/> + <enum value="0x00000002" name="GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD"/> + <enum value="0x00000004" name="GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD"/> + <enum value="0x00000008" name="GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD"/> + <enum value="0xFFFFFFFF" name="GL_QUERY_ALL_EVENT_BITS_AMD"/> + </enums> + <enums namespace="GL" group="SyncObjectMask" type="bitmask"> <enum value="0x00000001" name="GL_SYNC_FLUSH_COMMANDS_BIT"/> <enum value="0x00000001" name="GL_SYNC_FLUSH_COMMANDS_BIT_APPLE"/> @@ -2176,6 +2205,11 @@ typedef unsigned int GLhandleARB; <enum value="0x10000000" name="GL_FONT_HAS_KERNING_BIT_NV"/> </enums> + <enums namespace="GL" group="PerformanceQueryCapsMaskINTEL" type="bitmask"> + <enum value="0x00000000" name="GL_PERFQUERY_SINGLE_CONTEXT_INTEL"/> + <enum value="0x00000001" name="GL_PERFQUERY_GLOBAL_CONTEXT_INTEL"/> + </enums> + <enums namespace="GL" group="VertexHintsMaskPGI" type="bitmask"> <enum value="0x00000004" name="GL_VERTEX23_BIT_PGI"/> <enum value="0x00000008" name="GL_VERTEX4_BIT_PGI"/> @@ -2623,6 +2657,7 @@ typedef unsigned int GLhandleARB; <enum value="0x0D30" name="GL_MAX_EVAL_ORDER"/> <enum value="0x0D31" name="GL_MAX_LIGHTS"/> <enum value="0x0D32" name="GL_MAX_CLIP_PLANES"/> + <enum value="0x0D32" name="GL_MAX_CLIP_PLANES_IMG"/> <enum value="0x0D32" name="GL_MAX_CLIP_DISTANCES" alias="GL_MAX_CLIP_PLANES"/> <enum value="0x0D33" name="GL_MAX_TEXTURE_SIZE"/> <enum value="0x0D34" name="GL_MAX_PIXEL_MAP_TABLE"/> @@ -2741,6 +2776,7 @@ typedef unsigned int GLhandleARB; <enum value="0x1504" name="GL_AND_INVERTED"/> <enum value="0x1505" name="GL_NOOP"/> <enum value="0x1506" name="GL_XOR"/> + <enum value="0x1506" name="GL_XOR_NV"/> <enum value="0x1507" name="GL_OR"/> <enum value="0x1508" name="GL_NOR"/> <enum value="0x1509" name="GL_EQUIV"/> @@ -2774,8 +2810,11 @@ typedef unsigned int GLhandleARB; <enum value="0x1902" name="GL_DEPTH_COMPONENT"/> <enum value="0x1903" name="GL_RED"/> <enum value="0x1903" name="GL_RED_EXT"/> + <enum value="0x1903" name="GL_RED_NV"/> <enum value="0x1904" name="GL_GREEN"/> + <enum value="0x1904" name="GL_GREEN_NV"/> <enum value="0x1905" name="GL_BLUE"/> + <enum value="0x1905" name="GL_BLUE_NV"/> <enum value="0x1906" name="GL_ALPHA"/> <enum value="0x1907" name="GL_RGB"/> <enum value="0x1908" name="GL_RGBA"/> @@ -2823,6 +2862,7 @@ typedef unsigned int GLhandleARB; <enum value="0x2402" name="GL_SPHERE_MAP"/> <unused start="0x2403" end="0x24FF" comment="Unused for TextureGenMode"/> <enum value="0x2500" name="GL_TEXTURE_GEN_MODE"/> + <enum value="0x2500" name="GL_TEXTURE_GEN_MODE_OES"/> <enum value="0x2501" name="GL_OBJECT_PLANE"/> <enum value="0x2502" name="GL_EYE_PLANE"/> <unused start="0x2503" end="0x25FF" comment="Unused for TextureGenParameter"/> @@ -2864,16 +2904,22 @@ typedef unsigned int GLhandleARB; <enum value="0x2A2D" name="GL_T4F_C4F_N3F_V4F"/> <unused start="0x2A2E" end="0x2FFF" comment="Unused for InterleavedArrayFormat"/> <enum value="0x3000" name="GL_CLIP_PLANE0"/> + <enum value="0x3000" name="GL_CLIP_PLANE0_IMG"/> <enum value="0x3000" name="GL_CLIP_DISTANCE0" alias="GL_CLIP_PLANE0"/> <enum value="0x3001" name="GL_CLIP_PLANE1"/> + <enum value="0x3001" name="GL_CLIP_PLANE1_IMG"/> <enum value="0x3001" name="GL_CLIP_DISTANCE1" alias="GL_CLIP_PLANE1"/> <enum value="0x3002" name="GL_CLIP_PLANE2"/> + <enum value="0x3002" name="GL_CLIP_PLANE2_IMG"/> <enum value="0x3002" name="GL_CLIP_DISTANCE2" alias="GL_CLIP_PLANE2"/> <enum value="0x3003" name="GL_CLIP_PLANE3"/> + <enum value="0x3003" name="GL_CLIP_PLANE3_IMG"/> <enum value="0x3003" name="GL_CLIP_DISTANCE3" alias="GL_CLIP_PLANE3"/> <enum value="0x3004" name="GL_CLIP_PLANE4"/> + <enum value="0x3004" name="GL_CLIP_PLANE4_IMG"/> <enum value="0x3004" name="GL_CLIP_DISTANCE4" alias="GL_CLIP_PLANE4"/> <enum value="0x3005" name="GL_CLIP_PLANE5"/> + <enum value="0x3005" name="GL_CLIP_PLANE5_IMG"/> <enum value="0x3005" name="GL_CLIP_DISTANCE5" alias="GL_CLIP_PLANE5"/> <enum value="0x3006" name="GL_CLIP_DISTANCE6"/> <enum value="0x3007" name="GL_CLIP_DISTANCE7"/> @@ -3018,6 +3064,7 @@ typedef unsigned int GLhandleARB; <enum value="0x803B" name="GL_ALPHA4_EXT"/> <enum value="0x803C" name="GL_ALPHA8"/> <enum value="0x803C" name="GL_ALPHA8_EXT"/> + <enum value="0x803C" name="GL_ALPHA8_OES"/> <enum value="0x803D" name="GL_ALPHA12"/> <enum value="0x803D" name="GL_ALPHA12_EXT"/> <enum value="0x803E" name="GL_ALPHA16"/> @@ -3026,16 +3073,19 @@ typedef unsigned int GLhandleARB; <enum value="0x803F" name="GL_LUMINANCE4_EXT"/> <enum value="0x8040" name="GL_LUMINANCE8"/> <enum value="0x8040" name="GL_LUMINANCE8_EXT"/> + <enum value="0x8040" name="GL_LUMINANCE8_OES"/> <enum value="0x8041" name="GL_LUMINANCE12"/> <enum value="0x8041" name="GL_LUMINANCE12_EXT"/> <enum value="0x8042" name="GL_LUMINANCE16"/> <enum value="0x8042" name="GL_LUMINANCE16_EXT"/> <enum value="0x8043" name="GL_LUMINANCE4_ALPHA4"/> <enum value="0x8043" name="GL_LUMINANCE4_ALPHA4_EXT"/> + <enum value="0x8043" name="GL_LUMINANCE4_ALPHA4_OES"/> <enum value="0x8044" name="GL_LUMINANCE6_ALPHA2"/> <enum value="0x8044" name="GL_LUMINANCE6_ALPHA2_EXT"/> <enum value="0x8045" name="GL_LUMINANCE8_ALPHA8"/> <enum value="0x8045" name="GL_LUMINANCE8_ALPHA8_EXT"/> + <enum value="0x8045" name="GL_LUMINANCE8_ALPHA8_OES"/> <enum value="0x8046" name="GL_LUMINANCE12_ALPHA4"/> <enum value="0x8046" name="GL_LUMINANCE12_ALPHA4_EXT"/> <enum value="0x8047" name="GL_LUMINANCE12_ALPHA12"/> @@ -3059,6 +3109,7 @@ typedef unsigned int GLhandleARB; <enum value="0x8050" name="GL_RGB5_EXT"/> <enum value="0x8051" name="GL_RGB8"/> <enum value="0x8051" name="GL_RGB8_EXT"/> + <enum value="0x8051" name="GL_RGB8_OES"/> <enum value="0x8052" name="GL_RGB10"/> <enum value="0x8052" name="GL_RGB10_EXT"/> <enum value="0x8053" name="GL_RGB12"/> @@ -3111,6 +3162,7 @@ typedef unsigned int GLhandleARB; <enum value="0x806A" name="GL_TEXTURE_3D_BINDING_EXT"/> <enum value="0x806A" name="GL_TEXTURE_3D_BINDING_OES"/> <enum value="0x806A" name="GL_TEXTURE_BINDING_3D"/> + <enum value="0x806A" name="GL_TEXTURE_BINDING_3D_OES"/> <enum value="0x806B" name="GL_PACK_SKIP_IMAGES"/> <enum value="0x806B" name="GL_PACK_SKIP_IMAGES_EXT"/> <enum value="0x806C" name="GL_PACK_IMAGE_HEIGHT"/> @@ -3341,6 +3393,7 @@ typedef unsigned int GLhandleARB; <enum value="0x80E0" name="GL_BGR_EXT"/> <enum value="0x80E1" name="GL_BGRA"/> <enum value="0x80E1" name="GL_BGRA_EXT"/> + <enum value="0x80E1" name="GL_BGRA_IMG"/> <enum value="0x80E2" name="GL_COLOR_INDEX1_EXT"/> <enum value="0x80E3" name="GL_COLOR_INDEX2_EXT"/> <enum value="0x80E4" name="GL_COLOR_INDEX4_EXT"/> @@ -3427,6 +3480,7 @@ typedef unsigned int GLhandleARB; <enum value="0x813C" name="GL_TEXTURE_BASE_LEVEL"/> <enum value="0x813C" name="GL_TEXTURE_BASE_LEVEL_SGIS"/> <enum value="0x813D" name="GL_TEXTURE_MAX_LEVEL"/> + <enum value="0x813D" name="GL_TEXTURE_MAX_LEVEL_APPLE"/> <enum value="0x813D" name="GL_TEXTURE_MAX_LEVEL_SGIS"/> <enum value="0x813E" name="GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX"/> <enum value="0x813F" name="GL_PIXEL_TILE_CACHE_INCREMENT_SGIX"/> @@ -3659,6 +3713,7 @@ typedef unsigned int GLhandleARB; <enums namespace="GL" start="0x8210" end="0x823F" vendor="ARB"> <enum value="0x8210" name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING"/> + <enum value="0x8210" name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT"/> <enum value="0x8211" name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE"/> <enum value="0x8211" name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT"/> <enum value="0x8212" name="GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE"/> @@ -3677,7 +3732,7 @@ typedef unsigned int GLhandleARB; <enum value="0x821E" name="GL_CONTEXT_FLAGS"/> <enum value="0x821F" name="GL_BUFFER_IMMUTABLE_STORAGE"/> <enum value="0x8220" name="GL_BUFFER_STORAGE_FLAGS"/> - <unused start="0x8221"/> + <enum value="0x8221" name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED" comment="Proposed for Bug 10364"/> <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"/> @@ -3695,9 +3750,11 @@ typedef unsigned int GLhandleARB; <enum value="0x822D" name="GL_R16F"/> <enum value="0x822D" name="GL_R16F_EXT"/> <enum value="0x822E" name="GL_R32F"/> + <enum value="0x822E" name="GL_R32F_EXT"/> <enum value="0x822F" name="GL_RG16F"/> <enum value="0x822F" name="GL_RG16F_EXT"/> <enum value="0x8230" name="GL_RG32F"/> + <enum value="0x8230" name="GL_RG32F_EXT"/> <enum value="0x8231" name="GL_R8I"/> <enum value="0x8232" name="GL_R8UI"/> <enum value="0x8233" name="GL_R16I"/> @@ -3765,10 +3822,15 @@ typedef unsigned int GLhandleARB; <enum value="0x8251" name="GL_DEBUG_TYPE_OTHER_ARB"/> <enum value="0x8251" name="GL_DEBUG_TYPE_OTHER_KHR"/> <enum value="0x8252" name="GL_LOSE_CONTEXT_ON_RESET_ARB"/> + <enum value="0x8252" name="GL_LOSE_CONTEXT_ON_RESET_EXT"/> <enum value="0x8253" name="GL_GUILTY_CONTEXT_RESET_ARB"/> + <enum value="0x8253" name="GL_GUILTY_CONTEXT_RESET_EXT"/> <enum value="0x8254" name="GL_INNOCENT_CONTEXT_RESET_ARB"/> + <enum value="0x8254" name="GL_INNOCENT_CONTEXT_RESET_EXT"/> <enum value="0x8255" name="GL_UNKNOWN_CONTEXT_RESET_ARB"/> + <enum value="0x8255" name="GL_UNKNOWN_CONTEXT_RESET_EXT"/> <enum value="0x8256" name="GL_RESET_NOTIFICATION_STRATEGY_ARB"/> + <enum value="0x8256" name="GL_RESET_NOTIFICATION_STRATEGY_EXT"/> <enum value="0x8257" name="GL_PROGRAM_BINARY_RETRIEVABLE_HINT"/> <enum value="0x8258" name="GL_PROGRAM_SEPARABLE"/> <enum value="0x8258" name="GL_PROGRAM_SEPARABLE_EXT"/> @@ -3783,12 +3845,13 @@ typedef unsigned int GLhandleARB; <enum value="0x825F" name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX"/> <enum value="0x8260" name="GL_UNDEFINED_VERTEX"/> <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION_ARB"/> + <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION_EXT"/> <enum value="0x8262" name="GL_MAX_COMPUTE_SHARED_MEMORY_SIZE"/> <enum value="0x8263" name="GL_MAX_COMPUTE_UNIFORM_COMPONENTS"/> <enum value="0x8264" name="GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS"/> <enum value="0x8265" name="GL_MAX_COMPUTE_ATOMIC_COUNTERS"/> <enum value="0x8266" name="GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS"/> - <enum value="0x8267" name="GL_COMPUTE_LOCAL_WORK_SIZE"/> + <enum value="0x8267" name="GL_COMPUTE_WORK_GROUP_SIZE"/> <enum value="0x8268" name="GL_DEBUG_TYPE_MARKER"/> <enum value="0x8268" name="GL_DEBUG_TYPE_MARKER_KHR"/> <enum value="0x8269" name="GL_DEBUG_TYPE_PUSH_GROUP"/> @@ -4037,6 +4100,7 @@ typedef unsigned int GLhandleARB; <enum value="0x8364" name="GL_UNSIGNED_SHORT_5_6_5_REV_EXT"/> <enum value="0x8365" name="GL_UNSIGNED_SHORT_4_4_4_4_REV"/> <enum value="0x8365" name="GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT"/> + <enum value="0x8365" name="GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG"/> <enum value="0x8366" name="GL_UNSIGNED_SHORT_1_5_5_5_REV"/> <enum value="0x8366" name="GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT"/> <enum value="0x8367" name="GL_UNSIGNED_INT_8_8_8_8_REV"/> @@ -4124,7 +4188,10 @@ typedef unsigned int GLhandleARB; <enum value="0x83F6" name="GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL"/> <enum value="0x83F7" name="GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL"/> <enum value="0x83F8" name="GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL"/> - <unused start="0x83F9" end="0x83FE"/> + <enum value="0x83F9" name="GL_PERFQUERY_DONOT_FLUSH_INTEL"/> + <enum value="0x83FA" name="GL_PERFQUERY_FLUSH_INTEL"/> + <enum value="0x83FB" name="GL_PERFQUERY_WAIT_INTEL"/> + <unused start="0x83FC" end="0x83FE"/> <enum value="0x83FF" name="GL_TEXTURE_MEMORY_LAYOUT_INTEL"/> </enums> @@ -4668,6 +4735,7 @@ typedef unsigned int GLhandleARB; <enum value="0x85B4" name="GL_STORAGE_CLIENT_APPLE"/> <enum value="0x85B5" name="GL_VERTEX_ARRAY_BINDING"/> <enum value="0x85B5" name="GL_VERTEX_ARRAY_BINDING_APPLE"/> + <enum value="0x85B5" name="GL_VERTEX_ARRAY_BINDING_OES"/> <unused start="0x85B6" comment="Unknown extension (Khronos bug 632)"/> <!-- <enum value="0x85B6" name="GL_TEXTURE_MINIMIZE_STORAGE_APPLE"/> --> <enum value="0x85B7" name="GL_TEXTURE_RANGE_LENGTH_APPLE"/> @@ -5074,7 +5142,7 @@ typedef unsigned int GLhandleARB; <enum value="0x874C" name="GL_STENCIL_OP_VALUE_AMD"/> <enum value="0x874D" name="GL_STENCIL_BACK_OP_VALUE_AMD"/> <enum value="0x874E" name="GL_VERTEX_ATTRIB_ARRAY_LONG"/> - <unused start="0x874F"/> + <enum value="0x874F" name="GL_OCCLUSION_QUERY_EVENT_MASK_AMD"/> </enums> <enums namespace="GL" start="0x8750" end="0x875F" vendor="MESA"> @@ -5287,22 +5355,27 @@ typedef unsigned int GLhandleARB; <unused start="0x8811" end="0x8813"/> <enum value="0x8814" name="GL_RGBA32F"/> <enum value="0x8814" name="GL_RGBA32F_ARB"/> + <enum value="0x8814" name="GL_RGBA32F_EXT"/> <enum value="0x8814" name="GL_RGBA_FLOAT32_APPLE"/> <enum value="0x8814" name="GL_RGBA_FLOAT32_ATI"/> <enum value="0x8815" name="GL_RGB32F"/> <enum value="0x8815" name="GL_RGB32F_ARB"/> + <enum value="0x8815" name="GL_RGB32F_EXT"/> <enum value="0x8815" name="GL_RGB_FLOAT32_APPLE"/> <enum value="0x8815" name="GL_RGB_FLOAT32_ATI"/> <enum value="0x8816" name="GL_ALPHA32F_ARB"/> + <enum value="0x8816" name="GL_ALPHA32F_EXT"/> <enum value="0x8816" name="GL_ALPHA_FLOAT32_APPLE"/> <enum value="0x8816" name="GL_ALPHA_FLOAT32_ATI"/> <enum value="0x8817" name="GL_INTENSITY32F_ARB"/> <enum value="0x8817" name="GL_INTENSITY_FLOAT32_APPLE"/> <enum value="0x8817" name="GL_INTENSITY_FLOAT32_ATI"/> <enum value="0x8818" name="GL_LUMINANCE32F_ARB"/> + <enum value="0x8818" name="GL_LUMINANCE32F_EXT"/> <enum value="0x8818" name="GL_LUMINANCE_FLOAT32_APPLE"/> <enum value="0x8818" name="GL_LUMINANCE_FLOAT32_ATI"/> <enum value="0x8819" name="GL_LUMINANCE_ALPHA32F_ARB"/> + <enum value="0x8819" name="GL_LUMINANCE_ALPHA32F_EXT"/> <enum value="0x8819" name="GL_LUMINANCE_ALPHA_FLOAT32_APPLE"/> <enum value="0x8819" name="GL_LUMINANCE_ALPHA_FLOAT32_ATI"/> <enum value="0x881A" name="GL_RGBA16F"/> @@ -5316,15 +5389,18 @@ typedef unsigned int GLhandleARB; <enum value="0x881B" name="GL_RGB_FLOAT16_APPLE"/> <enum value="0x881B" name="GL_RGB_FLOAT16_ATI"/> <enum value="0x881C" name="GL_ALPHA16F_ARB"/> + <enum value="0x881C" name="GL_ALPHA16F_EXT"/> <enum value="0x881C" name="GL_ALPHA_FLOAT16_APPLE"/> <enum value="0x881C" name="GL_ALPHA_FLOAT16_ATI"/> <enum value="0x881D" name="GL_INTENSITY16F_ARB"/> <enum value="0x881D" name="GL_INTENSITY_FLOAT16_APPLE"/> <enum value="0x881D" name="GL_INTENSITY_FLOAT16_ATI"/> <enum value="0x881E" name="GL_LUMINANCE16F_ARB"/> + <enum value="0x881E" name="GL_LUMINANCE16F_EXT"/> <enum value="0x881E" name="GL_LUMINANCE_FLOAT16_APPLE"/> <enum value="0x881E" name="GL_LUMINANCE_FLOAT16_ATI"/> <enum value="0x881F" name="GL_LUMINANCE_ALPHA16F_ARB"/> + <enum value="0x881F" name="GL_LUMINANCE_ALPHA16F_EXT"/> <enum value="0x881F" name="GL_LUMINANCE_ALPHA_FLOAT16_APPLE"/> <enum value="0x881F" name="GL_LUMINANCE_ALPHA_FLOAT16_ATI"/> <!-- RGBA_FLOAT_MODE_ARB equivalent to TYPE_RGBA_FLOAT_ATI --> @@ -5419,7 +5495,7 @@ typedef unsigned int GLhandleARB; <enum value="0x8834" name="GL_DRAW_BUFFER15_NV"/> <enum value="0x8835" name="GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI"/> <unused start="0x8836"/> - <enum value="0x8837" name="GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI"/> + <enum value="0x8837" name="GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI" comment="Defined by Mesa but not ATI"/> <unused start="0x8838" end="0x883C"/> <enum value="0x883D" name="GL_BLEND_EQUATION_ALPHA"/> <enum value="0x883D" name="GL_BLEND_EQUATION_ALPHA_EXT"/> @@ -5717,6 +5793,7 @@ typedef unsigned int GLhandleARB; <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR"/> <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE"/> <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB"/> + <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT"/> <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV"/> <enum value="0x88FF" name="GL_MAX_ARRAY_TEXTURE_LAYERS"/> <enum value="0x88FF" name="GL_MAX_ARRAY_TEXTURE_LAYERS_EXT"/> @@ -5942,10 +6019,15 @@ typedef unsigned int GLhandleARB; <enum value="0x8A4A" name="GL_SKIP_DECODE_EXT"/> <unused start="0x8A4B" end="0x8A4E"/> <enum value="0x8A4F" name="GL_PROGRAM_PIPELINE_OBJECT_EXT"/> - <unused start="0x8A50" end="0x8A51"/> + <unused start="0x8A50"/> + <enum value="0x8A51" name="GL_RGB_RAW_422_APPLE"/> <enum value="0x8A52" name="GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT"/> <enum value="0x8A53" name="GL_SYNC_OBJECT_APPLE"/> - <unused start="0x8A54" end="0x8A7F"/> + <enum value="0x8A54" name="GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"/> + <enum value="0x8A55" name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/> + <enum value="0x8A56" name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/> + <enum value="0x8A57" name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/> + <unused start="0x8A58" end="0x8A7F"/> </enums> <enums namespace="GL" start="0x8A80" end="0x8AEF" vendor="Matrox"/> @@ -6032,11 +6114,17 @@ typedef unsigned int GLhandleARB; <enum value="0x8B64" name="GL_SAMPLER_2D_RECT_SHADOW"/> <enum value="0x8B64" name="GL_SAMPLER_2D_RECT_SHADOW_ARB"/> <enum value="0x8B65" name="GL_FLOAT_MAT2x3"/> + <enum value="0x8B65" name="GL_FLOAT_MAT2x3_NV"/> <enum value="0x8B66" name="GL_FLOAT_MAT2x4"/> + <enum value="0x8B66" name="GL_FLOAT_MAT2x4_NV"/> <enum value="0x8B67" name="GL_FLOAT_MAT3x2"/> + <enum value="0x8B67" name="GL_FLOAT_MAT3x2_NV"/> <enum value="0x8B68" name="GL_FLOAT_MAT3x4"/> + <enum value="0x8B68" name="GL_FLOAT_MAT3x4_NV"/> <enum value="0x8B69" name="GL_FLOAT_MAT4x2"/> + <enum value="0x8B69" name="GL_FLOAT_MAT4x2_NV"/> <enum value="0x8B6A" name="GL_FLOAT_MAT4x3"/> + <enum value="0x8B6A" name="GL_FLOAT_MAT4x3_NV"/> <unused start="0x8B6B" end="0x8B7F" comment="For attribute types"/> </enums> @@ -6101,9 +6189,8 @@ typedef unsigned int GLhandleARB; <enum value="0x8BB1" name="GL_FRAGMENT_PROGRAM_CALLBACK_MESA"/> <enum value="0x8BB2" name="GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA"/> <enum value="0x8BB3" name="GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA"/> - <enum value="0x8BB4" name="GL_VERTEX_PROGRAM_CALLBACK_MESA"/> - <enum value="0x8BB4" name="GL_VERTEX_PROGRAM_POSITION_MESA" comment="Probably NOT an alias of GL_VERTEX_PROGRAM_CALLBACK_MESA. But spec is not complete anyway."/> - <unused start="0x88B5" comment="One of the 0x88B4 enums should probably have this value"/> + <enum value="0x8BB4" name="GL_VERTEX_PROGRAM_POSITION_MESA"/> + <enum value="0x8BB5" name="GL_VERTEX_PROGRAM_CALLBACK_MESA"/> <enum value="0x8BB6" name="GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA"/> <enum value="0x8BB7" name="GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA"/> </enums> @@ -6186,6 +6273,7 @@ typedef unsigned int GLhandleARB; <enum value="0x8C2A" name="GL_TEXTURE_BUFFER"/> <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_ARB"/> <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_EXT"/> + <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_BINDING" comment="Equivalent to GL_TEXTURE_BUFFER_ARB query, but named more consistently"/> <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE"/> <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE_ARB"/> <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE_EXT"/> @@ -6334,6 +6422,8 @@ typedef unsigned int GLhandleARB; <enum value="0x8CA4" name="GL_STENCIL_BACK_VALUE_MASK"/> <enum value="0x8CA5" name="GL_STENCIL_BACK_WRITEMASK"/> <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING"/> + <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_ANGLE"/> + <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_APPLE"/> <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_EXT"/> <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_NV"/> <enum value="0x8CA6" name="GL_FRAMEBUFFER_BINDING"/> @@ -6346,18 +6436,23 @@ typedef unsigned int GLhandleARB; <enum value="0x8CA7" name="GL_RENDERBUFFER_BINDING_OES"/> <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER"/> <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_ANGLE"/> + <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_APPLE"/> <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_EXT"/> <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_NV"/> <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER"/> <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_ANGLE"/> + <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_APPLE"/> <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_EXT"/> <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_NV"/> <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING"/> + <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_ANGLE"/> + <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_APPLE"/> <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_EXT"/> <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_NV"/> <enum value="0x8CAB" name="GL_RENDERBUFFER_COVERAGE_SAMPLES_NV"/> <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES"/> <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_ANGLE"/> + <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_APPLE"/> <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_EXT"/> <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_NV"/> <enum value="0x8CAC" name="GL_DEPTH_COMPONENT32F"/> @@ -6520,10 +6615,12 @@ typedef unsigned int GLhandleARB; <enum value="0x8D55" name="GL_RENDERBUFFER_STENCIL_SIZE_OES"/> <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/> <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE"/> + <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE"/> <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT"/> <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV"/> <enum value="0x8D57" name="GL_MAX_SAMPLES"/> <enum value="0x8D57" name="GL_MAX_SAMPLES_ANGLE"/> + <enum value="0x8D57" name="GL_MAX_SAMPLES_APPLE"/> <enum value="0x8D57" name="GL_MAX_SAMPLES_EXT"/> <enum value="0x8D57" name="GL_MAX_SAMPLES_NV"/> <unused start="0x8D58" end="0x8D5F"/> @@ -6878,9 +6975,13 @@ typedef unsigned int GLhandleARB; <enum value="0x8E88" name="GL_TESS_CONTROL_SHADER"/> <enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS"/> <enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS"/> + <enum value="0x8E8C" name="GL_COMPRESSED_RGBA_BPTC_UNORM"/> <enum value="0x8E8C" name="GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"/> + <enum value="0x8E8D" name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/> <enum value="0x8E8D" name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"/> + <enum value="0x8E8E" name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT"/> <enum value="0x8E8E" name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB"/> + <enum value="0x8E8F" name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT"/> <enum value="0x8E8F" name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB"/> </enums> @@ -6930,8 +7031,10 @@ typedef unsigned int GLhandleARB; <enum value="0x8F34" name="GL_GPU_ADDRESS_NV"/> <enum value="0x8F35" name="GL_MAX_SHADER_BUFFER_ADDRESS_NV"/> <enum value="0x8F36" name="GL_COPY_READ_BUFFER"/> + <enum value="0x8F36" name="GL_COPY_READ_BUFFER_NV"/> <enum value="0x8F36" name="GL_COPY_READ_BUFFER_BINDING" alias="GL_COPY_READ_BUFFER"/> <enum value="0x8F37" name="GL_COPY_WRITE_BUFFER"/> + <enum value="0x8F37" name="GL_COPY_WRITE_BUFFER_NV"/> <enum value="0x8F37" name="GL_COPY_WRITE_BUFFER_BINDING" alias="GL_COPY_WRITE_BUFFER"/> <enum value="0x8F38" name="GL_MAX_IMAGE_UNITS"/> <enum value="0x8F38" name="GL_MAX_IMAGE_UNITS_EXT"/> @@ -7315,8 +7418,8 @@ 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="0x90EB" name="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/> + <enum value="0x90EB" name="GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB" alias="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/> <enum value="0x90EC" name="GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER"/> <enum value="0x90ED" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER"/> <enum value="0x90EE" name="GL_DISPATCH_INDIRECT_BUFFER"/> @@ -7324,7 +7427,8 @@ typedef unsigned int GLhandleARB; <enum value="0x90F0" name="GL_COLOR_ATTACHMENT_EXT"/> <enum value="0x90F1" name="GL_MULTIVIEW_EXT"/> <enum value="0x90F2" name="GL_MAX_MULTIVIEW_BUFFERS_EXT"/> - <unused start="0x90F3" end="0x90FA"/> + <enum value="0x90F3" name="GL_CONTEXT_ROBUST_ACCESS_EXT"/> + <unused start="0x90F4" end="0x90FA"/> <enum value="0x90FB" name="GL_COMPUTE_PROGRAM_NV"/> <enum value="0x90FC" name="GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV"/> <unused start="0x90FD" end="0x90FF"/> @@ -7391,6 +7495,7 @@ typedef unsigned int GLhandleARB; <enum value="0x912D" name="GL_PACK_COMPRESSED_BLOCK_DEPTH"/> <enum value="0x912E" name="GL_PACK_COMPRESSED_BLOCK_SIZE"/> <enum value="0x912F" name="GL_TEXTURE_IMMUTABLE_FORMAT"/> + <enum value="0x912F" name="GL_TEXTURE_IMMUTABLE_FORMAT_EXT"/> </enums> <enums namespace="GL" start="0x9130" end="0x913F" vendor="IMG" comment="Khronos bug 882"> @@ -7488,8 +7593,8 @@ typedef unsigned int GLhandleARB; <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"/> + <enum value="0x91BF" name="GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB" alias="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/> <unused start="0x91C0" end="0x923F"/> </enums> @@ -7696,7 +7801,7 @@ typedef unsigned int GLhandleARB; <enums namespace="GL" start="0x93A0" end="0x93AF" vendor="ANGLE" comment="Khronos bug 8100"> <enum value="0x93A0" name="GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE"/> - <unused start="0x93A1"/> + <enum value="0x93A1" name="GL_BGRA8_EXT"/> <enum value="0x93A2" name="GL_TEXTURE_USAGE_ANGLE"/> <enum value="0x93A3" name="GL_FRAMEBUFFER_ATTACHMENT_ANGLE"/> <enum value="0x93A4" name="GL_PACK_REVERSE_ROW_ORDER_ANGLE"/> @@ -7720,7 +7825,18 @@ typedef unsigned int GLhandleARB; <enum value="0x93BB" name="GL_COMPRESSED_RGBA_ASTC_10x10_KHR"/> <enum value="0x93BC" name="GL_COMPRESSED_RGBA_ASTC_12x10_KHR"/> <enum value="0x93BD" name="GL_COMPRESSED_RGBA_ASTC_12x12_KHR"/> - <unused start="0x93BE" end="0x93CF"/> + <unused start="0x93BE" end="0x93BF"/> + <enum value="0x93C0" name="GL_COMPRESSED_RGBA_ASTC_3x3x3_OES"/> + <enum value="0x93C1" name="GL_COMPRESSED_RGBA_ASTC_4x3x3_OES"/> + <enum value="0x93C2" name="GL_COMPRESSED_RGBA_ASTC_4x4x3_OES"/> + <enum value="0x93C3" name="GL_COMPRESSED_RGBA_ASTC_4x4x4_OES"/> + <enum value="0x93C4" name="GL_COMPRESSED_RGBA_ASTC_5x4x4_OES"/> + <enum value="0x93C5" name="GL_COMPRESSED_RGBA_ASTC_5x5x4_OES"/> + <enum value="0x93C6" name="GL_COMPRESSED_RGBA_ASTC_5x5x5_OES"/> + <enum value="0x93C7" name="GL_COMPRESSED_RGBA_ASTC_6x5x5_OES"/> + <enum value="0x93C8" name="GL_COMPRESSED_RGBA_ASTC_6x6x5_OES"/> + <enum value="0x93C9" name="GL_COMPRESSED_RGBA_ASTC_6x6x6_OES"/> + <unused start="0x93CA" end="0x93CF"/> <enum value="0x93D0" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"/> <enum value="0x93D1" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"/> <enum value="0x93D2" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"/> @@ -7735,13 +7851,44 @@ typedef unsigned int GLhandleARB; <enum value="0x93DB" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"/> <enum value="0x93DC" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"/> <enum value="0x93DD" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"/> - <unused start="0x93DE" end="0x93EF"/> + <unused start="0x93DE" end="0x93DF"/> + <enum value="0x93E0" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES"/> + <enum value="0x93E1" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES"/> + <enum value="0x93E2" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES"/> + <enum value="0x93E3" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES"/> + <enum value="0x93E4" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES"/> + <enum value="0x93E5" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES"/> + <enum value="0x93E6" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES"/> + <enum value="0x93E7" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES"/> + <enum value="0x93E8" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES"/> + <enum value="0x93E9" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES"/> + <unused start="0x93EA" end="0x93EF"/> </enums> <enums namespace="GL" start="0x93F0" end="0x94EF" vendor="APPLE" comment="Khronos bug 10233"> <unused start="0x93F0" end="0x94EF"/> </enums> + <enums namespace="GL" start="0x94F0" end="0x950F" vendor="INTEL" comment="Khronos bug 11345"> + <enum value="0x94F0" name="GL_PERFQUERY_COUNTER_EVENT_INTEL"/> + <enum value="0x94F1" name="GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL"/> + <enum value="0x94F2" name="GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL"/> + <enum value="0x94F3" name="GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL"/> + <enum value="0x94F4" name="GL_PERFQUERY_COUNTER_RAW_INTEL"/> + <enum value="0x94F5" name="GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL"/> + <unused start="0x94F6" end="0x94F7"/> + <enum value="0x94F8" name="GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL"/> + <enum value="0x94F9" name="GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL"/> + <enum value="0x94FA" name="GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL"/> + <enum value="0x94FB" name="GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL"/> + <enum value="0x94FC" name="GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL"/> + <enum value="0x94FD" name="GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL"/> + <enum value="0x94FE" name="GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL"/> + <enum value="0x94FF" name="GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL"/> + <enum value="0x9500" name="GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL"/> + <unused start="0x9501" end="0x950F"/> + </enums> + <!-- Enums reservable for future use. To reserve a new range, allocate one or more multiples of 16 starting at the lowest available point in this block and note it in a new <enums> block immediately above. @@ -7751,8 +7898,8 @@ typedef unsigned int GLhandleARB; file) File requests in the Khronos Bugzilla, OpenGL project, Registry component. --> - <enums namespace="GL" start="0x94F0" end="99999" vendor="ARB" comment="RESERVED FOR FUTURE ALLOCATIONS BY KHRONOS"> - <unused start="0x94F0" end="99999"/> + <enums namespace="GL" start="0x9510" end="99999" vendor="ARB" comment="RESERVED FOR FUTURE ALLOCATIONS BY KHRONOS"> + <unused start="0x9510" end="99999"/> </enums> <!-- Historical large block allocations, all unused except (in older days) by IBM --> @@ -7816,57 +7963,6 @@ typedef unsigned int GLhandleARB; <enums namespace="GL" start="108000" end="108999" vendor="ES" comment="Evans and Sutherland is out of the graphics hardware business"/> - <enums namespace="GL" comment="required for ES[123] core API - needs sorting"> - <!-- required enums for ES[123] - core API --> - <enum value="0x0D32" name="GL_MAX_CLIP_PLANES_IMG"/> - <enum value="0x2500" name="GL_TEXTURE_GEN_MODE_OES"/> - <enum value="0x3000" name="GL_CLIP_PLANE0_IMG"/> - <enum value="0x3001" name="GL_CLIP_PLANE1_IMG"/> - <enum value="0x3002" name="GL_CLIP_PLANE2_IMG"/> - <enum value="0x3003" name="GL_CLIP_PLANE3_IMG"/> - <enum value="0x3004" name="GL_CLIP_PLANE4_IMG"/> - <enum value="0x3005" name="GL_CLIP_PLANE5_IMG"/> - <enum value="0x803C" name="GL_ALPHA8_OES"/> - <enum value="0x8040" name="GL_LUMINANCE8_OES"/> - <enum value="0x8043" name="GL_LUMINANCE4_ALPHA4_OES"/> - <enum value="0x8045" name="GL_LUMINANCE8_ALPHA8_OES"/> - <enum value="0x8051" name="GL_RGB8_OES"/> - <enum value="0x806A" name="GL_TEXTURE_BINDING_3D_OES"/> - <enum value="0x80E1" name="GL_BGRA_IMG"/> - <enum value="0x813D" name="GL_TEXTURE_MAX_LEVEL_APPLE"/> - <enum value="0x8210" name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT"/> - <enum value="0x822E" name="GL_R32F_EXT"/> - <enum value="0x8230" name="GL_RG32F_EXT"/> - <enum value="0x8252" name="GL_LOSE_CONTEXT_ON_RESET_EXT"/> - <enum value="0x8253" name="GL_GUILTY_CONTEXT_RESET_EXT"/> - <enum value="0x8254" name="GL_INNOCENT_CONTEXT_RESET_EXT"/> - <enum value="0x8255" name="GL_UNKNOWN_CONTEXT_RESET_EXT"/> - <enum value="0x8256" name="GL_RESET_NOTIFICATION_STRATEGY_EXT"/> - <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION_EXT"/> - <enum value="0x8365" name="GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG"/> - <enum value="0x85B5" name="GL_VERTEX_ARRAY_BINDING_OES"/> - <enum value="0x8814" name="GL_RGBA32F_EXT"/> - <enum value="0x8815" name="GL_RGB32F_EXT"/> - <enum value="0x8816" name="GL_ALPHA32F_EXT"/> - <enum value="0x8818" name="GL_LUMINANCE32F_EXT"/> - <enum value="0x8819" name="GL_LUMINANCE_ALPHA32F_EXT"/> - <enum value="0x881C" name="GL_ALPHA16F_EXT"/> - <enum value="0x881E" name="GL_LUMINANCE16F_EXT"/> - <enum value="0x881F" name="GL_LUMINANCE_ALPHA16F_EXT"/> - <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_ANGLE"/> - <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_APPLE"/> - <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_APPLE"/> - <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_APPLE"/> - <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_ANGLE"/> - <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_APPLE"/> - <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_APPLE"/> - <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE"/> - <enum value="0x8D57" name="GL_MAX_SAMPLES_APPLE"/> - <enum value="0x90F3" name="GL_CONTEXT_ROBUST_ACCESS_EXT"/> - <enum value="0x912F" name="GL_TEXTURE_IMMUTABLE_FORMAT_EXT"/> - <enum value="0x93A1" name="GL_BGRA8_EXT"/> - </enums> - <!-- SECTION: GL command definitions. --> <commands namespace="GL"> <command> @@ -8063,6 +8159,10 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>monitor</name></param> </command> <command> + <proto>void <name>glBeginPerfQueryINTEL</name></proto> + <param><ptype>GLuint</ptype> <name>queryHandle</name></param> + </command> + <command> <proto>void <name>glBeginQuery</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLuint</ptype> <name>id</name></param> @@ -8489,7 +8589,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glBinormalPointerEXT</name></proto> <param group="BinormalPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glBitmap</name></proto> @@ -8766,14 +8866,14 @@ typedef unsigned int GLhandleARB; <proto>void <name>glBufferData</name></proto> <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param> - <param len="size">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param len="size">const void *<name>data</name></param> <param group="BufferUsageARB"><ptype>GLenum</ptype> <name>usage</name></param> </command> <command> <proto>void <name>glBufferDataARB</name></proto> <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferSizeARB"><ptype>GLsizeiptrARB</ptype> <name>size</name></param> - <param len="size">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param len="size">const void *<name>data</name></param> <param group="BufferUsageARB"><ptype>GLenum</ptype> <name>usage</name></param> <alias name="glBufferData"/> </command> @@ -8795,14 +8895,14 @@ typedef unsigned int GLhandleARB; <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param> <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param> - <param len="size">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param len="size">const void *<name>data</name></param> </command> <command> <proto>void <name>glBufferSubDataARB</name></proto> <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferOffsetARB"><ptype>GLintptrARB</ptype> <name>offset</name></param> <param group="BufferSizeARB"><ptype>GLsizeiptrARB</ptype> <name>size</name></param> - <param len="size">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param len="size">const void *<name>data</name></param> <alias name="glBufferSubData"/> </command> <command> @@ -8814,7 +8914,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glCallLists</name></proto> <param><ptype>GLsizei</ptype> <name>n</name></param> <param group="ListNameType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(n,type)">const <ptype>GLvoid</ptype> *<name>lists</name></param> + <param len="COMPSIZE(n,type)">const void *<name>lists</name></param> <glx type="render" opcode="2"/> </command> <command> @@ -8996,10 +9096,10 @@ typedef unsigned int GLhandleARB; <proto>void <name>glClearNamedBufferSubDataEXT</name></proto> <param><ptype>GLuint</ptype> <name>buffer</name></param> <param><ptype>GLenum</ptype> <name>internalformat</name></param> - <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> - <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>offset</name></param> <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param> + <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> + <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> <param len="COMPSIZE(format,type)">const void *<name>data</name></param> </command> <command> @@ -9059,11 +9159,6 @@ 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> @@ -9516,7 +9611,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glColorPointerEXT</name></proto> @@ -9524,21 +9619,21 @@ typedef unsigned int GLhandleARB; <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> - <param len="COMPSIZE(size,type,stride,count)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride,count)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glColorPointerListIBM</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLint</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void **<name>pointer</name></param> <param><ptype>GLint</ptype> <name>ptrstride</name></param> </command> <command> <proto>void <name>glColorPointervINTEL</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="4">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="4">const void **<name>pointer</name></param> </command> <command> <proto>void <name>glColorSubTable</name></proto> @@ -9547,7 +9642,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,count)">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param len="COMPSIZE(format,type,count)">const void *<name>data</name></param> <glx type="render" opcode="195"/> <glx type="render" opcode="312" name="glColorSubTablePBO" comment="PBO protocol"/> </command> @@ -9558,7 +9653,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,count)">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param len="COMPSIZE(format,type,count)">const void *<name>data</name></param> <alias name="glColorSubTable"/> </command> <command> @@ -9568,7 +9663,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>table</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>table</name></param> <glx type="render" opcode="2053"/> <glx type="render" opcode="313" name="glColorTablePBO" comment="PBO protocol"/> </command> @@ -9579,7 +9674,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>table</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>table</name></param> <alias name="glColorTable"/> </command> <command> @@ -9619,7 +9714,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>table</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>table</name></param> <alias name="glColorTable"/> <glx type="render" opcode="2053"/> </command> @@ -9702,7 +9797,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedMultiTexImage2DEXT</name></proto> @@ -9714,7 +9809,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedMultiTexImage3DEXT</name></proto> @@ -9727,7 +9822,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedMultiTexSubImage1DEXT</name></proto> @@ -9738,7 +9833,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedMultiTexSubImage2DEXT</name></proto> @@ -9751,7 +9846,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedMultiTexSubImage3DEXT</name></proto> @@ -9766,7 +9861,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedTexImage1D</name></proto> @@ -9776,7 +9871,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <glx type="render" opcode="214"/> <glx type="render" opcode="314" name="glCompressedTexImage1DPBO" comment="PBO protocol"/> </command> @@ -9788,7 +9883,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <alias name="glCompressedTexImage1D"/> <glx type="render" opcode="214"/> </command> @@ -9801,7 +9896,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <glx type="render" opcode="215"/> <glx type="render" opcode="315" name="glCompressedTexImage2DPBO" comment="PBO protocol"/> </command> @@ -9814,7 +9909,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <alias name="glCompressedTexImage2D"/> <glx type="render" opcode="215"/> </command> @@ -9828,7 +9923,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <glx type="render" opcode="216"/> <glx type="render" opcode="316" name="glCompressedTexImage3DPBO" comment="PBO protocol"/> </command> @@ -9842,7 +9937,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <alias name="glCompressedTexImage3D"/> <glx type="render" opcode="216"/> </command> @@ -9856,7 +9951,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param>const <ptype>GLvoid</ptype> *<name>data</name></param> + <param>const void *<name>data</name></param> </command> <command> <proto>void <name>glCompressedTexSubImage1D</name></proto> @@ -9866,7 +9961,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <glx type="render" opcode="217"/> <glx type="render" opcode="317" name="glCompressedTexSubImage1DPBO" comment="PBO protocol"/> </command> @@ -9878,7 +9973,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <alias name="glCompressedTexSubImage1D"/> <glx type="render" opcode="217"/> </command> @@ -9892,7 +9987,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <glx type="render" opcode="218"/> <glx type="render" opcode="318" name="glCompressedTexSubImage2DPBO" comment="PBO protocol"/> </command> @@ -9906,7 +10001,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <alias name="glCompressedTexSubImage2D"/> <glx type="render" opcode="218"/> </command> @@ -9922,7 +10017,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <glx type="render" opcode="219"/> <glx type="render" opcode="319" name="glCompressedTexSubImage3DPBO" comment="PBO protocol"/> </command> @@ -9938,7 +10033,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param group="CompressedTextureARB" len="imageSize">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param> <alias name="glCompressedTexSubImage3D"/> <glx type="render" opcode="219"/> </command> @@ -9954,7 +10049,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param>const <ptype>GLvoid</ptype> *<name>data</name></param> + <param>const void *<name>data</name></param> </command> <command> <proto>void <name>glCompressedTextureImage1DEXT</name></proto> @@ -9965,7 +10060,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedTextureImage2DEXT</name></proto> @@ -9977,7 +10072,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedTextureImage3DEXT</name></proto> @@ -9990,7 +10085,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedTextureSubImage1DEXT</name></proto> @@ -10001,7 +10096,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedTextureSubImage2DEXT</name></proto> @@ -10014,7 +10109,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glCompressedTextureSubImage3DEXT</name></proto> @@ -10029,7 +10124,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>imageSize</name></param> - <param len="imageSize">const <ptype>GLvoid</ptype> *<name>bits</name></param> + <param len="imageSize">const void *<name>bits</name></param> </command> <command> <proto>void <name>glConvolutionFilter1D</name></proto> @@ -10038,7 +10133,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>image</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>image</name></param> <glx type="render" opcode="4101"/> <glx type="render" opcode="320" name="glConvolutionFilter1DPBO" comment="PBO protocol"/> </command> @@ -10049,7 +10144,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>image</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>image</name></param> <alias name="glConvolutionFilter1D"/> <glx type="render" opcode="4101"/> </command> @@ -10061,7 +10156,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>image</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>image</name></param> <glx type="render" opcode="4102"/> <glx type="render" opcode="321" name="glConvolutionFilter2DPBO" comment="PBO protocol"/> </command> @@ -10073,7 +10168,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>image</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>image</name></param> <alias name="glConvolutionFilter2D"/> <glx type="render" opcode="4102"/> </command> @@ -10158,6 +10253,15 @@ typedef unsigned int GLhandleARB; <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param> </command> <command> + <proto>void <name>glCopyBufferSubDataNV</name></proto> + <param><ptype>GLenum</ptype> <name>readTarget</name></param> + <param><ptype>GLenum</ptype> <name>writeTarget</name></param> + <param group="BufferOffset"><ptype>GLintptr</ptype> <name>readOffset</name></param> + <param group="BufferOffset"><ptype>GLintptr</ptype> <name>writeOffset</name></param> + <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param> + <alias name="glCopyBufferSubData"/> + </command> + <command> <proto>void <name>glCopyColorSubTable</name></proto> <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLsizei</ptype> <name>start</name></param> @@ -10545,7 +10649,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glCoverFillPathInstancedNV</name></proto> <param><ptype>GLsizei</ptype> <name>numPaths</name></param> <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param> - <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const <ptype>GLvoid</ptype> *<name>paths</name></param> + <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param> <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param> <param group="PathCoverMode"><ptype>GLenum</ptype> <name>coverMode</name></param> <param group="PathTransformType"><ptype>GLenum</ptype> <name>transformType</name></param> @@ -10560,7 +10664,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glCoverStrokePathInstancedNV</name></proto> <param><ptype>GLsizei</ptype> <name>numPaths</name></param> <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param> - <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const <ptype>GLvoid</ptype> *<name>paths</name></param> + <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param> <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param> <param group="PathCoverMode"><ptype>GLenum</ptype> <name>coverMode</name></param> <param group="PathTransformType"><ptype>GLenum</ptype> <name>transformType</name></param> @@ -10580,6 +10684,11 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>operation</name></param> </command> <command> + <proto>void <name>glCreatePerfQueryINTEL</name></proto> + <param><ptype>GLuint</ptype> <name>queryId</name></param> + <param><ptype>GLuint</ptype> *<name>queryHandle</name></param> + </command> + <command> <proto><ptype>GLuint</ptype> <name>glCreateProgram</name></proto> </command> <command> @@ -10865,6 +10974,10 @@ typedef unsigned int GLhandleARB; <param len="n"><ptype>GLuint</ptype> *<name>monitors</name></param> </command> <command> + <proto>void <name>glDeletePerfQueryINTEL</name></proto> + <param><ptype>GLuint</ptype> <name>queryHandle</name></param> + </command> + <command> <proto>void <name>glDeleteProgram</name></proto> <param><ptype>GLuint</ptype> <name>program</name></param> <glx type="single" opcode="202"/> @@ -11180,7 +11293,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glDrawArraysIndirect</name></proto> <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> - <param>const <ptype>GLvoid</ptype> *<name>indirect</name></param> + <param>const void *<name>indirect</name></param> </command> <command> <proto>void <name>glDrawArraysInstanced</name></proto> @@ -11188,7 +11301,6 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>first</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param><ptype>GLsizei</ptype> <name>instancecount</name></param> - <vecequiv name="glArrayElement"/> </command> <command> <proto>void <name>glDrawArraysInstancedANGLE</name></proto> @@ -11204,7 +11316,6 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>count</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> <alias name="glDrawArraysInstanced"/> - <vecequiv name="glArrayElement"/> </command> <command> <proto>void <name>glDrawArraysInstancedBaseInstance</name></proto> @@ -11214,14 +11325,13 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>instancecount</name></param> <param><ptype>GLuint</ptype> <name>baseinstance</name></param> </command> - <command> + <command comment="primcount should be renamed to instanceCount for OpenGL ES"> <proto>void <name>glDrawArraysInstancedEXT</name></proto> <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLint</ptype> <name>start</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> <alias name="glDrawArraysInstanced"/> - <vecequiv name="glArrayElement"/> </command> <command> <proto>void <name>glDrawArraysInstancedNV</name></proto> @@ -11287,30 +11397,29 @@ typedef unsigned int GLhandleARB; <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> </command> <command> <proto>void <name>glDrawElementsBaseVertex</name></proto> <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> <param><ptype>GLint</ptype> <name>basevertex</name></param> </command> <command> <proto>void <name>glDrawElementsIndirect</name></proto> <param group="PrimitiveType"><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>const void *<name>indirect</name></param> </command> <command> <proto>void <name>glDrawElementsInstanced</name></proto> <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>instancecount</name></param> - <vecequiv name="glArrayElement"/> </command> <command> <proto>void <name>glDrawElementsInstancedANGLE</name></proto> @@ -11325,10 +11434,9 @@ typedef unsigned int GLhandleARB; <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> <alias name="glDrawElementsInstanced"/> - <vecequiv name="glArrayElement"/> </command> <command> <proto>void <name>glDrawElementsInstancedBaseInstance</name></proto> @@ -11344,7 +11452,7 @@ typedef unsigned int GLhandleARB; <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>instancecount</name></param> <param><ptype>GLint</ptype> <name>basevertex</name></param> </command> @@ -11358,22 +11466,21 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>basevertex</name></param> <param><ptype>GLuint</ptype> <name>baseinstance</name></param> </command> - <command> + <command comment="primcount should be renamed to instanceCount for OpenGL ES"> <proto>void <name>glDrawElementsInstancedEXT</name></proto> <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> <alias name="glDrawElementsInstanced"/> - <vecequiv name="glArrayElement"/> </command> <command> <proto>void <name>glDrawElementsInstancedNV</name></proto> <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> - <param>const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param>const void *<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> </command> <command> @@ -11389,7 +11496,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param> <glx type="render" opcode="173"/> <glx type="render" opcode="322" name="glDrawPixelsPBO" comment="PBO protocol"/> </command> @@ -11415,7 +11522,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>end</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> </command> <command> <proto>void <name>glDrawRangeElementsBaseVertex</name></proto> @@ -11424,7 +11531,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>end</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> <param><ptype>GLint</ptype> <name>basevertex</name></param> </command> <command> @@ -11434,7 +11541,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>end</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(count,type)">const <ptype>GLvoid</ptype> *<name>indices</name></param> + <param len="COMPSIZE(count,type)">const void *<name>indices</name></param> <alias name="glDrawRangeElements"/> </command> <command> @@ -11551,7 +11658,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glEdgeFlagPointer</name></proto> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glEdgeFlagPointerEXT</name></proto> @@ -11573,12 +11680,12 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glElementPointerAPPLE</name></proto> <param group="ElementPointerTypeATI"><ptype>GLenum</ptype> <name>type</name></param> - <param len="type">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glElementPointerATI</name></proto> <param group="ElementPointerTypeATI"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(type)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glEnable</name></proto> @@ -11673,6 +11780,10 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>monitor</name></param> </command> <command> + <proto>void <name>glEndPerfQueryINTEL</name></proto> + <param><ptype>GLuint</ptype> <name>queryHandle</name></param> + </command> + <command> <proto>void <name>glEndQuery</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <glx type="render" opcode="232"/> @@ -11814,7 +11925,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glExtGetBufferPointervQCOM</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> - <param><ptype>GLvoid</ptype> **<name>params</name></param> + <param>void **<name>params</name></param> </command> <command> <proto>void <name>glExtGetBuffersQCOM</name></proto> @@ -11873,7 +11984,7 @@ typedef unsigned int GLhandleARB; <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><ptype>GLvoid</ptype> *<name>texels</name></param> + <param>void *<name>texels</name></param> </command> <command> <proto>void <name>glExtGetTexturesQCOM</name></proto> @@ -11997,7 +12108,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glFlushVertexArrayRangeAPPLE</name></proto> <param><ptype>GLsizei</ptype> <name>length</name></param> - <param len="length"><ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="length">void *<name>pointer</name></param> </command> <command> <proto>void <name>glFlushVertexArrayRangeNV</name></proto> @@ -12011,20 +12122,20 @@ typedef unsigned int GLhandleARB; <proto>void <name>glFogCoordPointer</name></proto> <param group="FogPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glFogCoordPointerEXT</name></proto> <param group="FogPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> <alias name="glFogCoordPointer"/> </command> <command> <proto>void <name>glFogCoordPointerListIBM</name></proto> <param group="FogPointerTypeIBM"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLint</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void **<name>pointer</name></param> <param><ptype>GLint</ptype> <name>ptrstride</name></param> </command> <command> @@ -12815,7 +12926,7 @@ typedef unsigned int GLhandleARB; <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param> <param len="1"><ptype>GLint</ptype> *<name>params</name></param> </command> - <command> + <command comment="Could be an alias of glGetAttachedShaders except that GLhandleARB is different on MacOS X"> <proto>void <name>glGetAttachedObjectsARB</name></proto> <param group="handleARB"><ptype>GLhandleARB</ptype> <name>containerObj</name></param> <param><ptype>GLsizei</ptype> <name>maxCount</name></param> @@ -12856,7 +12967,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glGetBooleanv</name></proto> <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param> - <param group="Boolean" len="COMPSIZE(pname)"><ptype>GLboolean</ptype> *<name>params</name></param> + <param group="Boolean" len="COMPSIZE(pname)"><ptype>GLboolean</ptype> *<name>data</name></param> <glx type="single" opcode="112"/> </command> <command> @@ -12888,20 +12999,20 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetBufferPointerv</name></proto> <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferPointerNameARB"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>params</name></param> + <param len="1">void **<name>params</name></param> </command> <command> <proto>void <name>glGetBufferPointervARB</name></proto> <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferPointerNameARB"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>params</name></param> + <param len="1">void **<name>params</name></param> <alias name="glGetBufferPointerv"/> </command> <command> <proto>void <name>glGetBufferPointervOES</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param><ptype>GLvoid</ptype> **<name>params</name></param> + <param>void **<name>params</name></param> <alias name="glGetBufferPointerv"/> </command> <command> @@ -12909,14 +13020,14 @@ typedef unsigned int GLhandleARB; <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param> <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param> - <param len="size"><ptype>GLvoid</ptype> *<name>data</name></param> + <param len="size">void *<name>data</name></param> </command> <command> <proto>void <name>glGetBufferSubDataARB</name></proto> <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="BufferOffsetARB"><ptype>GLintptrARB</ptype> <name>offset</name></param> <param group="BufferSizeARB"><ptype>GLsizeiptrARB</ptype> <name>size</name></param> - <param len="size"><ptype>GLvoid</ptype> *<name>data</name></param> + <param len="size">void *<name>data</name></param> <alias name="glGetBufferSubData"/> </command> <command> @@ -12951,7 +13062,7 @@ typedef unsigned int GLhandleARB; <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>table</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>table</name></param> <glx type="single" opcode="147"/> <glx type="render" opcode="334" name="glGetColorTablePBO" comment="PBO protocol"/> </command> @@ -12960,7 +13071,7 @@ typedef unsigned int GLhandleARB; <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>data</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>data</name></param> <alias name="glGetColorTable"/> </command> <command> @@ -13010,7 +13121,7 @@ typedef unsigned int GLhandleARB; <param group="ColorTableTargetSGI"><ptype>GLenum</ptype> <name>target</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>table</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>table</name></param> <glx type="vendor" opcode="4098"/> </command> <command> @@ -13058,13 +13169,13 @@ typedef unsigned int GLhandleARB; <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param> <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>lod</name></param> - <param len="COMPSIZE(target,lod)"><ptype>GLvoid</ptype> *<name>img</name></param> + <param len="COMPSIZE(target,lod)">void *<name>img</name></param> </command> <command> <proto>void <name>glGetCompressedTexImage</name></proto> <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param> - <param group="CompressedTextureARB" len="COMPSIZE(target,level)"><ptype>GLvoid</ptype> *<name>img</name></param> + <param group="CompressedTextureARB" len="COMPSIZE(target,level)">void *<name>img</name></param> <glx type="single" opcode="160"/> <glx type="render" opcode="335" name="glGetCompressedTexImagePBO" comment="PBO protocol"/> </command> @@ -13072,7 +13183,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetCompressedTexImageARB</name></proto> <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param> - <param group="CompressedTextureARB" len="COMPSIZE(target,level)"><ptype>GLvoid</ptype> *<name>img</name></param> + <param group="CompressedTextureARB" len="COMPSIZE(target,level)">void *<name>img</name></param> <alias name="glGetCompressedTexImage"/> <glx type="single" opcode="160"/> </command> @@ -13081,14 +13192,14 @@ typedef unsigned int GLhandleARB; <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param> <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>lod</name></param> - <param len="COMPSIZE(target,lod)"><ptype>GLvoid</ptype> *<name>img</name></param> + <param len="COMPSIZE(target,lod)">void *<name>img</name></param> </command> <command> <proto>void <name>glGetConvolutionFilter</name></proto> <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>image</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>image</name></param> <glx type="single" opcode="150"/> <glx type="render" opcode="336" name="glGetConvolutionFilterPBO" comment="PBO protocol"/> </command> @@ -13097,7 +13208,7 @@ typedef unsigned int GLhandleARB; <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>image</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>image</name></param> <glx type="vendor" opcode="1"/> </command> <command> @@ -13208,7 +13319,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glGetDoublev</name></proto> <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>data</name></param> <glx type="single" opcode="114"/> </command> <command> @@ -13250,6 +13361,10 @@ typedef unsigned int GLhandleARB; <glx type="vendor" opcode="1275"/> </command> <command> + <proto>void <name>glGetFirstPerfQueryIdINTEL</name></proto> + <param><ptype>GLuint</ptype> *<name>queryId</name></param> + </command> + <command> <proto>void <name>glGetFixedv</name></proto> <param><ptype>GLenum</ptype> <name>pname</name></param> <param><ptype>GLfixed</ptype> *<name>params</name></param> @@ -13282,7 +13397,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glGetFloatv</name></proto> <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>data</name></param> <glx type="single" opcode="116"/> </command> <command> @@ -13381,7 +13496,7 @@ typedef unsigned int GLhandleARB; <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>values</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>values</name></param> <glx type="single" opcode="154"/> <glx type="render" opcode="337" name="glGetHistogramPBO" comment="PBO protocol"/> </command> @@ -13391,7 +13506,7 @@ typedef unsigned int GLhandleARB; <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>values</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>values</name></param> <glx type="vendor" opcode="5"/> </command> <command> @@ -13476,7 +13591,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glGetInteger64v</name></proto> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>data</name></param> </command> <command> <proto>void <name>glGetInteger64vAPPLE</name></proto> @@ -13516,7 +13631,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glGetIntegerv</name></proto> <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>data</name></param> <glx type="single" opcode="117"/> </command> <command> @@ -13568,12 +13683,6 @@ typedef unsigned int GLhandleARB; <glx type="single" opcode="119"/> </command> <command> - <proto>void <name>glGetLightx</name></proto> - <param><ptype>GLenum</ptype> <name>light</name></param> - <param><ptype>GLenum</ptype> <name>pname</name></param> - <param><ptype>GLfixed</ptype> *<name>params</name></param> - </command> - <command> <proto>void <name>glGetLightxOES</name></proto> <param><ptype>GLenum</ptype> <name>light</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> @@ -13643,7 +13752,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>ustride</name></param> <param><ptype>GLsizei</ptype> <name>vstride</name></param> <param group="Boolean"><ptype>GLboolean</ptype> <name>packed</name></param> - <param len="COMPSIZE(target)"><ptype>GLvoid</ptype> *<name>points</name></param> + <param len="COMPSIZE(target)">void *<name>points</name></param> </command> <command> <proto>void <name>glGetMapParameterfvNV</name></proto> @@ -13699,12 +13808,6 @@ typedef unsigned int GLhandleARB; <glx type="single" opcode="124"/> </command> <command> - <proto>void <name>glGetMaterialx</name></proto> - <param><ptype>GLenum</ptype> <name>face</name></param> - <param><ptype>GLenum</ptype> <name>pname</name></param> - <param><ptype>GLfixed</ptype> <name>param</name></param> - </command> - <command> <proto>void <name>glGetMaterialxOES</name></proto> <param><ptype>GLenum</ptype> <name>face</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> @@ -13728,7 +13831,7 @@ typedef unsigned int GLhandleARB; <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>values</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>values</name></param> <glx type="single" opcode="157"/> <glx type="render" opcode="338" name="glGetMinmaxPBO" comment="PBO protocol"/> </command> @@ -13738,7 +13841,7 @@ typedef unsigned int GLhandleARB; <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>values</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>values</name></param> <glx type="vendor" opcode="8"/> </command> <command> @@ -13811,7 +13914,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,level,format,type)"><ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(target,level,format,type)">void *<name>pixels</name></param> </command> <command> <proto>void <name>glGetMultiTexLevelParameterfvEXT</name></proto> @@ -13886,14 +13989,14 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetNamedBufferPointervEXT</name></proto> <param><ptype>GLuint</ptype> <name>buffer</name></param> <param group="VertexBufferObjectParameter"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>params</name></param> + <param len="1">void **<name>params</name></param> </command> <command> <proto>void <name>glGetNamedBufferSubDataEXT</name></proto> <param><ptype>GLuint</ptype> <name>buffer</name></param> <param><ptype>GLintptr</ptype> <name>offset</name></param> <param><ptype>GLsizeiptr</ptype> <name>size</name></param> - <param len="COMPSIZE(size)"><ptype>GLvoid</ptype> *<name>data</name></param> + <param len="COMPSIZE(size)">void *<name>data</name></param> </command> <command> <proto>void <name>glGetNamedFramebufferAttachmentParameterivEXT</name></proto> @@ -13941,7 +14044,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>program</name></param> <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="ProgramStringProperty"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="COMPSIZE(program,pname)"><ptype>GLvoid</ptype> *<name>string</name></param> + <param len="COMPSIZE(program,pname)">void *<name>string</name></param> </command> <command> <proto>void <name>glGetNamedProgramivEXT</name></proto> @@ -13972,6 +14075,11 @@ typedef unsigned int GLhandleARB; <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> </command> <command> + <proto>void <name>glGetNextPerfQueryIdINTEL</name></proto> + <param><ptype>GLuint</ptype> <name>queryId</name></param> + <param><ptype>GLuint</ptype> *<name>nextQueryId</name></param> + </command> + <command> <proto>void <name>glGetObjectBufferfvATI</name></proto> <param><ptype>GLuint</ptype> <name>buffer</name></param> <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param> @@ -14012,7 +14120,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetObjectParameterfvARB</name></proto> <param group="handleARB"><ptype>GLhandleARB</ptype> <name>obj</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLfloat</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param> </command> <command> <proto>void <name>glGetObjectParameterivAPPLE</name></proto> @@ -14025,7 +14133,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetObjectParameterivARB</name></proto> <param group="handleARB"><ptype>GLhandleARB</ptype> <name>obj</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> </command> <command> <proto>void <name>glGetObjectPtrLabel</name></proto> @@ -14100,7 +14208,7 @@ typedef unsigned int GLhandleARB; <param group="PathMetricMask"><ptype>GLbitfield</ptype> <name>metricQueryMask</name></param> <param><ptype>GLsizei</ptype> <name>numPaths</name></param> <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param> - <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const <ptype>GLvoid</ptype> *<name>paths</name></param> + <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param> <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> <param len="COMPSIZE(metricQueryMask,numPaths,stride)"><ptype>GLfloat</ptype> *<name>metrics</name></param> @@ -14122,7 +14230,7 @@ typedef unsigned int GLhandleARB; <param group="PathListMode"><ptype>GLenum</ptype> <name>pathListMode</name></param> <param><ptype>GLsizei</ptype> <name>numPaths</name></param> <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param> - <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const <ptype>GLvoid</ptype> *<name>paths</name></param> + <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param> <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param> <param><ptype>GLfloat</ptype> <name>advanceScale</name></param> <param><ptype>GLfloat</ptype> <name>kerningScale</name></param> @@ -14142,6 +14250,20 @@ typedef unsigned int GLhandleARB; <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>value</name></param> </command> <command> + <proto>void <name>glGetPerfCounterInfoINTEL</name></proto> + <param><ptype>GLuint</ptype> <name>queryId</name></param> + <param><ptype>GLuint</ptype> <name>counterId</name></param> + <param><ptype>GLuint</ptype> <name>counterNameLength</name></param> + <param><ptype>GLchar</ptype> *<name>counterName</name></param> + <param><ptype>GLuint</ptype> <name>counterDescLength</name></param> + <param><ptype>GLchar</ptype> *<name>counterDesc</name></param> + <param><ptype>GLuint</ptype> *<name>counterOffset</name></param> + <param><ptype>GLuint</ptype> *<name>counterDataSize</name></param> + <param><ptype>GLuint</ptype> *<name>counterTypeEnum</name></param> + <param><ptype>GLuint</ptype> *<name>counterDataTypeEnum</name></param> + <param><ptype>GLuint64</ptype> *<name>rawCounterMaxValue</name></param> + </command> + <command> <proto>void <name>glGetPerfMonitorCounterDataAMD</name></proto> <param><ptype>GLuint</ptype> <name>monitor</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> @@ -14154,7 +14276,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>group</name></param> <param><ptype>GLuint</ptype> <name>counter</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="COMPSIZE(pname)"><ptype>GLvoid</ptype> *<name>data</name></param> + <param len="COMPSIZE(pname)">void *<name>data</name></param> </command> <command> <proto>void <name>glGetPerfMonitorCounterStringAMD</name></proto> @@ -14186,6 +14308,29 @@ typedef unsigned int GLhandleARB; <param len="groupsSize"><ptype>GLuint</ptype> *<name>groups</name></param> </command> <command> + <proto>void <name>glGetPerfQueryDataINTEL</name></proto> + <param><ptype>GLuint</ptype> <name>queryHandle</name></param> + <param><ptype>GLuint</ptype> <name>flags</name></param> + <param><ptype>GLsizei</ptype> <name>dataSize</name></param> + <param><ptype>GLvoid</ptype> *<name>data</name></param> + <param><ptype>GLuint</ptype> *<name>bytesWritten</name></param> + </command> + <command> + <proto>void <name>glGetPerfQueryIdByNameINTEL</name></proto> + <param><ptype>GLchar</ptype> *<name>queryName</name></param> + <param><ptype>GLuint</ptype> *<name>queryId</name></param> + </command> + <command> + <proto>void <name>glGetPerfQueryInfoINTEL</name></proto> + <param><ptype>GLuint</ptype> <name>queryId</name></param> + <param><ptype>GLuint</ptype> <name>queryNameLength</name></param> + <param><ptype>GLchar</ptype> *<name>queryName</name></param> + <param><ptype>GLuint</ptype> *<name>dataSize</name></param> + <param><ptype>GLuint</ptype> *<name>noCounters</name></param> + <param><ptype>GLuint</ptype> *<name>noInstances</name></param> + <param><ptype>GLuint</ptype> *<name>capsMask</name></param> + </command> + <command> <proto>void <name>glGetPixelMapfv</name></proto> <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param> <param len="COMPSIZE(map)"><ptype>GLfloat</ptype> *<name>values</name></param> @@ -14240,30 +14385,30 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetPointerIndexedvEXT</name></proto> <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLuint</ptype> <name>index</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>data</name></param> + <param len="1">void **<name>data</name></param> </command> <command> <proto>void <name>glGetPointeri_vEXT</name></proto> <param group="TypeEnum"><ptype>GLenum</ptype> <name>pname</name></param> <param><ptype>GLuint</ptype> <name>index</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>params</name></param> + <param len="1">void **<name>params</name></param> </command> <command> <proto>void <name>glGetPointerv</name></proto> <param group="GetPointervPName"><ptype>GLenum</ptype> <name>pname</name></param> - <param><ptype>GLvoid</ptype> **<name>params</name></param> + <param>void **<name>params</name></param> <glx type="single" opcode="208"/> </command> <command> <proto>void <name>glGetPointervEXT</name></proto> <param group="GetPointervPName"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>params</name></param> + <param len="1">void **<name>params</name></param> <alias name="glGetPointerv"/> </command> <command> <proto>void <name>glGetPointervKHR</name></proto> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param><ptype>GLvoid</ptype> **<name>params</name></param> + <param>void **<name>params</name></param> <alias name="glGetPointerv"/> </command> <command> @@ -14278,7 +14423,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>bufSize</name></param> <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param> <param len="1"><ptype>GLenum</ptype> *<name>binaryFormat</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>binary</name></param> + <param len="bufSize">void *<name>binary</name></param> </command> <command> <proto>void <name>glGetProgramBinaryOES</name></proto> @@ -14286,7 +14431,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>bufSize</name></param> <param><ptype>GLsizei</ptype> *<name>length</name></param> <param><ptype>GLenum</ptype> *<name>binaryFormat</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>binary</name></param> + <param len="bufSize">void *<name>binary</name></param> </command> <command> <proto>void <name>glGetProgramEnvParameterIivNV</name></proto> @@ -14458,7 +14603,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetProgramStringARB</name></proto> <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="ProgramStringPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="COMPSIZE(target,pname)"><ptype>GLvoid</ptype> *<name>string</name></param> + <param len="COMPSIZE(target,pname)">void *<name>string</name></param> </command> <command> <proto>void <name>glGetProgramStringNV</name></proto> @@ -14477,7 +14622,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetProgramiv</name></proto> <param><ptype>GLuint</ptype> <name>program</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> <glx type="single" opcode="199"/> </command> <command> @@ -14510,7 +14655,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetQueryObjecti64vEXT</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint64</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>params</name></param> <glx type="vendor" opcode="1328"/> <alias name="glGetQueryObjecti64v"/> </command> @@ -14518,14 +14663,14 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetQueryObjectiv</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> <glx type="single" opcode="165"/> </command> <command> <proto>void <name>glGetQueryObjectivARB</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> <alias name="glGetQueryObjectiv"/> </command> <command> @@ -14545,7 +14690,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetQueryObjectui64vEXT</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLuint64</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLuint64</ptype> *<name>params</name></param> <glx type="vendor" opcode="1329"/> <alias name="glGetQueryObjectui64v"/> </command> @@ -14553,14 +14698,14 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetQueryObjectuiv</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLuint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param> <glx type="single" opcode="166"/> </command> <command> <proto>void <name>glGetQueryObjectuivARB</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLuint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param> <alias name="glGetQueryObjectuiv"/> </command> <command> @@ -14573,14 +14718,14 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetQueryiv</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> <glx type="single" opcode="164"/> </command> <command> <proto>void <name>glGetQueryivARB</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> <alias name="glGetQueryiv"/> </command> <command> @@ -14639,9 +14784,9 @@ typedef unsigned int GLhandleARB; <param group="SeparableTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>row</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>column</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>span</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>row</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>column</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>span</name></param> <glx type="single" opcode="153"/> <glx type="render" opcode="343" name="glGetSeparableFilterPBO" comment="PBO protocol"/> </command> @@ -14650,9 +14795,9 @@ typedef unsigned int GLhandleARB; <param group="SeparableTargetEXT"><ptype>GLenum</ptype> <name>target</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>row</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>column</name></param> - <param len="COMPSIZE(target,format,type)"><ptype>GLvoid</ptype> *<name>span</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>row</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>column</name></param> + <param len="COMPSIZE(target,format,type)">void *<name>span</name></param> <glx type="vendor" opcode="4"/> </command> <command> @@ -14689,7 +14834,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetShaderiv</name></proto> <param><ptype>GLuint</ptype> <name>shader</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> <glx type="single" opcode="198"/> </command> <command> @@ -14824,7 +14969,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,level,format,type)"><ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(target,level,format,type)">void *<name>pixels</name></param> <glx type="single" opcode="135"/> <glx type="render" opcode="344" name="glGetTexImagePBO" comment="PBO protocol"/> </command> @@ -14883,7 +15028,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetTexParameterPointervAPPLE</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>params</name></param> + <param len="1">void **<name>params</name></param> </command> <command> <proto>void <name>glGetTexParameterfv</name></proto> @@ -14926,7 +15071,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,level,format,type)"><ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(target,level,format,type)">void *<name>pixels</name></param> </command> <command> <proto>void <name>glGetTextureLevelParameterfvEXT</name></proto> @@ -15154,7 +15299,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetVariantPointervEXT</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param> - <param len="COMPSIZE(id)"><ptype>GLvoid</ptype> **<name>data</name></param> + <param len="COMPSIZE(id)">void **<name>data</name></param> </command> <command> <proto><ptype>GLint</ptype> <name>glGetVaryingLocationNV</name></proto> @@ -15179,25 +15324,25 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>vaobj</name></param> <param><ptype>GLuint</ptype> <name>index</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param><ptype>GLvoid</ptype> **<name>param</name></param> + <param>void **<name>param</name></param> </command> <command> <proto>void <name>glGetVertexArrayPointervEXT</name></proto> <param><ptype>GLuint</ptype> <name>vaobj</name></param> <param><ptype>GLenum</ptype> <name>pname</name></param> - <param><ptype>GLvoid</ptype> **<name>param</name></param> + <param>void **<name>param</name></param> </command> <command> <proto>void <name>glGetVertexAttribArrayObjectfvATI</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLfloat</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param> </command> <command> <proto>void <name>glGetVertexAttribArrayObjectivATI</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="pname"><ptype>GLint</ptype> *<name>params</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param> </command> <command> <proto>void <name>glGetVertexAttribIiv</name></proto> @@ -15260,21 +15405,21 @@ typedef unsigned int GLhandleARB; <proto>void <name>glGetVertexAttribPointerv</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param group="VertexAttribPointerPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="1">void **<name>pointer</name></param> <glx type="single" opcode="209"/> </command> <command> <proto>void <name>glGetVertexAttribPointervARB</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param group="VertexAttribPointerPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="1">void **<name>pointer</name></param> <alias name="glGetVertexAttribPointerv"/> </command> <command> <proto>void <name>glGetVertexAttribPointervNV</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param> - <param len="1"><ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="1">void **<name>pointer</name></param> <alias name="glGetVertexAttribPointerv"/> </command> <command> @@ -15403,14 +15548,14 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>bufSize</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>table</name></param> + <param len="bufSize">void *<name>table</name></param> </command> <command> <proto>void <name>glGetnCompressedTexImageARB</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLint</ptype> <name>lod</name></param> <param><ptype>GLsizei</ptype> <name>bufSize</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>img</name></param> + <param len="bufSize">void *<name>img</name></param> </command> <command> <proto>void <name>glGetnConvolutionFilterARB</name></proto> @@ -15418,7 +15563,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>bufSize</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>image</name></param> + <param len="bufSize">void *<name>image</name></param> </command> <command> <proto>void <name>glGetnHistogramARB</name></proto> @@ -15427,7 +15572,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>bufSize</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>values</name></param> + <param len="bufSize">void *<name>values</name></param> </command> <command> <proto>void <name>glGetnMapdvARB</name></proto> @@ -15457,7 +15602,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>bufSize</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>values</name></param> + <param len="bufSize">void *<name>values</name></param> </command> <command> <proto>void <name>glGetnPixelMapfvARB</name></proto> @@ -15488,10 +15633,10 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>rowBufSize</name></param> - <param len="rowBufSize"><ptype>GLvoid</ptype> *<name>row</name></param> + <param len="rowBufSize">void *<name>row</name></param> <param><ptype>GLsizei</ptype> <name>columnBufSize</name></param> - <param len="columnBufSize"><ptype>GLvoid</ptype> *<name>column</name></param> - <param len="0"><ptype>GLvoid</ptype> *<name>span</name></param> + <param len="columnBufSize">void *<name>column</name></param> + <param len="0">void *<name>span</name></param> </command> <command> <proto>void <name>glGetnTexImageARB</name></proto> @@ -15500,7 +15645,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>bufSize</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>img</name></param> + <param len="bufSize">void *<name>img</name></param> </command> <command> <proto>void <name>glGetnUniformdvARB</name></proto> @@ -15607,7 +15752,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glIglooInterfaceSGIX</name></proto> <param group="IglooFunctionSelectSGIX"><ptype>GLenum</ptype> <name>pname</name></param> - <param group="IglooParameterSGIX" len="COMPSIZE(pname)">const <ptype>GLvoid</ptype> *<name>params</name></param> + <param group="IglooParameterSGIX" len="COMPSIZE(pname)">const void *<name>params</name></param> <glx type="render" opcode="200"/> </command> <command> @@ -15664,20 +15809,20 @@ typedef unsigned int GLhandleARB; <proto>void <name>glIndexPointer</name></proto> <param group="IndexPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glIndexPointerEXT</name></proto> <param group="IndexPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> - <param len="COMPSIZE(type,stride,count)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride,count)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glIndexPointerListIBM</name></proto> <param group="IndexPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLint</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void **<name>pointer</name></param> <param><ptype>GLint</ptype> <name>ptrstride</name></param> </command> <command> @@ -15763,7 +15908,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glInterleavedArrays</name></proto> <param group="InterleavedArrayFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(format,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(format,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glInterpolatePathsNV</name></proto> @@ -16452,7 +16597,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>uorder</name></param> <param group="CheckedInt32"><ptype>GLint</ptype> <name>vorder</name></param> <param group="Boolean"><ptype>GLboolean</ptype> <name>packed</name></param> - <param len="COMPSIZE(target,uorder,vorder)">const <ptype>GLvoid</ptype> *<name>points</name></param> + <param len="COMPSIZE(target,uorder,vorder)">const void *<name>points</name></param> </command> <command> <proto>void <name>glMapGrid1d</name></proto> @@ -16535,8 +16680,8 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>texture</name></param> <param><ptype>GLint</ptype> <name>level</name></param> <param><ptype>GLbitfield</ptype> <name>access</name></param> - <param len="1">const <ptype>GLint</ptype> *<name>stride</name></param> - <param len="1">const <ptype>GLenum</ptype> *<name>layout</name></param> + <param len="1"><ptype>GLint</ptype> *<name>stride</name></param> + <param len="1"><ptype>GLenum</ptype> *<name>layout</name></param> </command> <command> <proto>void <name>glMapVertexAttrib1dAPPLE</name></proto> @@ -16653,14 +16798,14 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="MatrixIndexPointerTypeARB"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glMatrixIndexPointerOES</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param>const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param>const void *<name>pointer</name></param> </command> <command> <proto>void <name>glMatrixIndexubvARB</name></proto> @@ -16889,7 +17034,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glMultiDrawArraysIndirectAMD</name></proto> <param><ptype>GLenum</ptype> <name>mode</name></param> - <param>const <ptype>GLvoid</ptype> *<name>indirect</name></param> + <param>const void *<name>indirect</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> <alias name="glMultiDrawArraysIndirect"/> @@ -16897,7 +17042,7 @@ typedef unsigned int GLhandleARB; <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>const void *<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> @@ -16906,7 +17051,7 @@ typedef unsigned int GLhandleARB; <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>const void *<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> @@ -16931,7 +17076,7 @@ typedef unsigned int GLhandleARB; <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param len="COMPSIZE(drawcount)">const <ptype>GLsizei</ptype> *<name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(drawcount)">const <ptype>GLvoid</ptype> *const*<name>indices</name></param> + <param len="COMPSIZE(drawcount)">const void *const*<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>drawcount</name></param> </command> <command> @@ -16939,7 +17084,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>mode</name></param> <param len="COMPSIZE(drawcount)">const <ptype>GLsizei</ptype> *<name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(drawcount)">const <ptype>GLvoid</ptype> *const*<name>indices</name></param> + <param len="COMPSIZE(drawcount)">const void *const*<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>drawcount</name></param> <param len="COMPSIZE(drawcount)">const <ptype>GLint</ptype> *<name>basevertex</name></param> </command> @@ -16948,7 +17093,7 @@ typedef unsigned int GLhandleARB; <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param> <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(primcount)">const <ptype>GLvoid</ptype> *const*<name>indices</name></param> + <param len="COMPSIZE(primcount)">const void *const*<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> <alias name="glMultiDrawElements"/> </command> @@ -16964,7 +17109,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glMultiDrawElementsIndirectAMD</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>const void *<name>indirect</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> <alias name="glMultiDrawElementsIndirect"/> @@ -17000,7 +17145,7 @@ typedef unsigned int GLhandleARB; <param group="PrimitiveType" len="COMPSIZE(primcount)">const <ptype>GLenum</ptype> *<name>mode</name></param> <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>count</name></param> <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(primcount)">const <ptype>GLvoid</ptype> *const*<name>indices</name></param> + <param len="COMPSIZE(primcount)">const void *const*<name>indices</name></param> <param><ptype>GLsizei</ptype> <name>primcount</name></param> <param><ptype>GLint</ptype> <name>modestride</name></param> </command> @@ -17683,7 +17828,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glMultiTexEnvfEXT</name></proto> @@ -17770,7 +17915,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glMultiTexImage2DEXT</name></proto> @@ -17783,7 +17928,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glMultiTexImage3DEXT</name></proto> @@ -17797,7 +17942,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glMultiTexParameterIivEXT</name></proto> @@ -17858,7 +18003,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glMultiTexSubImage2DEXT</name></proto> @@ -17871,7 +18016,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glMultiTexSubImage3DEXT</name></proto> @@ -17886,13 +18031,13 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glNamedBufferDataEXT</name></proto> <param><ptype>GLuint</ptype> <name>buffer</name></param> <param><ptype>GLsizeiptr</ptype> <name>size</name></param> - <param len="COMPSIZE(size)">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param len="COMPSIZE(size)">const void *<name>data</name></param> <param group="VertexBufferObjectUsage"><ptype>GLenum</ptype> <name>usage</name></param> </command> <command> @@ -17907,7 +18052,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>buffer</name></param> <param><ptype>GLintptr</ptype> <name>offset</name></param> <param><ptype>GLsizeiptr</ptype> <name>size</name></param> - <param len="COMPSIZE(size)">const <ptype>GLvoid</ptype> *<name>data</name></param> + <param len="COMPSIZE(size)">const void *<name>data</name></param> </command> <command> <proto>void <name>glNamedCopyBufferSubDataEXT</name></proto> @@ -18080,7 +18225,7 @@ typedef unsigned int GLhandleARB; <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param> <param group="ProgramFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>len</name></param> - <param len="len">const <ptype>GLvoid</ptype> *<name>string</name></param> + <param len="len">const void *<name>string</name></param> </command> <command> <proto>void <name>glNamedRenderbufferStorageEXT</name></proto> @@ -18123,7 +18268,7 @@ typedef unsigned int GLhandleARB; <command> <proto><ptype>GLuint</ptype> <name>glNewObjectBufferATI</name></proto> <param><ptype>GLsizei</ptype> <name>size</name></param> - <param len="size">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="size">const void *<name>pointer</name></param> <param group="ArrayObjectUsageATI"><ptype>GLenum</ptype> <name>usage</name></param> </command> <command> @@ -18247,26 +18392,26 @@ typedef unsigned int GLhandleARB; <proto>void <name>glNormalPointer</name></proto> <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glNormalPointerEXT</name></proto> <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> - <param len="COMPSIZE(type,stride,count)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride,count)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glNormalPointerListIBM</name></proto> <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLint</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void **<name>pointer</name></param> <param><ptype>GLint</ptype> <name>ptrstride</name></param> </command> <command> <proto>void <name>glNormalPointervINTEL</name></proto> <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="4">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="4">const void **<name>pointer</name></param> </command> <command> <proto>void <name>glNormalStream3bATI</name></proto> @@ -18464,14 +18609,14 @@ typedef unsigned int GLhandleARB; <param group="PathCommand" len="numCommands">const <ptype>GLubyte</ptype> *<name>commands</name></param> <param><ptype>GLsizei</ptype> <name>numCoords</name></param> <param group="PathCoordType"><ptype>GLenum</ptype> <name>coordType</name></param> - <param len="COMPSIZE(numCoords,coordType)">const <ptype>GLvoid</ptype> *<name>coords</name></param> + <param len="COMPSIZE(numCoords,coordType)">const void *<name>coords</name></param> </command> <command> <proto>void <name>glPathCoordsNV</name></proto> <param group="Path"><ptype>GLuint</ptype> <name>path</name></param> <param><ptype>GLsizei</ptype> <name>numCoords</name></param> <param group="PathCoordType"><ptype>GLenum</ptype> <name>coordType</name></param> - <param len="COMPSIZE(numCoords,coordType)">const <ptype>GLvoid</ptype> *<name>coords</name></param> + <param len="COMPSIZE(numCoords,coordType)">const void *<name>coords</name></param> </command> <command> <proto>void <name>glPathCoverDepthFuncNV</name></proto> @@ -18491,7 +18636,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glPathGlyphRangeNV</name></proto> <param group="Path"><ptype>GLuint</ptype> <name>firstPathName</name></param> <param group="PathFontTarget"><ptype>GLenum</ptype> <name>fontTarget</name></param> - <param len="COMPSIZE(fontTarget,fontName)">const <ptype>GLvoid</ptype> *<name>fontName</name></param> + <param len="COMPSIZE(fontTarget,fontName)">const void *<name>fontName</name></param> <param group="PathFontStyle"><ptype>GLbitfield</ptype> <name>fontStyle</name></param> <param><ptype>GLuint</ptype> <name>firstGlyph</name></param> <param><ptype>GLsizei</ptype> <name>numGlyphs</name></param> @@ -18503,11 +18648,11 @@ typedef unsigned int GLhandleARB; <proto>void <name>glPathGlyphsNV</name></proto> <param group="Path"><ptype>GLuint</ptype> <name>firstPathName</name></param> <param group="PathFontTarget"><ptype>GLenum</ptype> <name>fontTarget</name></param> - <param len="COMPSIZE(fontTarget,fontName)">const <ptype>GLvoid</ptype> *<name>fontName</name></param> + <param len="COMPSIZE(fontTarget,fontName)">const void *<name>fontName</name></param> <param group="PathFontStyle"><ptype>GLbitfield</ptype> <name>fontStyle</name></param> <param><ptype>GLsizei</ptype> <name>numGlyphs</name></param> <param group="PathElementType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(numGlyphs,type,charcodes)">const <ptype>GLvoid</ptype> *<name>charcodes</name></param> + <param len="COMPSIZE(numGlyphs,type,charcodes)">const void *<name>charcodes</name></param> <param group="PathHandleMissingGlyphs"><ptype>GLenum</ptype> <name>handleMissingGlyphs</name></param> <param group="Path"><ptype>GLuint</ptype> <name>pathParameterTemplate</name></param> <param><ptype>GLfloat</ptype> <name>emScale</name></param> @@ -18552,7 +18697,7 @@ typedef unsigned int GLhandleARB; <param group="Path"><ptype>GLuint</ptype> <name>path</name></param> <param group="PathStringFormat"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>length</name></param> - <param len="length">const <ptype>GLvoid</ptype> *<name>pathString</name></param> + <param len="length">const void *<name>pathString</name></param> </command> <command> <proto>void <name>glPathSubCommandsNV</name></proto> @@ -18563,7 +18708,7 @@ typedef unsigned int GLhandleARB; <param group="PathCommand" len="numCommands">const <ptype>GLubyte</ptype> *<name>commands</name></param> <param><ptype>GLsizei</ptype> <name>numCoords</name></param> <param group="PathCoordType"><ptype>GLenum</ptype> <name>coordType</name></param> - <param len="COMPSIZE(numCoords,coordType)">const <ptype>GLvoid</ptype> *<name>coords</name></param> + <param len="COMPSIZE(numCoords,coordType)">const void *<name>coords</name></param> </command> <command> <proto>void <name>glPathSubCoordsNV</name></proto> @@ -18571,7 +18716,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>coordStart</name></param> <param><ptype>GLsizei</ptype> <name>numCoords</name></param> <param group="PathCoordType"><ptype>GLenum</ptype> <name>coordType</name></param> - <param len="COMPSIZE(numCoords,coordType)">const <ptype>GLvoid</ptype> *<name>coords</name></param> + <param len="COMPSIZE(numCoords,coordType)">const void *<name>coords</name></param> </command> <command> <proto>void <name>glPathTexGenNV</name></proto> @@ -18591,7 +18736,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glPixelDataRangeNV</name></proto> <param group="PixelDataRangeTargetNV"><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLsizei</ptype> <name>length</name></param> - <param len="length">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="length">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glPixelMapfv</name></proto> @@ -18979,14 +19124,14 @@ typedef unsigned int GLhandleARB; <proto>void <name>glProgramBinary</name></proto> <param><ptype>GLuint</ptype> <name>program</name></param> <param><ptype>GLenum</ptype> <name>binaryFormat</name></param> - <param len="length">const <ptype>GLvoid</ptype> *<name>binary</name></param> + <param len="length">const void *<name>binary</name></param> <param><ptype>GLsizei</ptype> <name>length</name></param> </command> <command> <proto>void <name>glProgramBinaryOES</name></proto> <param><ptype>GLuint</ptype> <name>program</name></param> <param><ptype>GLenum</ptype> <name>binaryFormat</name></param> - <param>const <ptype>GLvoid</ptype> *<name>binary</name></param> + <param>const void *<name>binary</name></param> <param><ptype>GLint</ptype> <name>length</name></param> </command> <command> @@ -19298,7 +19443,7 @@ typedef unsigned int GLhandleARB; <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param> <param group="ProgramFormatARB"><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLsizei</ptype> <name>len</name></param> - <param len="len">const <ptype>GLvoid</ptype> *<name>string</name></param> + <param len="len">const void *<name>string</name></param> </command> <command> <proto>void <name>glProgramSubroutineParametersuivNV</name></proto> @@ -20314,6 +20459,13 @@ typedef unsigned int GLhandleARB; <alias name="glQueryCounter"/> </command> <command> + <proto>void <name>glQueryObjectParameteruiAMD</name></proto> + <param><ptype>GLenum</ptype> <name>target</name></param> + <param><ptype>GLuint</ptype> <name>id</name></param> + <param><ptype>GLenum</ptype> <name>pname</name></param> + <param group="OcclusionQueryEventMaskAMD"><ptype>GLuint</ptype> <name>param</name></param> + </command> + <command> <proto><ptype>GLbitfield</ptype> <name>glQueryMatrixxOES</name></proto> <param len="16"><ptype>GLfixed</ptype> *<name>mantissa</name></param> <param len="16"><ptype>GLint</ptype> *<name>exponent</name></param> @@ -20519,7 +20671,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)"><ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">void *<name>pixels</name></param> <glx type="single" opcode="111"/> <glx type="render" opcode="345" name="glReadPixelsPBO" comment="PBO protocol"/> </command> @@ -20532,7 +20684,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>bufSize</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>data</name></param> + <param len="bufSize">void *<name>data</name></param> </command> <command> <proto>void <name>glReadnPixelsEXT</name></proto> @@ -20543,7 +20695,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>bufSize</name></param> - <param len="bufSize"><ptype>GLvoid</ptype> *<name>data</name></param> + <param len="bufSize">void *<name>data</name></param> </command> <command> <proto>void <name>glRectd</name></proto> @@ -20714,7 +20866,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glReplacementCodePointerSUN</name></proto> <param group="ReplacementCodeTypeSUN"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void **<name>pointer</name></param> </command> <command> <proto>void <name>glReplacementCodeubSUN</name></proto> @@ -21003,7 +21155,7 @@ typedef unsigned int GLhandleARB; </command> <command> <proto>void <name>glSampleMaski</name></proto> - <param><ptype>GLuint</ptype> <name>index</name></param> + <param><ptype>GLuint</ptype> <name>maskNumber</name></param> <param><ptype>GLbitfield</ptype> <name>mask</name></param> </command> <command> @@ -21346,14 +21498,14 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glSecondaryColorPointerEXT</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> <alias name="glSecondaryColorPointer"/> </command> <command> @@ -21361,7 +21513,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="SecondaryColorPointerTypeIBM"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLint</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void **<name>pointer</name></param> <param><ptype>GLint</ptype> <name>ptrstride</name></param> </command> <command> @@ -21386,8 +21538,8 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type,width)">const <ptype>GLvoid</ptype> *<name>row</name></param> - <param len="COMPSIZE(target,format,type,height)">const <ptype>GLvoid</ptype> *<name>column</name></param> + <param len="COMPSIZE(target,format,type,width)">const void *<name>row</name></param> + <param len="COMPSIZE(target,format,type,height)">const void *<name>column</name></param> <glx type="render" opcode="4109"/> <glx type="render" opcode="327" name="glSeparableFilter2DPBO" comment="PBO protocol"/> </command> @@ -21399,8 +21551,8 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(target,format,type,width)">const <ptype>GLvoid</ptype> *<name>row</name></param> - <param len="COMPSIZE(target,format,type,height)">const <ptype>GLvoid</ptype> *<name>column</name></param> + <param len="COMPSIZE(target,format,type,width)">const void *<name>row</name></param> + <param len="COMPSIZE(target,format,type,height)">const void *<name>column</name></param> <alias name="glSeparableFilter2D"/> <glx type="render" opcode="4109"/> </command> @@ -21422,13 +21574,13 @@ typedef unsigned int GLhandleARB; <proto>void <name>glSetInvariantEXT</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param group="ScalarType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(id,type)">const <ptype>GLvoid</ptype> *<name>addr</name></param> + <param len="COMPSIZE(id,type)">const void *<name>addr</name></param> </command> <command> <proto>void <name>glSetLocalConstantEXT</name></proto> <param><ptype>GLuint</ptype> <name>id</name></param> <param group="ScalarType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(id,type)">const <ptype>GLvoid</ptype> *<name>addr</name></param> + <param len="COMPSIZE(id,type)">const void *<name>addr</name></param> </command> <command> <proto>void <name>glSetMultisamplefvAMD</name></proto> @@ -21446,7 +21598,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>count</name></param> <param len="count">const <ptype>GLuint</ptype> *<name>shaders</name></param> <param><ptype>GLenum</ptype> <name>binaryformat</name></param> - <param len="length">const <ptype>GLvoid</ptype> *<name>binary</name></param> + <param len="length">const void *<name>binary</name></param> <param><ptype>GLsizei</ptype> <name>length</name></param> </command> <command> @@ -21475,14 +21627,14 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>shader</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param len="count">const <ptype>GLchar</ptype> *const*<name>string</name></param> - <param len="1">const <ptype>GLint</ptype> *<name>length</name></param> + <param len="count">const <ptype>GLint</ptype> *<name>length</name></param> </command> <command> <proto>void <name>glShaderSourceARB</name></proto> <param group="handleARB"><ptype>GLhandleARB</ptype> <name>shaderObj</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> <param len="count">const <ptype>GLcharARB</ptype> **<name>string</name></param> - <param len="1">const <ptype>GLint</ptype> *<name>length</name></param> + <param len="count">const <ptype>GLint</ptype> *<name>length</name></param> <alias name="glShaderSource"/> </command> <command> @@ -21544,7 +21696,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glStencilFillPathInstancedNV</name></proto> <param><ptype>GLsizei</ptype> <name>numPaths</name></param> <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param> - <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const <ptype>GLvoid</ptype> *<name>paths</name></param> + <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param> <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param> <param group="PathFillMode"><ptype>GLenum</ptype> <name>fillMode</name></param> <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param> @@ -21619,7 +21771,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glStencilStrokePathInstancedNV</name></proto> <param><ptype>GLsizei</ptype> <name>numPaths</name></param> <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param> - <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const <ptype>GLvoid</ptype> *<name>paths</name></param> + <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param> <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param> <param group="StencilValue"><ptype>GLint</ptype> <name>reference</name></param> <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param> @@ -21640,7 +21792,7 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glStringMarkerGREMEDY</name></proto> <param><ptype>GLsizei</ptype> <name>len</name></param> - <param len="len">const <ptype>GLvoid</ptype> *<name>string</name></param> + <param len="len">const void *<name>string</name></param> </command> <command> <proto>void <name>glSwizzleEXT</name></proto> @@ -21718,7 +21870,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glTangentPointerEXT</name></proto> <param group="TangentPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glTbufferMask3DFX</name></proto> @@ -22269,7 +22421,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glTexCoordPointerEXT</name></proto> @@ -22277,21 +22429,21 @@ typedef unsigned int GLhandleARB; <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> - <param len="COMPSIZE(size,type,stride,count)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride,count)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glTexCoordPointerListIBM</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLint</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void **<name>pointer</name></param> <param><ptype>GLint</ptype> <name>ptrstride</name></param> </command> <command> <proto>void <name>glTexCoordPointervINTEL</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="4">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="4">const void **<name>pointer</name></param> </command> <command> <proto>void <name>glTexEnvf</name></proto> @@ -22440,7 +22592,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param> <glx type="render" opcode="109"/> <glx type="render" opcode="328" name="glTexImage1DPBO" comment="PBO protocol"/> </command> @@ -22454,7 +22606,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param> <glx type="render" opcode="110"/> <glx type="render" opcode="329" name="glTexImage2DPBO" comment="PBO protocol"/> </command> @@ -22462,7 +22614,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glTexImage2DMultisample</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLsizei</ptype> <name>samples</name></param> - <param><ptype>GLint</ptype> <name>internalformat</name></param> + <param><ptype>GLenum</ptype> <name>internalformat</name></param> <param><ptype>GLsizei</ptype> <name>width</name></param> <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param> @@ -22488,7 +22640,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param> <glx type="render" opcode="4114"/> <glx type="render" opcode="330" name="glTexImage3DPBO" comment="PBO protocol"/> </command> @@ -22503,7 +22655,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param> <alias name="glTexImage3D"/> <glx type="render" opcode="4114"/> </command> @@ -22511,7 +22663,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glTexImage3DMultisample</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLsizei</ptype> <name>samples</name></param> - <param><ptype>GLint</ptype> <name>internalformat</name></param> + <param><ptype>GLenum</ptype> <name>internalformat</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> @@ -22539,7 +22691,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>border</name></param> <param><ptype>GLenum</ptype> <name>format</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> - <param>const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param>const void *<name>pixels</name></param> </command> <command> <proto>void <name>glTexImage4DSGIS</name></proto> @@ -22553,7 +22705,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth,size4d)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth,size4d)">const void *<name>pixels</name></param> <glx type="render" opcode="2057"/> </command> <command> @@ -22738,7 +22890,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param> <glx type="render" opcode="4099"/> <glx type="render" opcode="331" name="glTexSubImage1DPBO" comment="PBO protocol"/> </command> @@ -22750,7 +22902,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param> <alias name="glTexSubImage1D"/> <glx type="render" opcode="4099"/> </command> @@ -22764,7 +22916,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param> <glx type="render" opcode="4100"/> <glx type="render" opcode="332" name="glTexSubImage2DPBO" comment="PBO protocol"/> </command> @@ -22778,7 +22930,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param> <alias name="glTexSubImage2D"/> <glx type="render" opcode="4100"/> </command> @@ -22794,7 +22946,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param> <glx type="render" opcode="4115"/> <glx type="render" opcode="333" name="glTexSubImage3DPBO" comment="PBO protocol"/> </command> @@ -22810,7 +22962,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param> <alias name="glTexSubImage3D"/> <glx type="render" opcode="4115"/> </command> @@ -22826,7 +22978,7 @@ typedef unsigned int GLhandleARB; <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 <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param>const void *<name>pixels</name></param> </command> <command> <proto>void <name>glTexSubImage4DSGIS</name></proto> @@ -22842,7 +22994,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>size4d</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth,size4d)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth,size4d)">const void *<name>pixels</name></param> <glx type="render" opcode="2058"/> </command> <command> @@ -22883,7 +23035,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glTextureImage2DEXT</name></proto> @@ -22896,7 +23048,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glTextureImage2DMultisampleCoverageNV</name></proto> @@ -22931,7 +23083,7 @@ typedef unsigned int GLhandleARB; <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glTextureImage3DMultisampleCoverageNV</name></proto> @@ -23029,7 +23181,7 @@ typedef unsigned int GLhandleARB; <proto>void <name>glTextureRangeAPPLE</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLsizei</ptype> <name>length</name></param> - <param len="length">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="length">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glTextureRenderbufferEXT</name></proto> @@ -23105,7 +23257,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>width</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glTextureSubImage2DEXT</name></proto> @@ -23118,7 +23270,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>height</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glTextureSubImage3DEXT</name></proto> @@ -23133,7 +23285,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLsizei</ptype> <name>depth</name></param> <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param> <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="COMPSIZE(format,type,width,height,depth)">const <ptype>GLvoid</ptype> *<name>pixels</name></param> + <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param> </command> <command> <proto>void <name>glTextureView</name></proto> @@ -23769,6 +23921,14 @@ typedef unsigned int GLhandleARB; <glx type="render" opcode="305"/> </command> <command> + <proto>void <name>glUniformMatrix2x3fvNV</name></proto> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param> + <param len="6">const <ptype>GLfloat</ptype> *<name>value</name></param> + <alias name="glUniformMatrix2x3fv"/> + </command> + <command> <proto>void <name>glUniformMatrix2x4dv</name></proto> <param><ptype>GLint</ptype> <name>location</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> @@ -23784,6 +23944,14 @@ typedef unsigned int GLhandleARB; <glx type="render" opcode="307"/> </command> <command> + <proto>void <name>glUniformMatrix2x4fvNV</name></proto> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param> + <param len="8">const <ptype>GLfloat</ptype> *<name>value</name></param> + <alias name="glUniformMatrix2x4fv"/> + </command> + <command> <proto>void <name>glUniformMatrix3dv</name></proto> <param><ptype>GLint</ptype> <name>location</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> @@ -23821,6 +23989,14 @@ typedef unsigned int GLhandleARB; <glx type="render" opcode="306"/> </command> <command> + <proto>void <name>glUniformMatrix3x2fvNV</name></proto> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param> + <param len="6">const <ptype>GLfloat</ptype> *<name>value</name></param> + <alias name="glUniformMatrix3x2fv"/> + </command> + <command> <proto>void <name>glUniformMatrix3x4dv</name></proto> <param><ptype>GLint</ptype> <name>location</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> @@ -23836,6 +24012,14 @@ typedef unsigned int GLhandleARB; <glx type="render" opcode="309"/> </command> <command> + <proto>void <name>glUniformMatrix3x4fvNV</name></proto> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param> + <param len="12">const <ptype>GLfloat</ptype> *<name>value</name></param> + <alias name="glUniformMatrix3x4fv"/> + </command> + <command> <proto>void <name>glUniformMatrix4dv</name></proto> <param><ptype>GLint</ptype> <name>location</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> @@ -23873,6 +24057,14 @@ typedef unsigned int GLhandleARB; <glx type="render" opcode="308"/> </command> <command> + <proto>void <name>glUniformMatrix4x2fvNV</name></proto> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param> + <param len="8">const <ptype>GLfloat</ptype> *<name>value</name></param> + <alias name="glUniformMatrix4x2fv"/> + </command> + <command> <proto>void <name>glUniformMatrix4x3dv</name></proto> <param><ptype>GLint</ptype> <name>location</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> @@ -23888,6 +24080,14 @@ typedef unsigned int GLhandleARB; <glx type="render" opcode="310"/> </command> <command> + <proto>void <name>glUniformMatrix4x3fvNV</name></proto> + <param><ptype>GLint</ptype> <name>location</name></param> + <param><ptype>GLsizei</ptype> <name>count</name></param> + <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param> + <param len="12">const <ptype>GLfloat</ptype> *<name>value</name></param> + <alias name="glUniformMatrix4x3fv"/> + </command> + <command> <proto>void <name>glUniformSubroutinesuiv</name></proto> <param><ptype>GLenum</ptype> <name>shadertype</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> @@ -23939,7 +24139,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>buffer</name></param> <param><ptype>GLuint</ptype> <name>offset</name></param> <param><ptype>GLsizei</ptype> <name>size</name></param> - <param len="size">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="size">const void *<name>pointer</name></param> <param group="PreserveModeATI"><ptype>GLenum</ptype> <name>preserve</name></param> </command> <command> @@ -23981,11 +24181,11 @@ typedef unsigned int GLhandleARB; </command> <command> <proto>void <name>glVDPAUInitNV</name></proto> - <param>const <ptype>GLvoid</ptype> *<name>vdpDevice</name></param> - <param>const <ptype>GLvoid</ptype> *<name>getProcAddress</name></param> + <param>const void *<name>vdpDevice</name></param> + <param>const void *<name>getProcAddress</name></param> </command> <command> - <proto>void <name>glVDPAUIsSurfaceNV</name></proto> + <proto><ptype>GLboolean</ptype> <name>glVDPAUIsSurfaceNV</name></proto> <param group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>surface</name></param> </command> <command> @@ -23995,14 +24195,14 @@ typedef unsigned int GLhandleARB; </command> <command> <proto group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>glVDPAURegisterOutputSurfaceNV</name></proto> - <param>const <ptype>GLvoid</ptype> *<name>vdpSurface</name></param> + <param>const void *<name>vdpSurface</name></param> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLsizei</ptype> <name>numTextureNames</name></param> <param len="numTextureNames">const <ptype>GLuint</ptype> *<name>textureNames</name></param> </command> <command> <proto group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>glVDPAURegisterVideoSurfaceNV</name></proto> - <param>const <ptype>GLvoid</ptype> *<name>vdpSurface</name></param> + <param>const void *<name>vdpSurface</name></param> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLsizei</ptype> <name>numTextureNames</name></param> <param len="numTextureNames">const <ptype>GLuint</ptype> *<name>textureNames</name></param> @@ -24051,7 +24251,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLuint</ptype> <name>id</name></param> <param group="ScalarType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLuint</ptype> <name>stride</name></param> - <param len="COMPSIZE(id,type,stride)">const <ptype>GLvoid</ptype> *<name>addr</name></param> + <param len="COMPSIZE(id,type,stride)">const void *<name>addr</name></param> </command> <command> <proto>void <name>glVariantbvEXT</name></proto> @@ -24393,12 +24593,12 @@ typedef unsigned int GLhandleARB; <command> <proto>void <name>glVertexArrayRangeAPPLE</name></proto> <param><ptype>GLsizei</ptype> <name>length</name></param> - <param len="length"><ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="length">void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexArrayRangeNV</name></proto> <param><ptype>GLsizei</ptype> <name>length</name></param> - <param len="COMPSIZE(length)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(length)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexArraySecondaryColorOffsetEXT</name></proto> @@ -25278,6 +25478,12 @@ typedef unsigned int GLhandleARB; <alias name="glVertexAttribDivisor"/> </command> <command> + <proto>void <name>glVertexAttribDivisorEXT</name></proto> + <param><ptype>GLuint</ptype> <name>index</name></param> + <param><ptype>GLuint</ptype> <name>divisor</name></param> + <alias name="glVertexAttribDivisor"/> + </command> + <command> <proto>void <name>glVertexAttribDivisorNV</name></proto> <param><ptype>GLuint</ptype> <name>index</name></param> <param><ptype>GLuint</ptype> <name>divisor</name></param> @@ -25578,7 +25784,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexAttribIPointerEXT</name></proto> @@ -25586,7 +25792,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> <alias name="glVertexAttribIPointer"/> </command> <command> @@ -25811,7 +26017,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="size">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="size">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexAttribLPointerEXT</name></proto> @@ -25819,7 +26025,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="size">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="size">const void *<name>pointer</name></param> <alias name="glVertexAttribLPointer"/> </command> <command> @@ -25891,7 +26097,7 @@ typedef unsigned int GLhandleARB; <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexAttribPointerARB</name></proto> @@ -25900,7 +26106,7 @@ typedef unsigned int GLhandleARB; <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> <alias name="glVertexAttribPointer"/> </command> <command> @@ -25909,7 +26115,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>fsize</name></param> <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(fsize,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(fsize,type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexAttribs1dvNV</name></proto> @@ -26091,7 +26297,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexPointerEXT</name></proto> @@ -26099,21 +26305,21 @@ typedef unsigned int GLhandleARB; <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> <param><ptype>GLsizei</ptype> <name>count</name></param> - <param len="COMPSIZE(size,type,stride,count)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride,count)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexPointerListIBM</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLint</ptype> <name>stride</name></param> - <param len="COMPSIZE(size,type,stride)">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="COMPSIZE(size,type,stride)">const void **<name>pointer</name></param> <param><ptype>GLint</ptype> <name>ptrstride</name></param> </command> <command> <proto>void <name>glVertexPointervINTEL</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param> - <param len="4">const <ptype>GLvoid</ptype> **<name>pointer</name></param> + <param len="4">const void **<name>pointer</name></param> </command> <command> <proto>void <name>glVertexStream1dATI</name></proto> @@ -26304,7 +26510,7 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="VertexWeightPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glVertexWeightfEXT</name></proto> @@ -26404,14 +26610,14 @@ typedef unsigned int GLhandleARB; <param><ptype>GLint</ptype> <name>size</name></param> <param group="WeightPointerTypeARB"><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param len="COMPSIZE(type,stride)">const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param> </command> <command> <proto>void <name>glWeightPointerOES</name></proto> <param><ptype>GLint</ptype> <name>size</name></param> <param><ptype>GLenum</ptype> <name>type</name></param> <param><ptype>GLsizei</ptype> <name>stride</name></param> - <param>const <ptype>GLvoid</ptype> *<name>pointer</name></param> + <param>const void *<name>pointer</name></param> </command> <command> <proto>void <name>glWeightbvARB</name></proto> @@ -26823,6 +27029,7 @@ typedef unsigned int GLhandleARB; <!-- SECTION: GL API interface definitions. --> <feature api="gl" name="GL_VERSION_1_0" number="1.0"> <require> + <type name="GLvoid" comment="No longer used in headers"/> <command name="glCullFace"/> <command name="glFrontFace"/> <command name="glHint"/> @@ -28747,7 +28954,6 @@ typedef unsigned int GLhandleARB; <enum name="GL_WAIT_FAILED"/> <enum name="GL_TIMEOUT_IGNORED"/> <enum name="GL_SYNC_FLUSH_COMMANDS_BIT"/> - <enum name="GL_TIMEOUT_IGNORED"/> <command name="glFenceSync"/> <command name="glIsSync"/> <command name="glDeleteSync"/> @@ -29075,6 +29281,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_CLIENT_VERTEX_ARRAY_BIT"/> <enum name="GL_CLIENT_ALL_ATTRIB_BITS"/> <enum name="GL_QUAD_STRIP"/> + <enum name="GL_QUADS"/> <enum name="GL_POLYGON"/> <enum name="GL_ACCUM"/> <enum name="GL_LOAD"/> @@ -29793,6 +30000,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_TESS_GEN_VERTEX_ORDER"/> <enum name="GL_TESS_GEN_POINT_MODE"/> <enum name="GL_ISOLINES"/> + <enum name="GL_QUADS"/> <enum name="GL_FRACTIONAL_ODD"/> <enum name="GL_FRACTIONAL_EVEN"/> <enum name="GL_MAX_PATCH_VERTICES"/> @@ -30123,6 +30331,12 @@ typedef unsigned int GLhandleARB; </require> <require comment="Reuse tokens from ARB_shading_language_packing (none)"> </require> + <require comment="Reuse tokens from ARB_texture_compression_bptc"> + <enum name="GL_COMPRESSED_RGBA_BPTC_UNORM"/> + <enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/> + <enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT"/> + <enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT"/> + </require> <require comment="Reuse tokens from ARB_texture_storage"> <enum name="GL_TEXTURE_IMMUTABLE_FORMAT"/> </require> @@ -30206,10 +30420,10 @@ typedef unsigned int GLhandleARB; <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS"/> <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTERS"/> <enum name="GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS"/> - <enum name="GL_MAX_COMPUTE_LOCAL_INVOCATIONS"/> + <enum name="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/> <enum name="GL_MAX_COMPUTE_WORK_GROUP_COUNT"/> <enum name="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/> - <enum name="GL_COMPUTE_LOCAL_WORK_SIZE"/> + <enum name="GL_COMPUTE_WORK_GROUP_SIZE"/> <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER"/> <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER"/> <enum name="GL_DISPATCH_INDIRECT_BUFFER"/> @@ -30579,6 +30793,8 @@ typedef unsigned int GLhandleARB; <feature api="gl" name="GL_VERSION_4_4" number="4.4"> <require> <enum name="GL_MAX_VERTEX_ATTRIB_STRIDE"/> + <enum name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED"/> + <enum name="GL_TEXTURE_BUFFER_BINDING"/> </require> <require comment="Reuse GL_ARB_buffer_storage"> <enum name="GL_MAP_READ_BIT"/> @@ -30636,6 +30852,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_VERSION_ES_CL_1_0"/> <enum name="GL_VERSION_ES_CM_1_1"/> <enum name="GL_VERSION_ES_CL_1_1"/> + <type name="GLvoid" comment="No longer used in headers"/> <enum name="GL_DEPTH_BUFFER_BIT"/> <enum name="GL_STENCIL_BUFFER_BIT"/> <enum name="GL_COLOR_BUFFER_BIT"/> @@ -31117,6 +31334,19 @@ typedef unsigned int GLhandleARB; </require> </feature> <feature api="gles2" name="GL_ES_VERSION_2_0" number="2.0"> + <require comment="Not used by the API, for compatibility with old gl2.h"> + <type name="GLbyte"/> + <type name="GLclampf"/> + <type name="GLfixed"/> + <type name="GLshort"/> + <type name="GLushort"/> + <type name="GLvoid" comment="No longer used in headers"/> + </require> + <require comment="Not used by the API; put here so this type doesn't need to be declared in gl2ext.h"> + <type name="GLsync"/> + <type name="GLint64"/> + <type name="GLuint64"/> + </require> <require> <enum name="GL_DEPTH_BUFFER_BIT"/> <enum name="GL_STENCIL_BUFFER_BIT"/> @@ -31564,6 +31794,9 @@ typedef unsigned int GLhandleARB; </require> </feature> <feature api="gles2" name="GL_ES_VERSION_3_0" number="3.0"> + <require comment="Not used by the API, for compatibility with old gl2.h"> + <type name="GLhalf"/> + </require> <require> <enum name="GL_READ_BUFFER"/> <enum name="GL_UNPACK_ROW_LENGTH"/> @@ -32089,6 +32322,17 @@ typedef unsigned int GLhandleARB; <command name="glIsNameAMD"/> </require> </extension> + <extension name="GL_AMD_occlusion_query_event" supported="gl"> + <require> + <enum name="GL_OCCLUSION_QUERY_EVENT_MASK_AMD"/> + <enum name="GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD"/> + <enum name="GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD"/> + <enum name="GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD"/> + <enum name="GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD"/> + <enum name="GL_QUERY_ALL_EVENT_BITS_AMD"/> + <command name="glQueryObjectParameteruiAMD"/> + </require> + </extension> <extension name="GL_AMD_performance_monitor" supported="gl|gles2"> <require> <enum name="GL_COUNTER_TYPE_AMD"/> @@ -32372,6 +32616,9 @@ typedef unsigned int GLhandleARB; <enum name="GL_UNSIGNED_SHORT_8_8_APPLE"/> <enum name="GL_UNSIGNED_SHORT_8_8_REV_APPLE"/> </require> + <require comment="Depends on TexStorage* (EXT_texture_storage / ES 3.0 / GL 4.4 / etc.)"> + <enum name="GL_RGB_RAW_422_APPLE"/> + </require> </extension> <extension name="GL_APPLE_row_bytes" supported="gl"> <require> @@ -32419,6 +32666,9 @@ typedef unsigned int GLhandleARB; <require> <enum name="GL_BGRA_EXT"/> </require> + <require comment="Depends on TexStorage* (EXT_texture_storage / ES 3.0 / GL 4.4 / etc.)"> + <enum name="GL_BGRA8_EXT"/> + </require> </extension> <extension name="GL_APPLE_texture_max_level" supported="gles1|gles2"> <require> @@ -32649,10 +32899,10 @@ typedef unsigned int GLhandleARB; <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS"/> <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTERS"/> <enum name="GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS"/> - <enum name="GL_MAX_COMPUTE_LOCAL_INVOCATIONS"/> + <enum name="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/> <enum name="GL_MAX_COMPUTE_WORK_GROUP_COUNT"/> <enum name="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/> - <enum name="GL_COMPUTE_LOCAL_WORK_SIZE"/> + <enum name="GL_COMPUTE_WORK_GROUP_SIZE"/> <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER"/> <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER"/> <enum name="GL_DISPATCH_INDIRECT_BUFFER"/> @@ -34179,6 +34429,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_TESS_GEN_POINT_MODE"/> <enum name="GL_TRIANGLES"/> <enum name="GL_ISOLINES"/> + <enum name="GL_QUADS"/> <enum name="GL_EQUAL"/> <enum name="GL_FRACTIONAL_ODD"/> <enum name="GL_FRACTIONAL_EVEN"/> @@ -34207,9 +34458,6 @@ typedef unsigned int GLhandleARB; <command name="glPatchParameteri"/> <command name="glPatchParameterfv"/> </require> - <require api="gl" profile="compatibility"> - <enum name="GL_QUADS"/> - </require> </extension> <extension name="GL_ARB_texture_border_clamp" supported="gl"> <require> @@ -35651,7 +35899,7 @@ typedef unsigned int GLhandleARB; <command name="glCullParameterfvEXT"/> </require> </extension> - <extension name="GL_EXT_debug_label" supported="gles2"> + <extension name="GL_EXT_debug_label" supported="gl|gles2"> <require> <enum name="GL_PROGRAM_PIPELINE_OBJECT_EXT"/> <enum name="GL_PROGRAM_OBJECT_EXT"/> @@ -35662,8 +35910,12 @@ typedef unsigned int GLhandleARB; <command name="glLabelObjectEXT"/> <command name="glGetObjectLabelEXT"/> </require> + <require comment="Depends on OpenGL ES 3.0"> + <enum name="GL_SAMPLER"/> + <enum name="GL_TRANSFORM_FEEDBACK"/> + </require> </extension> - <extension name="GL_EXT_debug_marker" supported="gles2"> + <extension name="GL_EXT_debug_marker" supported="gl|gles2"> <require> <command name="glInsertEventMarkerEXT"/> <command name="glPushGroupMarkerEXT"/> @@ -36110,7 +36362,7 @@ typedef unsigned int GLhandleARB; <command name="glIsEnabledIndexedEXT"/> </require> </extension> - <extension name="GL_EXT_draw_instanced" supported="gl"> + <extension name="GL_EXT_draw_instanced" supported="gl|gles2"> <require> <command name="glDrawArraysInstancedEXT"/> <command name="glDrawElementsInstancedEXT"/> @@ -36375,6 +36627,14 @@ typedef unsigned int GLhandleARB; <require> </require> </extension> + <extension name="GL_EXT_instanced_arrays" supported="gles2"> + <require> + <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT"/> + <command name="glDrawArraysInstancedEXT"/> + <command name="glDrawElementsInstancedEXT"/> + <command name="glVertexAttribDivisorEXT"/> + </require> + </extension> <extension name="GL_EXT_light_texture" supported="gl"> <require> <enum name="GL_FRAGMENT_MATERIAL_EXT"/> @@ -36572,6 +36832,14 @@ typedef unsigned int GLhandleARB; <command name="glProvokingVertexEXT"/> </require> </extension> + <extension name="GL_EXT_pvrtc_sRGB" supported="gles2"> + <require> + <enum name="GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"/> + <enum name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/> + <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/> + <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/> + </require> + </extension> <extension name="GL_EXT_read_format_bgra" supported="gles1|gles2"> <require> <enum name="GL_BGRA_EXT"/> @@ -36686,6 +36954,23 @@ typedef unsigned int GLhandleARB; <command name="glUseProgramStagesEXT"/> <command name="glValidateProgramPipelineEXT"/> </require> + <require api="gles2" comment="Depends on OpenGL ES 3.0 or GL_NV_non_square_matrices"> + <command name="glProgramUniform1uiEXT"/> + <command name="glProgramUniform2uiEXT"/> + <command name="glProgramUniform3uiEXT"/> + <command name="glProgramUniform4uiEXT"/> + <command name="glProgramUniform1uivEXT"/> + <command name="glProgramUniform2uivEXT"/> + <command name="glProgramUniform3uivEXT"/> + <command name="glProgramUniform4uivEXT"/> + <command name="glProgramUniformMatrix4fvEXT"/> + <command name="glProgramUniformMatrix2x3fvEXT"/> + <command name="glProgramUniformMatrix3x2fvEXT"/> + <command name="glProgramUniformMatrix2x4fvEXT"/> + <command name="glProgramUniformMatrix4x2fvEXT"/> + <command name="glProgramUniformMatrix3x4fvEXT"/> + <command name="glProgramUniformMatrix4x3fvEXT"/> + </require> </extension> <extension name="GL_EXT_separate_specular_color" supported="gl"> <require> @@ -36760,6 +37045,10 @@ typedef unsigned int GLhandleARB; <command name="glMemoryBarrierEXT"/> </require> </extension> + <extension name="GL_EXT_shader_integer_mix" supported="gl|gles2"> + <require> + </require> + </extension> <extension name="GL_EXT_shader_texture_lod" supported="gles2"> <require> </require> @@ -36914,7 +37203,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT"/> </require> </extension> - <extension name="GL_EXT_texture_compression_s3tc" supported="gl"> + <extension name="GL_EXT_texture_compression_s3tc" supported="gl|gles2"> <require> <enum name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/> <enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/> @@ -37699,6 +37988,9 @@ typedef unsigned int GLhandleARB; <enum name="GL_INTERLACE_READ_INGR"/> </require> </extension> + <extension name="GL_INTEL_fragment_shader_ordering" supported="gl"> + <require/> + </extension> <extension name="GL_INTEL_map_texture" supported="gl"> <require> <enum name="GL_TEXTURE_MEMORY_LAYOUT_INTEL"/> @@ -37723,6 +38015,40 @@ typedef unsigned int GLhandleARB; <command name="glTexCoordPointervINTEL"/> </require> </extension> + <extension name="GL_INTEL_performance_query" supported="gl|gles2"> + <require> + <enum name="GL_PERFQUERY_SINGLE_CONTEXT_INTEL"/> + <enum name="GL_PERFQUERY_GLOBAL_CONTEXT_INTEL"/> + <enum name="GL_PERFQUERY_WAIT_INTEL"/> + <enum name="GL_PERFQUERY_FLUSH_INTEL"/> + <enum name="GL_PERFQUERY_DONOT_FLUSH_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_EVENT_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_RAW_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL"/> + <enum name="GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL"/> + <enum name="GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL"/> + <enum name="GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL"/> + <command name="glBeginPerfQueryINTEL"/> + <command name="glCreatePerfQueryINTEL"/> + <command name="glDeletePerfQueryINTEL"/> + <command name="glEndPerfQueryINTEL"/> + <command name="glGetFirstPerfQueryIdINTEL"/> + <command name="glGetNextPerfQueryIdINTEL"/> + <command name="glGetPerfCounterInfoINTEL"/> + <command name="glGetPerfQueryDataINTEL"/> + <command name="glGetPerfQueryIdByNameINTEL"/> + <command name="glGetPerfQueryInfoINTEL"/> + </require> + </extension> <extension name="GL_KHR_debug" supported="gl|glcore|gles2"> <require api="gl" comment="KHR extensions *mandate* suffixes for ES, unlike for GL"> <enum name="GL_DEBUG_OUTPUT_SYNCHRONOUS"/> @@ -37835,7 +38161,39 @@ typedef unsigned int GLhandleARB; <enum name="GL_DISPLAY_LIST"/> </require> </extension> - <extension name="GL_KHR_texture_compression_astc_ldr" supported="gl|glcore|gles2"> + <extension name="GL_KHR_texture_compression_astc_hdr" supported="gl|glcore|gles2"> + <require> + <enum name="GL_COMPRESSED_RGBA_ASTC_4x4_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_5x4_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_5x5_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_6x5_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_6x6_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_8x5_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_8x6_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_8x8_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_10x5_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_10x6_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_10x8_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_10x10_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_12x10_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_12x12_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"/> + </require> + </extension> + <extension name="GL_KHR_texture_compression_astc_ldr" supported="gl|glcore|gles2" comment="API is identical to GL_KHR_texture_compression_astc_hdr extension"> <require> <enum name="GL_COMPRESSED_RGBA_ASTC_4x4_KHR"/> <enum name="GL_COMPRESSED_RGBA_ASTC_5x4_KHR"/> @@ -37951,12 +38309,11 @@ typedef unsigned int GLhandleARB; <command name="glIsImageHandleResidentNV"/> </require> </extension> - <extension name="GL_NV_blend_equation_advanced" supported="gl"> + <extension name="GL_NV_blend_equation_advanced" supported="gl|gles2"> <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_BLUE_NV"/> <enum name="GL_COLORBURN_NV"/> <enum name="GL_COLORDODGE_NV"/> <enum name="GL_CONJOINT_NV"/> @@ -37970,7 +38327,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_DST_OUT_NV"/> <enum name="GL_DST_OVER_NV"/> <enum name="GL_EXCLUSION_NV"/> - <enum name="GL_GREEN"/> + <enum name="GL_GREEN_NV"/> <enum name="GL_HARDLIGHT_NV"/> <enum name="GL_HARDMIX_NV"/> <enum name="GL_HSL_COLOR_NV"/> @@ -37993,7 +38350,7 @@ typedef unsigned int GLhandleARB; <enum name="GL_PLUS_CLAMPED_NV"/> <enum name="GL_PLUS_DARKER_NV"/> <enum name="GL_PLUS_NV"/> - <enum name="GL_RED"/> + <enum name="GL_RED_NV"/> <enum name="GL_SCREEN_NV"/> <enum name="GL_SOFTLIGHT_NV"/> <enum name="GL_SRC_ATOP_NV"/> @@ -38003,14 +38360,15 @@ typedef unsigned int GLhandleARB; <enum name="GL_SRC_OVER_NV"/> <enum name="GL_UNCORRELATED_NV"/> <enum name="GL_VIVIDLIGHT_NV"/> - <enum name="GL_XOR"/> + <enum name="GL_XOR_NV"/> <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"> + <extension name="GL_NV_blend_equation_advanced_coherent" supported="gl|gles2"> + <require comment="Otherwise identical to GL_NV_blend_equation_advanced, just different semantic behavior"> + <enum name="GL_BLEND_ADVANCED_COHERENT_NV"/> </require> </extension> <extension name="GL_NV_blend_square" supported="gl"> @@ -38033,6 +38391,13 @@ typedef unsigned int GLhandleARB; <command name="glEndConditionalRenderNV"/> </require> </extension> + <extension name="GL_NV_copy_buffer" supported="gles2"> + <require> + <enum name="GL_COPY_READ_BUFFER_NV"/> + <enum name="GL_COPY_WRITE_BUFFER_NV"/> + <command name="glCopyBufferSubDataNV"/> + </require> + </extension> <extension name="GL_NV_copy_depth_to_color" supported="gl"> <require> <enum name="GL_DEPTH_STENCIL_TO_RGBA_NV"/> @@ -38172,6 +38537,10 @@ typedef unsigned int GLhandleARB; <command name="glEvalMapsNV"/> </require> </extension> + <extension name="GL_NV_explicit_attrib_location" supported="gles2"> + <require> + </require> + </extension> <extension name="GL_NV_explicit_multisample" supported="gl"> <require> <enum name="GL_SAMPLE_POSITION_NV"/> @@ -38532,6 +38901,22 @@ typedef unsigned int GLhandleARB; <enum name="GL_MULTISAMPLE_FILTER_HINT_NV"/> </require> </extension> + <extension name="GL_NV_non_square_matrices" supported="gles2"> + <require> + <enum name="GL_FLOAT_MAT2x3_NV"/> + <enum name="GL_FLOAT_MAT2x4_NV"/> + <enum name="GL_FLOAT_MAT3x2_NV"/> + <enum name="GL_FLOAT_MAT3x4_NV"/> + <enum name="GL_FLOAT_MAT4x2_NV"/> + <enum name="GL_FLOAT_MAT4x3_NV"/> + <command name="glUniformMatrix2x3fvNV"/> + <command name="glUniformMatrix3x2fvNV"/> + <command name="glUniformMatrix2x4fvNV"/> + <command name="glUniformMatrix4x2fvNV"/> + <command name="glUniformMatrix3x4fvNV"/> + <command name="glUniformMatrix4x3fvNV"/> + </require> + </extension> <extension name="GL_NV_occlusion_query" supported="gl"> <require> <enum name="GL_PIXEL_COUNTER_BITS_NV"/> @@ -40025,6 +40410,58 @@ typedef unsigned int GLhandleARB; <command name="glFramebufferTexture3DOES"/> </require> </extension> + <extension name="GL_OES_texture_compression_astc" supported="gles2" comment="API is identical to GL_KHR_texture_compression_astc_hdr extension"> + <require> + <enum name="GL_COMPRESSED_RGBA_ASTC_4x4_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_5x4_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_5x5_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_6x5_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_6x6_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_8x5_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_8x6_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_8x8_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_10x5_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_10x6_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_10x8_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_10x10_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_12x10_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_12x12_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_3x3x3_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_4x3x3_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_4x4x3_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_4x4x4_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_5x4x4_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_5x5x4_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_5x5x5_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_6x5x5_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_6x6x5_OES"/> + <enum name="GL_COMPRESSED_RGBA_ASTC_6x6x6_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES"/> + <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES"/> + </require> + </extension> <extension name="GL_OES_texture_cube_map" supported="gles1"> <require> <enum name="GL_NORMAL_MAP_OES"/> @@ -40775,8 +41212,7 @@ typedef unsigned int GLhandleARB; </require> </extension> <extension name="GL_SGIX_ycrcb_subsample" supported="gl"> - <require> - </require> + <require/> </extension> <extension name="GL_SGIX_ycrcba" supported="gl"> <require> diff --git a/registry/glx.xml b/registry/glx.xml index 1b018c5..7907442 100644 --- a/registry/glx.xml +++ b/registry/glx.xml @@ -86,6 +86,7 @@ typedef unsigned __int64 uint64_t; <type name="XVisualInfo"/> <type name="GLboolean"/> <type name="GLenum"/> + <type name="GLfloat"/> <type name="GLint"/> <type name="GLsizei"/> <type name="GLubyte"/> @@ -819,6 +820,12 @@ typedef unsigned __int64 uint64_t; <param>float <name>cushion</name></param> </command> <command> + <proto><ptype>Bool</ptype> <name>glXDelayBeforeSwapNV</name></proto> + <param><ptype>Display</ptype> *<name>dpy</name></param> + <param><ptype>GLXDrawable</ptype> <name>drawable</name></param> + <param><ptype>GLfloat</ptype> <name>seconds</name></param> + </command> + <command> <proto>void <name>glXDestroyContext</name></proto> <param><ptype>Display</ptype> *<name>dpy</name></param> <param><ptype>GLXContext</ptype> <name>ctx</name></param> @@ -1399,6 +1406,7 @@ typedef unsigned __int64 uint64_t; <feature api="glx" name="GLX_VERSION_1_3" number="1.3"> <require> + <type name="GLXContextID" comment="Required here so it doesn't collide with Mesa glx.h (Bug 11454)"/> <enum name="GLX_WINDOW_BIT"/> <enum name="GLX_PIXMAP_BIT"/> <enum name="GLX_PBUFFER_BIT"/> @@ -1778,6 +1786,11 @@ typedef unsigned __int64 uint64_t; <command name="glXWaitForSbcOML"/> </require> </extension> + <extension name="GLX_NV_delay_before_swap" supported="glx"> + <require> + <command name="glXDelayBeforeSwapNV"/> + </require> + </extension> <extension name="GLX_NV_float_buffer" supported="glx"> <require> <enum name="GLX_FLOAT_COMPONENTS_NV"/> |