From ad503c41557606d15b0420c824369456f6d20a8f Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Thu, 1 Apr 2010 11:01:31 -0700 Subject: apple: Initial import of libGL for OSX from AppleSGLX svn repository. Signed-off-by: Jeremy Huddleston --- src/glx/apple/gen_funcs.tcl | 635 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 635 insertions(+) create mode 100644 src/glx/apple/gen_funcs.tcl (limited to 'src/glx/apple/gen_funcs.tcl') diff --git a/src/glx/apple/gen_funcs.tcl b/src/glx/apple/gen_funcs.tcl new file mode 100644 index 0000000000..ff314dc6a7 --- /dev/null +++ b/src/glx/apple/gen_funcs.tcl @@ -0,0 +1,635 @@ +package require Tcl 8.5 + +#input is specs/gl.spec + +set license { +/* + Copyright (c) 2008, 2009 Apple Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT + HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name(s) of the above + copyright holders shall not be used in advertising or otherwise to + promote the sale, use or other dealings in this Software without + prior written authorization. +*/ +} + + +proc extension name { + global extensions + + set extensions($name) 1 +} + +proc alias {from to} { + global aliases + + set aliases($from) $to +} + +proc promoted name { + global promoted + + set promoted($name) 1 +} + +proc noop name { + global noop + + set noop($name) 1 +} + +set dir [file dirname [info script]] + +source [file join $dir GL_extensions] +source [file join $dir GL_aliases] +source [file join $dir GL_promoted] +source [file join $dir GL_noop] + +proc is-extension-supported? name { + global extensions + + return [info exists extensions($name)] +} + +#This is going to need to be updated for OpenGL >= 2.1 in SnowLeopard. +array set typemap { + void void + List GLuint + Mode GLenum + CheckedFloat32 GLfloat + CheckedInt32 GLint + Float32 GLfloat + Int32 GLint + Int64 GLint64EXT + UInt64 GLuint64EXT + Float64 GLdouble + ListMode GLuint + SizeI GLsizei + ListNameType GLenum + Void void + BeginMode GLenum + CoordF GLfloat + UInt8 GLubyte + Boolean GLboolean + ColorIndexValueD GLdouble + ColorB GLbyte + ColorD GLdouble + ColorF GLfloat + ColorI GLint + ColorS GLshort + ColorUB GLubyte + ColorUI GLuint + ColorUS GLushort + ColorIndexValueF GLfloat + ColorIndexValueI GLint + ColorIndexValueS GLshort + Int8 GLbyte + CoordD GLdouble + Int16 GLshort + CoordI GLint + CoordS GLshort + ClipPlaneName GLenum + MaterialFace GLenum + ColorMaterialParameter GLenum + CullFaceMode GLenum + FogParameter GLenum + FrontFaceDirection GLenum + HintTarget GLenum + HintMode GLenum + LightName GLenum + LightParameter GLenum + LightModelParameter GLenum + LineStipple GLushort + MaterialParameter GLenum + PolygonMode GLenum + WinCoord GLint + ShadingModel GLenum + TextureTarget GLenum + TextureParameterName GLenum + TextureComponentCount GLenum + PixelFormat GLenum + PixelType GLenum + TextureEnvTarget GLenum + TextureEnvParameter GLenum + TextureCoordName GLenum + TextureGenParameter GLenum + FeedbackType GLenum + FeedbackElement GLfloat + SelectName GLuint + RenderingMode GLenum + DrawBufferMode GLenum + ClearBufferMask GLbitfield + MaskedColorIndexValueF GLfloat + ClampedColorF GLclampf + StencilValue GLint + ClampedFloat64 GLclampd + MaskedStencilValue GLuint + MaskedColorIndexValueI GLuint + AccumOp GLenum + EnableCap GLenum + AttribMask GLbitfield + MapTarget GLenum + MeshMode1 GLenum + MeshMode2 GLenum + AlphaFunction GLenum + ClampedFloat32 GLclampf + BlendingFactorSrc GLenum + BlendingFactorDest GLenum + LogicOp GLenum + StencilFunction GLenum + ClampedStencilValue GLint + MaskedStencilValue GLuint + StencilOp GLenum + DepthFunction GLenum + PixelTransferParameter GLenum + PixelStoreParameter GLenum + PixelMap GLenum + UInt32 GLuint + UInt16 GLushort + ReadBufferMode GLenum + PixelCopyType GLenum + GetPName GLenum + ErrorCode GLenum + GetMapQuery GLenum + String "const GLubyte *" + StringName GLenum + GetTextureParameter GLenum + MatrixMode GLenum + ColorPointerType GLenum + DrawElementsType GLenum + GetPointervPName GLenum + VoidPointer "void *" + IndexPointerType GLenum + InterleavedArrayFormat GLenum + NormalPointerType GLenum + TexCoordPointerType GLenum + VertexPointerType GLenum + PixelInternalFormat GLenum + Texture GLuint + ColorIndexValueUB GLubyte + ClientAttribMask GLbitfield + BlendEquationMode GLenum + ColorTableTarget GLenum + ColorTableParameterPName GLenum + GetColorTableParameterPName GLenum + ConvolutionTarget GLenum + ConvolutionParameter GLenum + GetConvolutionParameterPName GLenum + SeparableTarget GLenum + HistogramTarget GLenum + GetHistogramParameterPName GLenum + MinmaxTarget GLenum + GetMinmaxParameterPName GLenum + TextureTarget GLenum + TextureUnit GLenum + CompressedTextureARB "void" + BlendFuncSeparateParameterEXT GLenum + FogPointerTypeEXT GLenum + PointParameterNameARB GLenum + GLenum GLenum + BufferTargetARB GLenum + ConstUInt32 "const GLuint" + BufferSize GLsizeiptr + ConstVoid "const GLvoid" + BufferUsageARB GLenum + BufferOffset GLintptr + BufferAccessARB GLenum + BufferPNameARB GLenum + BufferPointerNameARB GLenum + BlendEquationModeEXT GLenum + DrawBufferModeATI GLenum + StencilFaceDirection GLenum + Char GLchar + VertexAttribPropertyARB GLenum + VertexAttribPointerPropertyARB GLenum + CharPointer "GLchar *" + VertexAttribPointerTypeARB GLenum + ClampColorTargetARB unknown3.0 + ClampColorModeARB unknown3.0 + VertexAttribEnum GLenum + VertexAttribEnumNV GLenum + DrawBufferName unknown3.0 + WeightPointerTypeARB GLenum + ProgramTargetARB GLenum + ProgramFormatARB GLenum + ProgramStringPropertyARB GLenum + BufferSizeARB GLsizeiptrARB + BufferOffsetARB GLintptrARB + handleARB GLhandleARB + charPointerARB "GLcharARB *" + charARB GLcharARB + RenderbufferTarget GLenum + FramebufferTarget GLenum + FramebufferAttachment GLenum + BinormalPointerTypeEXT GLenum + HintTargetPGI GLenum + ProgramParameterPName GLenum + ProgramPropertyARB GLenum + ElementPointerTypeATI GLenum + FenceNV GLuint + FenceConditionNV GLenum + ObjectTypeAPPLE GLenum + VertexArrayPNameAPPLE GLenum + SeparableTargetEXT GLenum + ColorTableTargetSGI GLenum + ColorTableParameterPNameSGI GLenum + CombinerOutputNV GLenum + CombinerStageNV GLenum + CombinerPortionNV GLenum + CombinerRegisterNV GLenum + CombinerScaleNV GLenum + CombinerBiasNV GLenum + CombinerComponentUsageNV GLenum + CombinerMappingNV GLenum + CombinerParameterNV GLenum + CombinerVariableNV GLenum + ConvolutionParameterEXT GLenum + ConvolutionTargetEXT GLenum + CullParameterEXT GLenum + FenceParameterNameNV GLenum + FragmentLightModelParameterSGIX GLenum + FragmentLightNameSGIX GLenum + FragmentLightParameterSGIX GLenum + GetColorTableParameterPNameSGI GLenum + GetHistogramParameterPNameEXT GLenum + GetMinmaxParameterPNameEXT GLenum + HistogramTargetEXT GLenum + LightEnvParameterSGIX GLenum + MinmaxTargetEXT GLenum + PNTrianglesPNameATI GLenum + ProgramCharacterNV GLubyte + SamplePatternEXT GLenum + SamplePatternSGIS GLenum + TypeEnum GLenum +} + +proc psplit s { + set r [list] + set token "" + + foreach c [split $s ""] { + if {[string is space -strict $c]} { + if {[string length $token]} { + lappend r $token + } + set token "" + } else { + append token $c + } + } + + if {[string length $token]} { + lappend r $token + } + + return $r +} + +proc is-extension? str { + #Check if the trailing name of the function is NV, or EXT, and so on. + + if {[string is upper [string index $str end]] + && [string is upper [string index $str end-1]]} { + return 1 + } + + return 0 +} + + +proc parse {data arvar} { + upvar 1 $arvar ar + + set state "" + set name "" + + foreach line [split $data \n] { + if {"attr" eq $state} { + if {[string match "\t*" $line]} { + set plist [psplit [lindex [split $line "#"] 0]] + #puts PLIST:$plist + set master $ar($name) + set param [dict get $master parameters] + + switch -- [llength $plist] { + 1 { + dict set master [lindex $plist 0] "" + } + + 2 { + #standard key, value pair + set key [lindex $plist 0] + set value [lindex $plist 1] + + dict set master $key $value + } + + default { + set key [lindex $plist 0] + + #puts PLIST:$plist + + if {"param" eq $key} { + lappend param [list [lindex $plist 1] [lindex $plist 2] [lindex $plist 3] [lindex $plist 4]] + } else { + dict set master $key [lrange $plist 1 end] + } + } + } + + dict set master parameters $param + + set ar($name) $master + } else { + set state "" + } + } elseif {[regexp {^([A-Z_a-z0-9]+)\((.*)\)\S*} $line all name argv] > 0} { + #puts "MATCH:$name ARGV:$argv" + + #Trim the spaces in the elements. + set newargv [list] + foreach a [split $argv ,] { + lappend newargv [string trim $a] + } + + + set d [dict create name $name arguments $newargv \ + parameters [dict create]] + set ar($name) $d + set state attr + } + } +} + +#This returns true if the category is valid for an extension. +proc is-valid-category? c { + set clist [list display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2] + + set result [expr {$c in $clist}] + + + if {!$result} { + set result [is-extension-supported? $c] + } + + return $result +} + +proc translate-parameters {func parameters} { + global typemap + + set newparams [list] + + foreach p $parameters { + set var [lindex $p 0] + + set ptype [lindex $p 1] + + if {![info exists typemap($ptype)]} { + set ::missingTypes($ptype) $func + continue + } + + set type $typemap($ptype) + + #In the gl.spec file is MultiDrawArrays first and count + #are really 'in' so we make them const. + #The gl.spec notes this problem. + if {("MultiDrawArrays" eq $func) && ("first" eq $var)} { + set final_type "const $type *" + } elseif {("MultiDrawArrays" eq $func) && ("count" eq $var)} { + set final_type "const $type *" + } elseif {"array" eq [lindex $p 3]} { + if {"in" eq [lindex $p 2]} { + set final_type "const $type *" + } else { + set final_type "$type *" + } + } else { + set final_type $type + } + + lappend newparams [list $final_type $var] + } + + return $newparams +} + +proc api-new-entry {info func} { + global typemap + + set master [dict create] + set rettype [dict get $info return] + + if {![info exists typemap($rettype)]} { + set ::missingTypes($rettype) $func + } else { + dict set master return $typemap($rettype) + } + + dict set master parameters [translate-parameters $func \ + [dict get $info parameters]] + + return $master +} + +proc main {argc argv} { + global extensions typemap aliases promoted noop + + set fd [open [lindex $argv 0] r] + set data [read $fd] + close $fd + + array set ar {} + + parse $data ar + + array set newapi {} + array set missingTypes {} + + foreach {key value} [array get ar] { + puts "KEY:$key VALUE:$value" + + set category [dict get $value category] + + #Invalidate any of the extensions and things not in the spec we support. + set valid [is-valid-category? $category] + puts VALID:$valid + + if {!$valid} { + continue + } + + puts "VALID:$key" + + if {"BlitFramebuffer" eq $key} { + #This was promoted to an ARB extension after Leopard it seems. + set key BlitFramebufferEXT + } + + if {"ARB_framebuffer_object" eq $category} { + #This wasn't an ARB extension in Leopard either. + if {![string match *EXT $key]} { + append key EXT + } + } + + set newapi($key) [api-new-entry $value $key] + } + + #Now iterate and support as many aliases as we can for promoted functions + #based on if the newapi contains the function. + foreach {func value} [array get ar] { + if {![info exists promoted([dict get $value category])]} { + continue + } + + if {[dict exists $value alias]} { + #We have an alias. Let's see if we have the implementation. + set alias [dict get $value alias] + + if {[info exists newapi($alias)] && ![info exists newapi($func)]} { + #We have an implementing function available. + puts "HAVE:$key ALIAS:$alias" + + set master [api-new-entry $value $func] + dict set master alias_for $alias + set newapi($func) $master + } + } + } + + parray noop + + #Now handle the no-op compatibility categories. + foreach {func value} [array get ar] { + if {[info exists noop([dict get $value category])]} { + if {[info exists newapi($func)]} { + puts stderr "$func shouldn't be a noop" + exit 1 + } + + set master [api-new-entry $value $func] + dict set master noop 1 + set newapi($func) $master + } + } + + + + parray newapi + + if {[array size ::missingTypes]} { + parray ::missingTypes + return 1 + } + + foreach {from to} [array get aliases] { + set d $newapi($to) + dict set d alias_for $to + set newapi($from) $d + } + + #Iterate the nm output and set each symbol in an associative array. + array set validapi {} + + foreach line [split [exec nm -j -g /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib] \n] { + set fn [string trim $line] + + #Only match the _gl functions. + if {[string match _gl* $fn]} { + set finalfn [string range $fn 3 end] + puts FINALFN:$finalfn + set validapi($finalfn) $finalfn + } + } + + puts "Correcting the API functions to match the OpenGL framework." + #parray validapi + + #Iterate the newapi and unset any members that the + #libGL.dylib doesn't support, assuming they aren't no-ops. + foreach fn [array names newapi] { + if {![info exists validapi($fn)]} { + puts "WARNING: libGL.dylib lacks support for: $fn" + + if {[dict exists $newapi($fn) noop] + && [dict get $newapi($fn) noop]} { + #This is no-op, so we should skip it. + continue + } + + #Is the function an alias for another in libGL? + if {[dict exists $newapi($fn) alias_for]} { + set alias [dict get $newapi($fn) alias_for] + + if {![info exists validapi($alias)]} { + puts "WARNING: alias function doesn't exist for $fn." + puts "The alias is $alias." + puts "unsetting $fn" + unset newapi($fn) + } + } else { + puts "unsetting $fn" + unset newapi($fn) + } + } + } + + + #Now print a warning about any symbols that libGL supports that we don't. + foreach fn [array names validapi] { + if {![info exists newapi($fn)]} { + puts "AppleSGLX is missing $fn" + } + } + + puts "NOW GENERATING:[lindex $::argv 1]" + set fd [open [lindex $::argv 1] w] + + set sorted [lsort -dictionary [array names newapi]] + + foreach f $sorted { + set attr $newapi($f) + set pstr "" + foreach p [dict get $attr parameters] { + append pstr "[lindex $p 0] [lindex $p 1], " + } + set pstr [string trimright $pstr ", "] + puts $fd "[dict get $attr return] gl[set f]($pstr); " + } + + close $fd + + if {$::argc == 3} { + puts "NOW GENERATING:[lindex $::argv 2]" + #Dump the array as a serialized list. + set fd [open [lindex $::argv 2] w] + puts $fd [array get newapi] + close $fd + } + + return 0 +} +exit [main $::argc $::argv] + -- cgit v1.2.3 From f5aa5377a52c50c94b6a6d6d48c0057dbe874692 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 2 Jan 2010 00:03:53 -0500 Subject: apple: Use mesa gl.h rather than generating one. Signed-off-by: Jeremy Huddleston --- src/glx/apple/GL_aliases | 4 +- src/glx/apple/Makefile | 11 +-- src/glx/apple/apple_glx_pbuffer.c | 1 + src/glx/apple/apple_xgl_api_additional.c | 37 +++++++++ src/glx/apple/gen_funcs.tcl | 13 +--- src/glx/apple/gen_gl_h.sh | 33 -------- src/glx/apple/include/GL/gl.h.template | 130 ------------------------------- 7 files changed, 48 insertions(+), 181 deletions(-) create mode 100644 src/glx/apple/apple_xgl_api_additional.c delete mode 100755 src/glx/apple/gen_gl_h.sh delete mode 100644 src/glx/apple/include/GL/gl.h.template (limited to 'src/glx/apple/gen_funcs.tcl') diff --git a/src/glx/apple/GL_aliases b/src/glx/apple/GL_aliases index a8390d2408..8de22383a7 100644 --- a/src/glx/apple/GL_aliases +++ b/src/glx/apple/GL_aliases @@ -5,4 +5,6 @@ alias DeleteTexturesEXT DeleteTextures alias GenTexturesEXT GenTextures alias IsTextureEXT IsTexture alias PrioritizeTexturesEXT PrioritizeTextures -alias TexImage3DEXT TexImage3D + +# Due to type conflicts, we handle this differently +#alias TexImage3DEXT TexImage3D diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile index 8fa5b01f28..279f7aded9 100644 --- a/src/glx/apple/Makefile +++ b/src/glx/apple/Makefile @@ -31,6 +31,7 @@ SOURCES = \ apple_glx_surface.c \ apple_visual.c \ apple_xgl_api.c \ + apple_xgl_api_additional.c \ apple_xgl_api_read.c \ apple_xgl_api_stereo.c \ apple_xgl_api_viewport.c \ @@ -71,16 +72,13 @@ INCLUDES = -I. -Iinclude -I..\ ##### RULES ##### -$(OBJECTS) : include/GL/gl.h apple_xgl_api.h +$(OBJECTS) : apple_xgl_api.h apple_xgl_api.c : apple_xgl_api.h apple_xgl_api.h : gen_api_header.tcl gen_api_library.tcl gen_code.tcl gen_defs.tcl gen_exports.tcl gen_funcs.tcl gen_types.tcl $(TCLSH) gen_code.tcl -include/GL/gl.h: include/GL/gl.h.template gen_gl_h.sh - ./gen_gl_h.sh include/GL/gl.h.template $@ - .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(EXTRA_DEFINES) $< -o $@ @@ -115,10 +113,7 @@ install_headers: include/GL/gl.h install_libraries: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(MAKE) -C $(TOP)/src/mesa install-libgl -install: install_headers install_libraries - -#%.c : ../%.c -# ln -s $< +install: install_libraries # Remove .o and backup files clean: diff --git a/src/glx/apple/apple_glx_pbuffer.c b/src/glx/apple/apple_glx_pbuffer.c index 3dfdc54763..fb56b7512e 100644 --- a/src/glx/apple/apple_glx_pbuffer.c +++ b/src/glx/apple/apple_glx_pbuffer.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "apple_glx.h" #include "glcontextmodes.h" #include "apple_glx_context.h" diff --git a/src/glx/apple/apple_xgl_api_additional.c b/src/glx/apple/apple_xgl_api_additional.c new file mode 100644 index 0000000000..7d40afe1d7 --- /dev/null +++ b/src/glx/apple/apple_xgl_api_additional.c @@ -0,0 +1,37 @@ +/* + Copyright (c) 2008, 2009 Apple Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT + HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name(s) of the above + copyright holders shall not be used in advertising or otherwise to + promote the sale, use or other dealings in this Software without + prior written authorization. +*/ + +#define GL_GLEXT_PROTOTYPES +#include + +GLAPI void APIENTRY glTexImage3DEXT(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei + depth, GLint border, GLenum format, GLenum type, const void * pixels) { + glTexImage3D(target, level, (GLint)internalformat, width, height, depth, border, format, type, pixels); +} + diff --git a/src/glx/apple/gen_funcs.tcl b/src/glx/apple/gen_funcs.tcl index ff314dc6a7..e78eb3278c 100644 --- a/src/glx/apple/gen_funcs.tcl +++ b/src/glx/apple/gen_funcs.tcl @@ -72,6 +72,8 @@ proc is-extension-supported? name { } #This is going to need to be updated for OpenGL >= 2.1 in SnowLeopard. +# TextureComponentCount is GLenum in SL for everything +# It is GLint in mesa, but is GLenum for glTexImage3DEXT array set typemap { void void List GLuint @@ -126,7 +128,7 @@ array set typemap { ShadingModel GLenum TextureTarget GLenum TextureParameterName GLenum - TextureComponentCount GLenum + TextureComponentCount GLint PixelFormat GLenum PixelType GLenum TextureEnvTarget GLenum @@ -412,14 +414,7 @@ proc translate-parameters {func parameters} { set type $typemap($ptype) - #In the gl.spec file is MultiDrawArrays first and count - #are really 'in' so we make them const. - #The gl.spec notes this problem. - if {("MultiDrawArrays" eq $func) && ("first" eq $var)} { - set final_type "const $type *" - } elseif {("MultiDrawArrays" eq $func) && ("count" eq $var)} { - set final_type "const $type *" - } elseif {"array" eq [lindex $p 3]} { + if {"array" eq [lindex $p 3]} { if {"in" eq [lindex $p 2]} { set final_type "const $type *" } else { diff --git a/src/glx/apple/gen_gl_h.sh b/src/glx/apple/gen_gl_h.sh deleted file mode 100755 index f10ddd0bfc..0000000000 --- a/src/glx/apple/gen_gl_h.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -INFILE=$1 -OUTFILE=$2 - -generate_macros() { - grep gl.*ProcPtr /System/Library/Frameworks/OpenGL.framework/Headers/gl{,ext}.h | sed 's:^.*\(gl.*Ptr\).*$:\1:' | sort -u | perl -ne 'chomp($_); $s = "PFN".uc($_); $s =~ s/PROCPTR/PROC/; print "#define ".$_." ".$s."\n"' -} - -generate_function_pointers() { - { - echo "#define GL_GLEXT_FUNCTION_POINTERS 1" - echo "#define GL_GLEXT_LEGACY 1" - generate_macros - echo '#include "/System/Library/Frameworks/OpenGL.framework/Headers/gl.h"' - } | ${CC:-gcc} -E - | grep typedef.*PFN -} - -cat ${INFILE} | while IFS= read LINE ; do - case $LINE in - "@CGL_MESA_COMPAT_MACROS@") - generate_macros - ;; - "@CGL_MESA_FUNCTION_POINTERS@") - if ! grep -q GL_GLEXT_PROTOTYPES /System/Library/Frameworks/OpenGL.framework/Headers/gl.h ; then - generate_function_pointers - fi - ;; - *) - printf "${LINE}\n" - ;; - esac -done > ${OUTFILE} diff --git a/src/glx/apple/include/GL/gl.h.template b/src/glx/apple/include/GL/gl.h.template deleted file mode 100644 index 72169f98c3..0000000000 --- a/src/glx/apple/include/GL/gl.h.template +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. - * Copyright (C) 2009 Apple Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef __X_GL_H -#define __X_GL_H - -/* The following macros exist to address conflicts between the names given to - * function pointers by the MESA API and OpenGL.framework's API. - */ -@CGL_MESA_COMPAT_MACROS@ - -/* On SL, we want to use OpelGL.framework's headers to get both prototypes and - * function pointers (like Mesa's API), but on Leo and before, OpenGL.framework - * can't give us both. - */ - -#ifdef GL_GLEXT_FUNCTION_POINTERS -#define _GL_GLEXT_FUNCTION_POINTERS GL_GLEXT_FUNCTION_POINTERS -#undef GL_GLEXT_FUNCTION_POINTERS -#endif - -#ifdef GL_GLEXT_PROTOTYPES -#define _GL_GLEXT_PROTOTYPES GL_GLEXT_PROTOTYPES -#else -#define GL_GLEXT_PROTOTYPES 1 -#endif - -/* Our glext.h is based on a version from the registry that is newer. */ -#ifdef GL_GLEXT_LEGACY -#define _GL_GLEXT_LEGACY GL_GLEXT_LEGACY -#else -#define GL_GLEXT_LEGACY 1 -#endif - -#include "/System/Library/Frameworks/OpenGL.framework/Headers/gl.h" - -/* These are not set by the system gl.h */ -#define GL_VERSION_1_2_DEPRECATED 1 -#define GL_VERSION_1_3_DEPRECATED 1 -#define GL_VERSION_1_4_DEPRECATED 1 - -/* Restore our GLEXT-fu */ -#ifdef _GL_GLEXT_FUNCTION_POINTERS -#define GL_GLEXT_FUNCTION_POINTERS _GL_GLEXT_FUNCTION_POINTERS -#undef _GL_GLEXT_FUNCTION_POINTERS -#endif - -#ifdef _GL_GLEXT_PROTOTYPES -#undef _GL_GLEXT_PROTOTYPES -#else -#undef GL_GLEXT_PROTOTYPES -#endif - -#ifdef _GL_GLEXT_LEGACY -#undef _GL_GLEXT_LEGACY -#else -#undef GL_GLEXT_LEGACY -#endif - -@CGL_MESA_FUNCTION_POINTERS@ - -#ifndef GL_GLEXT_LEGACY -#include -#endif - -/* - * This is needed for building apple_glx_pbuffer.c, the latest - * glext.h from the registry lacks it, so it's from the Leopard glext.h: - */ -#ifndef GL_TEXTURE_RECTANGLE_EXT -#define GL_TEXTURE_RECTANGLE_EXT 0x84F5 -#endif - -/* This is needed for building the X server: */ -/* - * GL_MESA_packed_depth_stencil - */ -#ifndef GL_MESA_packed_depth_stencil -#define GL_MESA_packed_depth_stencil 1 - -#define GL_DEPTH_STENCIL_MESA 0x8750 -#define GL_UNSIGNED_INT_24_8_MESA 0x8751 -#define GL_UNSIGNED_INT_8_24_REV_MESA 0x8752 -#define GL_UNSIGNED_SHORT_15_1_MESA 0x8753 -#define GL_UNSIGNED_SHORT_1_15_REV_MESA 0x8754 - -#endif /* GL_MESA_packed_depth_stencil */ - -/* Various other OS projects expect to get these macros from Mesa's gl.h */ -#ifndef GLAPI -#define GLAPI extern -#endif - -#ifndef GLAPIENTRY -#define GLAPIENTRY -#endif - -#ifndef APIENTRY -#define APIENTRY GLAPIENTRY -#endif - -/* "P" suffix to be used for a pointer to a function */ -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif - -#ifndef GLAPIENTRYP -#define GLAPIENTRYP GLAPIENTRY * -#endif - -#endif /*__X_GL_H*/ -- cgit v1.2.3 From f64773010d0dd204177d08716565db69f6263e0f Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 12 Apr 2010 18:26:40 -0700 Subject: Update OpenGL specs Signed-off-by: Jeremy Huddleston --- src/glx/apple/gen_funcs.tcl | 521 +++++---- src/glx/apple/specs/enum.spec | 71 +- src/glx/apple/specs/enumext.spec | 359 +++++- src/glx/apple/specs/gl.spec | 2065 ++++++++++++++++++++++++++++++++--- src/glx/apple/specs/gl.tm | 5 + src/glx/apple/specs/glx.spec | 5 +- src/glx/apple/specs/glxenum.spec | 14 +- src/glx/apple/specs/glxenumext.spec | 18 +- src/glx/apple/specs/glxext.spec | 16 +- src/glx/apple/specs/update.sh | 4 + 10 files changed, 2663 insertions(+), 415 deletions(-) create mode 100755 src/glx/apple/specs/update.sh (limited to 'src/glx/apple/gen_funcs.tcl') diff --git a/src/glx/apple/gen_funcs.tcl b/src/glx/apple/gen_funcs.tcl index e78eb3278c..1392c155a8 100644 --- a/src/glx/apple/gen_funcs.tcl +++ b/src/glx/apple/gen_funcs.tcl @@ -71,218 +71,323 @@ proc is-extension-supported? name { return [info exists extensions($name)] } -#This is going to need to be updated for OpenGL >= 2.1 in SnowLeopard. +# This is going to need to be updated for future OpenGL versions: +# cat specs/gl.tm | grep -v '^#' | awk -F, '{sub(/[ \t]+/, ""); print " "$1 " \"" $4 "\""}' +# then change void from "*" to "void" +# # TextureComponentCount is GLenum in SL for everything # It is GLint in mesa, but is GLenum for glTexImage3DEXT array set typemap { - void void - List GLuint - Mode GLenum - CheckedFloat32 GLfloat - CheckedInt32 GLint - Float32 GLfloat - Int32 GLint - Int64 GLint64EXT - UInt64 GLuint64EXT - Float64 GLdouble - ListMode GLuint - SizeI GLsizei - ListNameType GLenum - Void void - BeginMode GLenum - CoordF GLfloat - UInt8 GLubyte - Boolean GLboolean - ColorIndexValueD GLdouble - ColorB GLbyte - ColorD GLdouble - ColorF GLfloat - ColorI GLint - ColorS GLshort - ColorUB GLubyte - ColorUI GLuint - ColorUS GLushort - ColorIndexValueF GLfloat - ColorIndexValueI GLint - ColorIndexValueS GLshort - Int8 GLbyte - CoordD GLdouble - Int16 GLshort - CoordI GLint - CoordS GLshort - ClipPlaneName GLenum - MaterialFace GLenum - ColorMaterialParameter GLenum - CullFaceMode GLenum - FogParameter GLenum - FrontFaceDirection GLenum - HintTarget GLenum - HintMode GLenum - LightName GLenum - LightParameter GLenum - LightModelParameter GLenum - LineStipple GLushort - MaterialParameter GLenum - PolygonMode GLenum - WinCoord GLint - ShadingModel GLenum - TextureTarget GLenum - TextureParameterName GLenum - TextureComponentCount GLint - PixelFormat GLenum - PixelType GLenum - TextureEnvTarget GLenum - TextureEnvParameter GLenum - TextureCoordName GLenum - TextureGenParameter GLenum - FeedbackType GLenum - FeedbackElement GLfloat - SelectName GLuint - RenderingMode GLenum - DrawBufferMode GLenum - ClearBufferMask GLbitfield - MaskedColorIndexValueF GLfloat - ClampedColorF GLclampf - StencilValue GLint - ClampedFloat64 GLclampd - MaskedStencilValue GLuint - MaskedColorIndexValueI GLuint - AccumOp GLenum - EnableCap GLenum - AttribMask GLbitfield - MapTarget GLenum - MeshMode1 GLenum - MeshMode2 GLenum - AlphaFunction GLenum - ClampedFloat32 GLclampf - BlendingFactorSrc GLenum - BlendingFactorDest GLenum - LogicOp GLenum - StencilFunction GLenum - ClampedStencilValue GLint - MaskedStencilValue GLuint - StencilOp GLenum - DepthFunction GLenum - PixelTransferParameter GLenum - PixelStoreParameter GLenum - PixelMap GLenum - UInt32 GLuint - UInt16 GLushort - ReadBufferMode GLenum - PixelCopyType GLenum - GetPName GLenum - ErrorCode GLenum - GetMapQuery GLenum + AccumOp "GLenum" + AlphaFunction "GLenum" + AttribMask "GLbitfield" + BeginMode "GLenum" + BinormalPointerTypeEXT "GLenum" + BlendEquationMode "GLenum" + BlendEquationModeEXT "GLenum" + BlendFuncSeparateParameterEXT "GLenum" + BlendingFactorDest "GLenum" + BlendingFactorSrc "GLenum" + Boolean "GLboolean" + BooleanPointer "GLboolean*" + Char "GLchar" + CharPointer "GLchar*" + CheckedFloat32 "GLfloat" + CheckedInt32 "GLint" + ClampColorTargetARB "GLenum" + ClampColorModeARB "GLenum" + ClampedColorF "GLclampf" + ClampedFloat32 "GLclampf" + ClampedFloat64 "GLclampd" + ClampedStencilValue "GLint" + ClearBufferMask "GLbitfield" + ClientAttribMask "GLbitfield" + ClipPlaneName "GLenum" + ColorB "GLbyte" + ColorD "GLdouble" + ColorF "GLfloat" + ColorI "GLint" + ColorIndexValueD "GLdouble" + ColorIndexValueF "GLfloat" + ColorIndexValueI "GLint" + ColorIndexValueS "GLshort" + ColorIndexValueUB "GLubyte" + ColorMaterialParameter "GLenum" + ColorPointerType "GLenum" + ColorS "GLshort" + ColorTableParameterPName "GLenum" + ColorTableParameterPNameSGI "GLenum" + ColorTableTarget "GLenum" + ColorTableTargetSGI "GLenum" + ColorUB "GLubyte" + ColorUI "GLuint" + ColorUS "GLushort" + CombinerBiasNV "GLenum" + CombinerComponentUsageNV "GLenum" + CombinerMappingNV "GLenum" + CombinerParameterNV "GLenum" + CombinerPortionNV "GLenum" + CombinerRegisterNV "GLenum" + CombinerScaleNV "GLenum" + CombinerStageNV "GLenum" + CombinerVariableNV "GLenum" + CompressedTextureARB "GLvoid" + ControlPointNV "GLvoid" + ControlPointTypeNV "GLenum" + ConvolutionParameter "GLenum" + ConvolutionParameterEXT "GLenum" + ConvolutionTarget "GLenum" + ConvolutionTargetEXT "GLenum" + CoordD "GLdouble" + CoordF "GLfloat" + CoordI "GLint" + CoordS "GLshort" + CullFaceMode "GLenum" + CullParameterEXT "GLenum" + DepthFunction "GLenum" + DrawBufferMode "GLenum" + DrawBufferName "GLint" + DrawElementsType "GLenum" + ElementPointerTypeATI "GLenum" + EnableCap "GLenum" + ErrorCode "GLenum" + EvalMapsModeNV "GLenum" + EvalTargetNV "GLenum" + FeedbackElement "GLfloat" + FeedbackType "GLenum" + FenceNV "GLuint" + FenceConditionNV "GLenum" + FenceParameterNameNV "GLenum" + FfdMaskSGIX "GLbitfield" + FfdTargetSGIX "GLenum" + Float32 "GLfloat" + Float32Pointer "GLfloat*" + Float64 "GLdouble" + Float64Pointer "GLdouble*" + FogParameter "GLenum" + FogPointerTypeEXT "GLenum" + FogPointerTypeIBM "GLenum" + FragmentLightModelParameterSGIX "GLenum" + FragmentLightNameSGIX "GLenum" + FragmentLightParameterSGIX "GLenum" + FramebufferAttachment "GLenum" + FramebufferTarget "GLenum" + FrontFaceDirection "GLenum" + FunctionPointer "_GLfuncptr" + GetColorTableParameterPName "GLenum" + GetColorTableParameterPNameSGI "GLenum" + GetConvolutionParameterPName "GLenum" + GetHistogramParameterPName "GLenum" + GetHistogramParameterPNameEXT "GLenum" + GetMapQuery "GLenum" + GetMinmaxParameterPName "GLenum" + GetMinmaxParameterPNameEXT "GLenum" + GetPName "GLenum" + GetPointervPName "GLenum" + GetTextureParameter "GLenum" + HintMode "GLenum" + HintTarget "GLenum" + HintTargetPGI "GLenum" + HistogramTarget "GLenum" + HistogramTargetEXT "GLenum" + IglooFunctionSelectSGIX "GLenum" + IglooParameterSGIX "GLvoid" + ImageTransformPNameHP "GLenum" + ImageTransformTargetHP "GLenum" + IndexFunctionEXT "GLenum" + IndexMaterialParameterEXT "GLenum" + IndexPointerType "GLenum" + Int16 "GLshort" + Int32 "GLint" + Int8 "GLbyte" + InterleavedArrayFormat "GLenum" + LightEnvParameterSGIX "GLenum" + LightModelParameter "GLenum" + LightName "GLenum" + LightParameter "GLenum" + LightTextureModeEXT "GLenum" + LightTexturePNameEXT "GLenum" + LineStipple "GLushort" + List "GLuint" + ListMode "GLenum" + ListNameType "GLenum" + ListParameterName "GLenum" + LogicOp "GLenum" + MapAttribParameterNV "GLenum" + MapParameterNV "GLenum" + MapTarget "GLenum" + MapTargetNV "GLenum" + MapTypeNV "GLenum" + MaskedColorIndexValueF "GLfloat" + MaskedColorIndexValueI "GLuint" + MaskedStencilValue "GLuint" + MaterialFace "GLenum" + MaterialParameter "GLenum" + MatrixIndexPointerTypeARB "GLenum" + MatrixMode "GLenum" + MatrixTransformNV "GLenum" + MeshMode1 "GLenum" + MeshMode2 "GLenum" + MinmaxTarget "GLenum" + MinmaxTargetEXT "GLenum" + NormalPointerType "GLenum" + NurbsCallback "GLenum" + NurbsObj "GLUnurbs*" + NurbsProperty "GLenum" + NurbsTrim "GLenum" + OcclusionQueryParameterNameNV "GLenum" + PixelCopyType "GLenum" + PixelFormat "GLenum" + PixelInternalFormat "GLenum" + PixelMap "GLenum" + PixelStoreParameter "GLenum" + PixelTexGenModeSGIX "GLenum" + PixelTexGenParameterNameSGIS "GLenum" + PixelTransferParameter "GLenum" + PixelTransformPNameEXT "GLenum" + PixelTransformTargetEXT "GLenum" + PixelType "GLenum" + PointParameterNameARB "GLenum" + PolygonMode "GLenum" + ProgramNV "GLuint" + ProgramCharacterNV "GLubyte" + ProgramParameterNV "GLenum" + ProgramParameterPName "GLenum" + QuadricCallback "GLenum" + QuadricDrawStyle "GLenum" + QuadricNormal "GLenum" + QuadricObj "GLUquadric*" + QuadricOrientation "GLenum" + ReadBufferMode "GLenum" + RenderbufferTarget "GLenum" + RenderingMode "GLenum" + ReplacementCodeSUN "GLuint" + ReplacementCodeTypeSUN "GLenum" + SamplePassARB "GLenum" + SamplePatternEXT "GLenum" + SamplePatternSGIS "GLenum" + SecondaryColorPointerTypeIBM "GLenum" + SelectName "GLuint" + SeparableTarget "GLenum" + SeparableTargetEXT "GLenum" + ShadingModel "GLenum" + SizeI "GLsizei" + SpriteParameterNameSGIX "GLenum" + StencilFunction "GLenum" + StencilFaceDirection "GLenum" + StencilOp "GLenum" + StencilValue "GLint" String "const GLubyte *" - StringName GLenum - GetTextureParameter GLenum - MatrixMode GLenum - ColorPointerType GLenum - DrawElementsType GLenum - GetPointervPName GLenum - VoidPointer "void *" - IndexPointerType GLenum - InterleavedArrayFormat GLenum - NormalPointerType GLenum - TexCoordPointerType GLenum - VertexPointerType GLenum - PixelInternalFormat GLenum - Texture GLuint - ColorIndexValueUB GLubyte - ClientAttribMask GLbitfield - BlendEquationMode GLenum - ColorTableTarget GLenum - ColorTableParameterPName GLenum - GetColorTableParameterPName GLenum - ConvolutionTarget GLenum - ConvolutionParameter GLenum - GetConvolutionParameterPName GLenum - SeparableTarget GLenum - HistogramTarget GLenum - GetHistogramParameterPName GLenum - MinmaxTarget GLenum - GetMinmaxParameterPName GLenum - TextureTarget GLenum - TextureUnit GLenum - CompressedTextureARB "void" - BlendFuncSeparateParameterEXT GLenum - FogPointerTypeEXT GLenum - PointParameterNameARB GLenum - GLenum GLenum - BufferTargetARB GLenum - ConstUInt32 "const GLuint" - BufferSize GLsizeiptr - ConstVoid "const GLvoid" - BufferUsageARB GLenum - BufferOffset GLintptr - BufferAccessARB GLenum - BufferPNameARB GLenum - BufferPointerNameARB GLenum - BlendEquationModeEXT GLenum - DrawBufferModeATI GLenum - StencilFaceDirection GLenum - Char GLchar - VertexAttribPropertyARB GLenum - VertexAttribPointerPropertyARB GLenum - CharPointer "GLchar *" - VertexAttribPointerTypeARB GLenum - ClampColorTargetARB unknown3.0 - ClampColorModeARB unknown3.0 - VertexAttribEnum GLenum - VertexAttribEnumNV GLenum - DrawBufferName unknown3.0 - WeightPointerTypeARB GLenum - ProgramTargetARB GLenum - ProgramFormatARB GLenum - ProgramStringPropertyARB GLenum - BufferSizeARB GLsizeiptrARB - BufferOffsetARB GLintptrARB - handleARB GLhandleARB - charPointerARB "GLcharARB *" - charARB GLcharARB - RenderbufferTarget GLenum - FramebufferTarget GLenum - FramebufferAttachment GLenum - BinormalPointerTypeEXT GLenum - HintTargetPGI GLenum - ProgramParameterPName GLenum - ProgramPropertyARB GLenum - ElementPointerTypeATI GLenum - FenceNV GLuint - FenceConditionNV GLenum - ObjectTypeAPPLE GLenum - VertexArrayPNameAPPLE GLenum - SeparableTargetEXT GLenum - ColorTableTargetSGI GLenum - ColorTableParameterPNameSGI GLenum - CombinerOutputNV GLenum - CombinerStageNV GLenum - CombinerPortionNV GLenum - CombinerRegisterNV GLenum - CombinerScaleNV GLenum - CombinerBiasNV GLenum - CombinerComponentUsageNV GLenum - CombinerMappingNV GLenum - CombinerParameterNV GLenum - CombinerVariableNV GLenum - ConvolutionParameterEXT GLenum - ConvolutionTargetEXT GLenum - CullParameterEXT GLenum - FenceParameterNameNV GLenum - FragmentLightModelParameterSGIX GLenum - FragmentLightNameSGIX GLenum - FragmentLightParameterSGIX GLenum - GetColorTableParameterPNameSGI GLenum - GetHistogramParameterPNameEXT GLenum - GetMinmaxParameterPNameEXT GLenum - HistogramTargetEXT GLenum - LightEnvParameterSGIX GLenum - MinmaxTargetEXT GLenum - PNTrianglesPNameATI GLenum - ProgramCharacterNV GLubyte - SamplePatternEXT GLenum - SamplePatternSGIS GLenum - TypeEnum GLenum + StringName "GLenum" + TangentPointerTypeEXT "GLenum" + TessCallback "GLenum" + TessContour "GLenum" + TessProperty "GLenum" + TesselatorObj "GLUtesselator*" + TexCoordPointerType "GLenum" + Texture "GLuint" + TextureComponentCount "GLint" + TextureCoordName "GLenum" + TextureEnvParameter "GLenum" + TextureEnvTarget "GLenum" + TextureFilterSGIS "GLenum" + TextureGenParameter "GLenum" + TextureNormalModeEXT "GLenum" + TextureParameterName "GLenum" + TextureTarget "GLenum" + TextureUnit "GLenum" + UInt16 "GLushort" + UInt32 "GLuint" + UInt8 "GLubyte" + VertexAttribEnum "GLenum" + VertexAttribEnumNV "GLenum" + VertexAttribPointerTypeNV "GLenum" + VertexPointerType "GLenum" + VertexWeightPointerTypeEXT "GLenum" + Void "GLvoid" + VoidPointer "GLvoid*" + ConstVoidPointer "GLvoid* const" + WeightPointerTypeARB "GLenum" + WinCoord "GLint" + void "void" + ArrayObjectPNameATI "GLenum" + ArrayObjectUsageATI "GLenum" + ConstFloat32 "GLfloat" + ConstInt32 "GLint" + ConstUInt32 "GLuint" + ConstVoid "GLvoid" + DataTypeEXT "GLenum" + FragmentOpATI "GLenum" + GetTexBumpParameterATI "GLenum" + GetVariantValueEXT "GLenum" + ParameterRangeEXT "GLenum" + PreserveModeATI "GLenum" + ProgramFormatARB "GLenum" + ProgramTargetARB "GLenum" + ProgramTarget "GLenum" + ProgramPropertyARB "GLenum" + ProgramStringPropertyARB "GLenum" + ScalarType "GLenum" + SwizzleOpATI "GLenum" + TexBumpParameterATI "GLenum" + VariantCapEXT "GLenum" + VertexAttribPointerPropertyARB "GLenum" + VertexAttribPointerTypeARB "GLenum" + VertexAttribPropertyARB "GLenum" + VertexShaderCoordOutEXT "GLenum" + VertexShaderOpEXT "GLenum" + VertexShaderParameterEXT "GLenum" + VertexShaderStorageTypeEXT "GLenum" + VertexShaderTextureUnitParameter "GLenum" + VertexShaderWriteMaskEXT "GLenum" + VertexStreamATI "GLenum" + PNTrianglesPNameATI "GLenum" + BufferOffset "GLintptr" + BufferSize "GLsizeiptr" + BufferAccessARB "GLenum" + BufferOffsetARB "GLintptrARB" + BufferPNameARB "GLenum" + BufferPointerNameARB "GLenum" + BufferSizeARB "GLsizeiptrARB" + BufferTargetARB "GLenum" + BufferUsageARB "GLenum" + ObjectTypeAPPLE "GLenum" + VertexArrayPNameAPPLE "GLenum" + DrawBufferModeATI "GLenum" + Half16NV "GLhalfNV" + PixelDataRangeTargetNV "GLenum" + TypeEnum "GLenum" + GLbitfield "GLbitfield" + GLenum "GLenum" + Int64 "GLint64" + UInt64 "GLuint64" + handleARB "GLhandleARB" + charARB "GLcharARB" + charPointerARB "GLcharARB*" + sync "GLsync" + Int64EXT "GLint64EXT" + UInt64EXT "GLuint64EXT" + FramebufferAttachment "GLenum" + FramebufferAttachmentParameterName "GLenum" + Framebuffer "GLuint" + FramebufferStatus "GLenum" + FramebufferTarget "GLenum" + GetFramebufferParameter "GLenum" + Intptr "GLintptr" + ProgramFormat "GLenum" + ProgramProperty "GLenum" + ProgramStringProperty "GLenum" + ProgramTarget "GLenum" + Renderbuffer "GLuint" + RenderbufferParameterName "GLenum" + Sizeiptr "GLsizeiptr" + TextureInternalFormat "GLenum" + VertexBufferObjectAccess "GLenum" + VertexBufferObjectParameter "GLenum" + VertexBufferObjectUsage "GLenum" + BufferAccessMask "GLbitfield" + GetMultisamplePNameNV "GLenum" + SampleMaskNV "GLbitfield" } proc psplit s { diff --git a/src/glx/apple/specs/enum.spec b/src/glx/apple/specs/enum.spec index 6a51165254..20f96f2418 100644 --- a/src/glx/apple/specs/enum.spec +++ b/src/glx/apple/specs/enum.spec @@ -3,6 +3,8 @@ # It is an extremely important file. Do not mess with it unless # you know what you're doing and have permission to do so. # +# $Revision: 10971 $ on $Date: 2010-04-09 02:45:33 -0700 (Fri, 09 Apr 2010) $ + ############################################################################### # # Before modifying this file, read the following: @@ -217,11 +219,15 @@ EXT_multisample enum: ############################################################################### +# Note that COVERAGE_BUFFER_BIT_NV collides with AttribMask bit +# HINT_BIT. This is OK since the extension is for OpenGL ES 2, which +# doesn't have attribute groups. ClearBufferMask enum: - use AttribMask COLOR_BUFFER_BIT - use AttribMask ACCUM_BUFFER_BIT - use AttribMask STENCIL_BUFFER_BIT - use AttribMask DEPTH_BUFFER_BIT + use AttribMask DEPTH_BUFFER_BIT # = 0x00000100 + use AttribMask ACCUM_BUFFER_BIT # = 0x00000200 + use AttribMask STENCIL_BUFFER_BIT # = 0x00000400 + use AttribMask COLOR_BUFFER_BIT # = 0x00004000 + use NV_coverage_sample COVERAGE_BUFFER_BIT_NV # = 0x00008000 ############################################################################### @@ -4334,7 +4340,7 @@ APPLE_object_purgeable enum: (additional; see below) # APPLE_future_use: 0x85B4 -## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name +## From Jeremy 2006/10/18 (Khronos bug 632) - unknown extension name # STORAGE_CLIENT_APPLE = 0x85B4 VERSION_3_0 enum: @@ -4347,7 +4353,7 @@ APPLE_vertex_array_object enum: VERTEX_ARRAY_BINDING_APPLE = 0x85B5 # APPLE_future_use: 0x85B6 -## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name +## From Jeremy 2006/10/18 (Khronos bug 632) - unknown extension name # TEXTURE_MINIMIZE_STORAGE_APPLE = 0x85B6 APPLE_texture_range enum: (additional; see below) @@ -5879,7 +5885,7 @@ APPLE_fence enum: DRAW_PIXELS_APPLE = 0x8A0A FENCE_APPLE = 0x8A0B -## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name +## From Jeremy 2006/10/18 (Khronos bug 632) - unknown extension name ELEMENT_ARRAY_APPLE = 0x8A0C ELEMENT_ARRAY_TYPE_APPLE = 0x8A0D ELEMENT_ARRAY_POINTER_APPLE = 0x8A0E @@ -5888,7 +5894,7 @@ APPLE_float_pixels enum: COLOR_FLOAT_APPLE = 0x8A0F # APPLE_future_use: 0x8A10 -## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name +## From Jeremy 2006/10/18 (Khronos bug 632) - unknown extension name # MIN_PBUFFER_VIEWPORT_DIMS_APPLE = 0x8A10 # ELEMENT_BUFFER_BINDING_APPLE = 0x8A11 # Apple says the extension that defined ELEMENT_BUFFER_BINDING_APPLE @@ -6467,13 +6473,15 @@ NV_transform_feedback enum: # ATI: 0x8C90-0x8C9F (Affie Munshi, OpenGL ES extensions) -# AMD_future_use: 0x8C90-0x8C91 +# Reassigned to Qualcomm at time of mobile/desktop split (bug 5874) +# Qualcomm__future_use: 0x8C90-0x8C91 AMD_compressed_ATC_texture enum: (OpenGL ES only) ATC_RGB_AMD = 0x8C92 ATC_RGBA_EXPLICIT_ALPHA_AMD = 0x8C93 -# AMD_future_use: 0x8C94-0x8C9F +# Reassigned to Qualcomm at time of mobile/desktop split (bug 5874) +# Qualcomm_future_use: 0x8C94-0x8C9F ############################################################################### @@ -6745,7 +6753,7 @@ OES_framebuffer_object enum: (OpenGL ES only) OES_compressed_ETC1_RGB8_texture enum: (OpenGL ES only) ETC1_RGB8_OES = 0x8D64 -OES_EGL_image_external enum: (OpenGL ES only) (bug 4621) +OES_EGL_image_external enum: (OpenGL ES only) (Khronos bug 4621) TEXTURE_EXTERNAL_OES = 0x8D65 SAMPLER_EXTERNAL_OES = 0x8D66 TEXTURE_BINDING_EXTERNAL_OES = 0x8D67 @@ -7050,7 +7058,8 @@ NV_present_video enum: PRESENT_TIME_NV = 0x8E2A PRESENT_DURATION_NV = 0x8E2B -# NV_future_use: 0x8E2C +NV_depth_nonlinear enum: (OpenGL ES only) + DEPTH_COMPONENT16_NONLINEAR_NV = 0x8E2C EXT_direct_state_access enum: PROGRAM_MATRIX_EXT = 0x8E2D @@ -7144,7 +7153,18 @@ ARB_texture_gather enum: # NVIDIA: 0x8ED0-0x8F4F # Assigned for Pat Brown (Khronos bug 3191) -# NV_future_use: 0x8ED0-0x8F1C +NV_coverage_sample enum: (OpenGL ES only) + COVERAGE_COMPONENT_NV = 0x8ED0 + COVERAGE_COMPONENT4_NV = 0x8ED1 + COVERAGE_ATTACHMENT_NV = 0x8ED2 + COVERAGE_BUFFERS_NV = 0x8ED3 + COVERAGE_SAMPLES_NV = 0x8ED4 + COVERAGE_ALL_FRAGMENTS_NV = 0x8ED5 + COVERAGE_EDGE_FRAGMENTS_NV = 0x8ED6 + COVERAGE_AUTOMATIC_NV = 0x8ED7 + COVERAGE_BUFFER_BIT_NV = 0x00008000 + +# NV_future_use: 0x8ED8-0x8F1C NV_shader_buffer_load enum: BUFFER_GPU_ADDRESS_NV = 0x8F1D @@ -7267,6 +7287,8 @@ AMD_vertex_shader_tesselator enum: DISCRETE_AMD = 0x9006 CONTINUOUS_AMD = 0x9007 +# AMD_future_use: 0x9008 + ARB_texture_cube_map_array enum: TEXTURE_CUBE_MAP_ARRAY = 0x9009 TEXTURE_BINDING_CUBE_MAP_ARRAY = 0x900A @@ -7276,8 +7298,6 @@ ARB_texture_cube_map_array enum: INT_SAMPLER_CUBE_MAP_ARRAY = 0x900E UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900F -# AMD_future_use: 0x9008-0x900F - EXT_texture_snorm enum: ALPHA_SNORM = 0x9010 LUMINANCE_SNORM = 0x9011 @@ -7429,12 +7449,27 @@ VERSION_3_2 enum: ############################################################################### -# Imagination Tech.: 0x9130-0x913F (bug 882) +# Imagination Tech.: 0x9130-0x913F (Khronos bug 882) -IMG_program_binary: (OpenGL ES only) +IMG_program_binary enum: (OpenGL ES only) SGX_PROGRAM_BINARY_IMG = 0x9130 -# IMG_future_use: 0x9131-0x913F +# IMG_future_use: 0x9131-0x9132 + +IMG_multisampled_render_to_texture enum: (OpenGL ES only) + RENDERBUFFER_SAMPLES_IMG = 0x9133 + FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG = 0x9134 + MAX_SAMPLES_IMG = 0x9135 + TEXTURE_SAMPLES_IMG = 0x9136 + +# IMG_future_use: 0x9137-0x913F + +############################################################################### + +# AMD: 0x9140-0x91BF (Khronos bugs 5899, 6004) + +# AMD_future_use: 0x9140-0x91BF +# AMD_future_use: 0x91C0-0x923F ############################################################################### ### Please remember that new enumerant allocations must be obtained by request diff --git a/src/glx/apple/specs/enumext.spec b/src/glx/apple/specs/enumext.spec index a89a154ab6..6302ed446f 100644 --- a/src/glx/apple/specs/enumext.spec +++ b/src/glx/apple/specs/enumext.spec @@ -1,5 +1,7 @@ -# List of GL enumerants for glext.h header +# enumext.spec - list of GL enumerants for glext.h header # +# $Revision: 10971 $ on $Date: 2010-04-09 02:45:33 -0700 (Fri, 09 Apr 2010) $ + # This is derived from the master GL enumerant registry (enum.spec). # # Unlike enum.spec, enumext.spec is @@ -14,8 +16,8 @@ # (4) Is processed by glextenum.pl, which has evolved # from enum.pl - should merge back into one script. -# glext.h version number - this should be automatically updated, -# when changing either enum or template spec files. +# The release number encoded into glext.h is now defined in +# glextrelease.txt. ############################################################################### # @@ -1495,6 +1497,122 @@ passthru: /* Reuse tokens from ARB_texture_multisample */ use ARB_texture_multisample MAX_INTEGER_SAMPLES passthru: /* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */ +############################################################################### +# +# OpenGL 3.3 enums +# +############################################################################### + +VERSION_3_3 enum: +passthru: /* Reuse tokens from ARB_blend_func_extended */ + use ARB_blend_func_extended SRC1_COLOR + use ARB_blend_func_extended ONE_MINUS_SRC1_COLOR + use ARB_blend_func_extended ONE_MINUS_SRC1_ALPHA + use ARB_blend_func_extended MAX_DUAL_SOURCE_DRAW_BUFFERS +passthru: /* Would reuse tokens from ARB_explicit_attrib_location, but it has none */ +passthru: /* Reuse tokens from ARB_occlusion_query2 */ + use ARB_occlusion_query2 ANY_SAMPLES_PASSED +passthru: /* Reuse tokens from ARB_sampler_objects */ + use ARB_sampler_objects SAMPLER_BINDING +passthru: /* Would reuse tokens from ARB_shader_bit_encoding, but it has none */ +passthru: /* Reuse tokens from ARB_texture_rgb10_a2ui */ + use ARB_texture_rgb10_a2ui RGB10_A2UI +passthru: /* Reuse tokens from ARB_texture_swizzle */ + use ARB_texture_swizzle TEXTURE_SWIZZLE_R + use ARB_texture_swizzle TEXTURE_SWIZZLE_G + use ARB_texture_swizzle TEXTURE_SWIZZLE_B + use ARB_texture_swizzle TEXTURE_SWIZZLE_A + use ARB_texture_swizzle TEXTURE_SWIZZLE_RGBA +passthru: /* Reuse tokens from ARB_timer_query */ + use ARB_timer_query TIME_ELAPSED + use ARB_timer_query TIMESTAMP +passthru: /* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */ + use ARB_vertex_type_2_10_10_10_rev INT_2_10_10_10_REV + +############################################################################### +# +# OpenGL 4.0 enums +# +############################################################################### + +VERSION_4_0 enum: +passthru: /* Reuse tokens from ARB_draw_indirect */ + use ARB_draw_indirect DRAW_INDIRECT_BUFFER + use ARB_draw_indirect DRAW_INDIRECT_BUFFER_BINDING +passthru: /* Reuse tokens from ARB_gpu_shader5 */ + use ARB_gpu_shader5 GEOMETRY_SHADER_INVOCATIONS + use ARB_gpu_shader5 MAX_GEOMETRY_SHADER_INVOCATIONS + use ARB_gpu_shader5 MIN_FRAGMENT_INTERPOLATION_OFFSET + use ARB_gpu_shader5 MAX_FRAGMENT_INTERPOLATION_OFFSET + use ARB_gpu_shader5 FRAGMENT_INTERPOLATION_OFFSET_BITS + use ARB_gpu_shader5 MAX_VERTEX_STREAMS +passthru: /* Reuse tokens from ARB_gpu_shader_fp64 */ + use ARB_gpu_shader_fp64 DOUBLE_VEC2 + use ARB_gpu_shader_fp64 DOUBLE_VEC3 + use ARB_gpu_shader_fp64 DOUBLE_VEC4 + use ARB_gpu_shader_fp64 DOUBLE_MAT2 + use ARB_gpu_shader_fp64 DOUBLE_MAT3 + use ARB_gpu_shader_fp64 DOUBLE_MAT4 + use ARB_gpu_shader_fp64 DOUBLE_MAT2x3 + use ARB_gpu_shader_fp64 DOUBLE_MAT2x4 + use ARB_gpu_shader_fp64 DOUBLE_MAT3x2 + use ARB_gpu_shader_fp64 DOUBLE_MAT3x4 + use ARB_gpu_shader_fp64 DOUBLE_MAT4x2 + use ARB_gpu_shader_fp64 DOUBLE_MAT4x3 +passthru: /* Reuse tokens from ARB_shader_subroutine */ + use ARB_shader_subroutine ACTIVE_SUBROUTINES + use ARB_shader_subroutine ACTIVE_SUBROUTINE_UNIFORMS + use ARB_shader_subroutine ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS + use ARB_shader_subroutine ACTIVE_SUBROUTINE_MAX_LENGTH + use ARB_shader_subroutine ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH + use ARB_shader_subroutine MAX_SUBROUTINES + use ARB_shader_subroutine MAX_SUBROUTINE_UNIFORM_LOCATIONS + use ARB_shader_subroutine NUM_COMPATIBLE_SUBROUTINES + use ARB_shader_subroutine COMPATIBLE_SUBROUTINES +passthru: /* Reuse tokens from ARB_tessellation_shader */ + use ARB_tessellation_shader PATCHES + use ARB_tessellation_shader PATCH_VERTICES + use ARB_tessellation_shader PATCH_DEFAULT_INNER_LEVEL + use ARB_tessellation_shader PATCH_DEFAULT_OUTER_LEVEL + use ARB_tessellation_shader TESS_CONTROL_OUTPUT_VERTICES + use ARB_tessellation_shader TESS_GEN_MODE + use ARB_tessellation_shader TESS_GEN_SPACING + use ARB_tessellation_shader TESS_GEN_VERTEX_ORDER + use ARB_tessellation_shader TESS_GEN_POINT_MODE + use ARB_tessellation_shader ISOLINES + use ARB_tessellation_shader FRACTIONAL_ODD + use ARB_tessellation_shader FRACTIONAL_EVEN + use ARB_tessellation_shader MAX_PATCH_VERTICES + use ARB_tessellation_shader MAX_TESS_GEN_LEVEL + use ARB_tessellation_shader MAX_TESS_CONTROL_UNIFORM_COMPONENTS + use ARB_tessellation_shader MAX_TESS_EVALUATION_UNIFORM_COMPONENTS + use ARB_tessellation_shader MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS + use ARB_tessellation_shader MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS + use ARB_tessellation_shader MAX_TESS_CONTROL_OUTPUT_COMPONENTS + use ARB_tessellation_shader MAX_TESS_PATCH_COMPONENTS + use ARB_tessellation_shader MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS + use ARB_tessellation_shader MAX_TESS_EVALUATION_OUTPUT_COMPONENTS + use ARB_tessellation_shader MAX_TESS_CONTROL_UNIFORM_BLOCKS + use ARB_tessellation_shader MAX_TESS_EVALUATION_UNIFORM_BLOCKS + use ARB_tessellation_shader MAX_TESS_CONTROL_INPUT_COMPONENTS + use ARB_tessellation_shader MAX_TESS_EVALUATION_INPUT_COMPONENTS + use ARB_tessellation_shader MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS + use ARB_tessellation_shader MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS + use ARB_tessellation_shader UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER + use ARB_tessellation_shader UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER + use ARB_tessellation_shader TESS_EVALUATION_SHADER + use ARB_tessellation_shader TESS_CONTROL_SHADER +passthru: /* Would reuse tokens from ARB_texture_buffer_object_rgb32, but it has none */ +passthru: /* Reuse tokens from ARB_transform_feedback2 */ + use ARB_tessellation_shader TRANSFORM_FEEDBACK + use ARB_tessellation_shader TRANSFORM_FEEDBACK_BUFFER_PAUSED + use ARB_tessellation_shader TRANSFORM_FEEDBACK_BUFFER_ACTIVE + use ARB_tessellation_shader TRANSFORM_FEEDBACK_BINDING +passthru: /* Reuse tokens from ARB_transform_feedback3 */ + use ARB_tessellation_shader MAX_TRANSFORM_FEEDBACK_BUFFERS + use ARB_tessellation_shader MAX_VERTEX_STREAMS + + ############################################################################### # # ARB extensions, in ARB extension order @@ -2534,10 +2652,12 @@ ARB_vertex_array_bgra enum: # No new tokens # ARB Extension #69 ARB_draw_buffers_blend enum: +#@@@ Add ARB suffixes here & functions! ############################################################################### # ARB Extension #70 +#@@@ Add ARB suffixes here & functions! ARB_sample_shading enum: SAMPLE_SHADING = 0x8C36 MIN_SAMPLE_SHADING_VALUE = 0x8C37 @@ -2545,6 +2665,7 @@ ARB_sample_shading enum: ############################################################################### # ARB Extension #71 +#@@@ Add ARB suffixes here & functions! ARB_texture_cube_map_array enum: TEXTURE_CUBE_MAP_ARRAY = 0x9009 TEXTURE_BINDING_CUBE_MAP_ARRAY = 0x900A @@ -2557,10 +2678,10 @@ ARB_texture_cube_map_array enum: ############################################################################### # ARB Extension #72 +#@@@ Add ARB suffixes here & functions! ARB_texture_gather enum: - MIN_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5E - MAX_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5F - MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS = 0x8F9F + MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5E + MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5F ############################################################################### @@ -2574,6 +2695,206 @@ ARB_texture_query_lod enum: # ARB Extension #74 - WGL_ARB_create_context_profile # ARB Extension #75 - GLX_ARB_create_context_profile +############################################################################### + +# ARB Extension #76 +ARB_shading_language_include enum: + SHADER_INCLUDE_ARB = 0x8DAE + NAMED_STRING_LENGTH_ARB = 0x8DE9 + NAMED_STRING_TYPE_ARB = 0x8DEA + +############################################################################### + +# ARB Extension #77 +ARB_texture_compression_bptc enum: + COMPRESSED_RGBA_BPTC_UNORM_ARB = 0x8E8C + COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB = 0x8E8D + COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB = 0x8E8E + COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB = 0x8E8F + +############################################################################### + +# ARB Extension #78 +ARB_blend_func_extended enum: + SRC1_COLOR = 0x88F9 + use VERSION_1_5_DEPRECATED SRC1_ALPHA + ONE_MINUS_SRC1_COLOR = 0x88FA + ONE_MINUS_SRC1_ALPHA = 0x88FB + MAX_DUAL_SOURCE_DRAW_BUFFERS = 0x88FC + +############################################################################### + +# No new tokens +# ARB Extension #79 +ARB_explicit_attrib_location enum: + +############################################################################### + +# ARB Extension #80 +ARB_occlusion_query2 enum: + ANY_SAMPLES_PASSED = 0x8C2F + +############################################################################### + +# ARB Extension #81 +ARB_sampler_objects enum: + SAMPLER_BINDING = 0x8919 + +############################################################################### + +# No new tokens +# ARB Extension #82 +ARB_shader_bit_encoding enum: + +############################################################################### + +# ARB Extension #83 +ARB_texture_rgb10_a2ui enum: + RGB10_A2UI = 0x906F + +############################################################################### + +# ARB Extension #84 +ARB_texture_swizzle enum: + TEXTURE_SWIZZLE_R = 0x8E42 + TEXTURE_SWIZZLE_G = 0x8E43 + TEXTURE_SWIZZLE_B = 0x8E44 + TEXTURE_SWIZZLE_A = 0x8E45 + TEXTURE_SWIZZLE_RGBA = 0x8E46 + +############################################################################### + +# ARB Extension #85 +ARB_timer_query enum: + TIME_ELAPSED = 0x88BF + TIMESTAMP = 0x8E28 + +############################################################################### + +# ARB Extension #86 +ARB_vertex_type_2_10_10_10_rev enum: + use VERSION_1_2 UNSIGNED_INT_2_10_10_10_REV + INT_2_10_10_10_REV = 0x8D9F + +############################################################################### + +# ARB Extension #87 +ARB_draw_indirect enum: + DRAW_INDIRECT_BUFFER = 0x8F3F + DRAW_INDIRECT_BUFFER_BINDING = 0x8F43 + +############################################################################### + +# ARB Extension #88 +ARB_gpu_shader5 enum: + GEOMETRY_SHADER_INVOCATIONS = 0x887F + MAX_GEOMETRY_SHADER_INVOCATIONS = 0x8E5A + MIN_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5B + MAX_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5C + FRAGMENT_INTERPOLATION_OFFSET_BITS = 0x8E5D + MAX_VERTEX_STREAMS = 0x8E71 + +############################################################################### + +# ARB Extension #89 +ARB_gpu_shader_fp64 enum: + use VERSION_1_1 DOUBLE + DOUBLE_VEC2 = 0x8FFC + DOUBLE_VEC3 = 0x8FFD + DOUBLE_VEC4 = 0x8FFE + DOUBLE_MAT2 = 0x8F46 + DOUBLE_MAT3 = 0x8F47 + DOUBLE_MAT4 = 0x8F48 + DOUBLE_MAT2x3 = 0x8F49 + DOUBLE_MAT2x4 = 0x8F4A + DOUBLE_MAT3x2 = 0x8F4B + DOUBLE_MAT3x4 = 0x8F4C + DOUBLE_MAT4x2 = 0x8F4D + DOUBLE_MAT4x3 = 0x8F4E + +############################################################################### + +# ARB Extension #90 +ARB_shader_subroutine enum: + ACTIVE_SUBROUTINES = 0x8DE5 + ACTIVE_SUBROUTINE_UNIFORMS = 0x8DE6 + ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS = 0x8E47 + ACTIVE_SUBROUTINE_MAX_LENGTH = 0x8E48 + ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH = 0x8E49 + MAX_SUBROUTINES = 0x8DE7 + MAX_SUBROUTINE_UNIFORM_LOCATIONS = 0x8DE8 + NUM_COMPATIBLE_SUBROUTINES = 0x8E4A + COMPATIBLE_SUBROUTINES = 0x8E4B + use ARB_uniform_buffer_object UNIFORM_SIZE + use ARB_uniform_buffer_object UNIFORM_NAME_LENGTH + +############################################################################### + +# ARB Extension #91 +ARB_tessellation_shader enum: + PATCHES = 0x000E + PATCH_VERTICES = 0x8E72 + PATCH_DEFAULT_INNER_LEVEL = 0x8E73 + PATCH_DEFAULT_OUTER_LEVEL = 0x8E74 + TESS_CONTROL_OUTPUT_VERTICES = 0x8E75 + TESS_GEN_MODE = 0x8E76 + TESS_GEN_SPACING = 0x8E77 + TESS_GEN_VERTEX_ORDER = 0x8E78 + TESS_GEN_POINT_MODE = 0x8E79 + use VERSION_1_1 TRIANGLES + use VERSION_1_1 QUADS + ISOLINES = 0x8E7A + use VERSION_1_1 EQUAL + FRACTIONAL_ODD = 0x8E7B + FRACTIONAL_EVEN = 0x8E7C + use VERSION_1_1 CCW + use VERSION_1_1 CW + MAX_PATCH_VERTICES = 0x8E7D + MAX_TESS_GEN_LEVEL = 0x8E7E + MAX_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E7F + MAX_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E80 + MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS = 0x8E81 + MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS = 0x8E82 + MAX_TESS_CONTROL_OUTPUT_COMPONENTS = 0x8E83 + MAX_TESS_PATCH_COMPONENTS = 0x8E84 + MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS = 0x8E85 + MAX_TESS_EVALUATION_OUTPUT_COMPONENTS = 0x8E86 + MAX_TESS_CONTROL_UNIFORM_BLOCKS = 0x8E89 + MAX_TESS_EVALUATION_UNIFORM_BLOCKS = 0x8E8A + MAX_TESS_CONTROL_INPUT_COMPONENTS = 0x886C + MAX_TESS_EVALUATION_INPUT_COMPONENTS = 0x886D + MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E1E + MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E1F + UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER = 0x84F0 + UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x84F1 + TESS_EVALUATION_SHADER = 0x8E87 + TESS_CONTROL_SHADER = 0x8E88 + +############################################################################### + +# ARB Extension #92 +ARB_texture_buffer_object_rgb32 enum: + use VERSION_3_0 RGB32F + use VERSION_3_0 RGB32UI + use VERSION_3_0 RGB32I + +############################################################################### + +# ARB Extension #93 +ARB_transform_feedback2 enum: + TRANSFORM_FEEDBACK = 0x8E22 + TRANSFORM_FEEDBACK_BUFFER_PAUSED = 0x8E23 + TRANSFORM_FEEDBACK_BUFFER_ACTIVE = 0x8E24 + TRANSFORM_FEEDBACK_BINDING = 0x8E25 + +############################################################################### + +# ARB Extension #94 +ARB_transform_feedback3 enum: + MAX_TRANSFORM_FEEDBACK_BUFFERS = 0x8E70 + MAX_VERTEX_STREAMS = 0x8E71 + + ############################################################################### # # non-ARB extensions follow, in registry order @@ -5360,7 +5681,10 @@ NV_vertex_program3 enum: # Extension #307 - GLX_SGIX_hyperpipe # Extension #308 - GLX_MESA_agp_offset + # Extension #309 - GL_EXT_texture_compression_dxt1 (OpenGL ES only, subset of _s3tc version) +# use EXT_texture_compression_s3tc COMPRESSED_RGB_S3TC_DXT1_EXT +# use EXT_texture_compression_s3tc COMPRESSED_RGBA_S3TC_DXT1_EXT ############################################################################### @@ -6193,3 +6517,26 @@ NV_vertex_buffer_unified_memory enum: # No new tokens # Extension #381 NV_texture_barrier enum: + +############################################################################### + +# No new tokens +# Extension #382 +AMD_shader_stencil_export enum: + +############################################################################### + +# Extension #383 +AMD_seamless_cubemap_per_texture enum: + use ARB_seamless_cube_map TEXTURE_CUBE_MAP_SEAMLESS_ARB + +############################################################################### + +# Extension #384 - GLX_INTEL_swap_event + +############################################################################### + +# No new tokens +# Extension #385 +AMD_conservative_depth enum: + diff --git a/src/glx/apple/specs/gl.spec b/src/glx/apple/specs/gl.spec index 98f364d53e..bc054f8643 100644 --- a/src/glx/apple/specs/gl.spec +++ b/src/glx/apple/specs/gl.spec @@ -2,11 +2,12 @@ # DON'T REMOVE PREVIOUS LINE!!! libspec depends on it! # # Copyright (c) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. -# Copyright (c) 2006-2009 The Khronos Group Inc. +# Copyright (c) 2006-2010 The Khronos Group Inc. # # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - +# +# $Revision: 10971 $ on $Date: 2010-04-09 02:45:33 -0700 (Fri, 09 Apr 2010) $ required-props: # Description of a parameter @@ -20,7 +21,7 @@ vectorequiv: * # Category this function falls in. While there are many categories for # early GL 1.0 functions, later functions just have a core version # (e.g. VERSION_major_minor) or extension name for the category. -category: display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2 ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_pn_triangles ATI_vertex_array_object ATI_vertex_streams EXT_blend_color EXT_blend_minmax EXT_convolution EXT_copy_texture EXT_histogram EXT_polygon_offset EXT_subtexture EXT_texture3D EXT_texture_object EXT_vertex_array EXT_vertex_shader SGIS_detail_texture SGIS_multisample SGIS_pixel_texture ARB_point_parameters EXT_point_parameters SGIS_point_parameters SGIS_sharpen_texture SGIS_texture4D SGIS_texture_filter4 SGIX_async SGIX_flush_raster SGIX_fragment_lighting SGIX_framezoom SGIX_igloo_interface SGIX_instruments SGIX_list_priority SGIX_pixel_texture SGIX_polynomial_ffd SGIX_reference_plane SGIX_sprite SGIX_tag_sample_buffer SGI_color_table ARB_multitexture ARB_multisample ARB_texture_compression ARB_transpose_matrix ARB_vertex_blend ARB_matrix_palette EXT_compiled_vertex_array EXT_cull_vertex EXT_index_func EXT_index_material EXT_draw_range_elements EXT_vertex_weighting INGR_blend_func_separate NV_evaluators NV_fence NV_occlusion_query NV_point_sprite NV_register_combiners NV_register_combiners2 NV_vertex_array_range NV_vertex_program NV_vertex_program1_1_dcc MESA_resize_buffers MESA_window_pos PGI_misc_hints EXT_fog_coord EXT_blend_func_separate EXT_color_subtable EXT_coordinate_frame EXT_light_texture EXT_multi_draw_arrays EXT_paletted_texture EXT_pixel_transform EXT_secondary_color EXT_texture_perturb_normal HP_image_transform IBM_multimode_draw_arrays IBM_vertex_array_lists INTEL_parallel_arrays SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list SUN_vertex 3DFX_tbuffer EXT_multisample SGIS_fog_function SGIS_texture_color_mask ARB_window_pos EXT_stencil_two_side EXT_depth_bounds_test EXT_blend_equation_separate ARB_vertex_program ARB_fragment_program ARB_vertex_buffer_object ARB_occlusion_query ARB_shader_objects ARB_vertex_shader ARB_fragment_shader S3_s3tc ATI_draw_buffers ATI_texture_env_combine3 ATI_texture_float NV_float_buffer NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart NV_texture_expand_normal NV_texture_expand_normal NV_vertex_program2 APPLE_element_array APPLE_fence APPLE_vertex_array_object APPLE_vertex_array_range ATI_draw_buffers NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart ATI_map_object_buffer ATI_separate_stencil ATI_vertex_attrib_array_object ARB_draw_buffers ARB_texture_rectangle ARB_color_buffer_float EXT_framebuffer_object GREMEDY_string_marker EXT_stencil_clear_tag EXT_framebuffer_blit EXT_framebuffer_multisample MESAX_texture_stack EXT_timer_query EXT_gpu_program_parameters APPLE_flush_buffer_range NV_gpu_program4 NV_geometry_program4 EXT_geometry_shader4 NV_vertex_program4 EXT_gpu_shader4 EXT_draw_instanced EXT_texture_buffer_object NV_depth_buffer_float NV_framebuffer_multisample_coverage NV_parameter_buffer_object EXT_draw_buffers2 NV_transform_feedback EXT_bindable_uniform EXT_texture_integer GREMEDY_frame_terminator NV_conditional_render NV_present_video EXT_transform_feedback ARB_depth_buffer_float ARB_draw_instanced ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_half_float_vertex ARB_instanced_arrays ARB_map_buffer_range ARB_texture_buffer_object ARB_texture_compression_rgtc ARB_texture_rg ARB_vertex_array_object EXT_direct_state_access EXT_vertex_array_bgra EXT_texture_swizzle NV_explicit_multisample NV_transform_feedback2 ATI_meminfo AMD_performance_monitor AMD_vertex_shader_tesselator EXT_provoking_vertex ARB_uniform_buffer_object ARB_copy_buffer EXT_texture_snorm AMD_draw_buffers_blend APPLE_texture_range APPLE_float_pixels APPLE_vertex_program_evaluators APPLE_aux_depth_stencil APPLE_object_purgeable APPLE_row_bytes ARB_draw_elements_base_vertex ARB_provoking_vertex ARB_sync ARB_texture_multisample ARB_draw_buffers_blend ARB_sample_shading NV_video_capture NV_copy_image EXT_separate_shader_objects NV_parameter_buffer_object2 NV_shader_buffer_load NV_vertex_buffer_unified_memory NV_texture_barrier +category: display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_pn_triangles ATI_vertex_array_object ATI_vertex_streams EXT_blend_color EXT_blend_minmax EXT_convolution EXT_copy_texture EXT_histogram EXT_polygon_offset EXT_subtexture EXT_texture3D EXT_texture_object EXT_vertex_array EXT_vertex_shader SGIS_detail_texture SGIS_multisample SGIS_pixel_texture ARB_point_parameters EXT_point_parameters SGIS_point_parameters SGIS_sharpen_texture SGIS_texture4D SGIS_texture_filter4 SGIX_async SGIX_flush_raster SGIX_fragment_lighting SGIX_framezoom SGIX_igloo_interface SGIX_instruments SGIX_list_priority SGIX_pixel_texture SGIX_polynomial_ffd SGIX_reference_plane SGIX_sprite SGIX_tag_sample_buffer SGI_color_table ARB_multitexture ARB_multisample ARB_texture_compression ARB_transpose_matrix ARB_vertex_blend ARB_matrix_palette EXT_compiled_vertex_array EXT_cull_vertex EXT_index_func EXT_index_material EXT_draw_range_elements EXT_vertex_weighting INGR_blend_func_separate NV_evaluators NV_fence NV_occlusion_query NV_point_sprite NV_register_combiners NV_register_combiners2 NV_vertex_array_range NV_vertex_program NV_vertex_program1_1_dcc MESA_resize_buffers MESA_window_pos PGI_misc_hints EXT_fog_coord EXT_blend_func_separate EXT_color_subtable EXT_coordinate_frame EXT_light_texture EXT_multi_draw_arrays EXT_paletted_texture EXT_pixel_transform EXT_secondary_color EXT_texture_perturb_normal HP_image_transform IBM_multimode_draw_arrays IBM_vertex_array_lists INTEL_parallel_arrays SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list SUN_vertex 3DFX_tbuffer EXT_multisample SGIS_fog_function SGIS_texture_color_mask ARB_window_pos EXT_stencil_two_side EXT_depth_bounds_test EXT_blend_equation_separate ARB_vertex_program ARB_fragment_program ARB_vertex_buffer_object ARB_occlusion_query ARB_shader_objects ARB_vertex_shader ARB_fragment_shader S3_s3tc ATI_draw_buffers ATI_texture_env_combine3 ATI_texture_float NV_float_buffer NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart NV_texture_expand_normal NV_texture_expand_normal NV_vertex_program2 APPLE_element_array APPLE_fence APPLE_vertex_array_object APPLE_vertex_array_range ATI_draw_buffers NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart ATI_map_object_buffer ATI_separate_stencil ATI_vertex_attrib_array_object ARB_draw_buffers ARB_texture_rectangle ARB_color_buffer_float EXT_framebuffer_object GREMEDY_string_marker EXT_stencil_clear_tag EXT_framebuffer_blit EXT_framebuffer_multisample MESAX_texture_stack EXT_timer_query EXT_gpu_program_parameters APPLE_flush_buffer_range NV_gpu_program4 NV_geometry_program4 EXT_geometry_shader4 NV_vertex_program4 EXT_gpu_shader4 EXT_draw_instanced EXT_texture_buffer_object NV_depth_buffer_float NV_framebuffer_multisample_coverage NV_parameter_buffer_object EXT_draw_buffers2 NV_transform_feedback EXT_bindable_uniform EXT_texture_integer GREMEDY_frame_terminator NV_conditional_render NV_present_video EXT_transform_feedback ARB_depth_buffer_float ARB_draw_instanced ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_half_float_vertex ARB_instanced_arrays ARB_map_buffer_range ARB_texture_buffer_object ARB_texture_compression_rgtc ARB_texture_rg ARB_vertex_array_object EXT_direct_state_access EXT_vertex_array_bgra EXT_texture_swizzle NV_explicit_multisample NV_transform_feedback2 ATI_meminfo AMD_performance_monitor AMD_vertex_shader_tesselator EXT_provoking_vertex ARB_uniform_buffer_object ARB_copy_buffer EXT_texture_snorm AMD_draw_buffers_blend APPLE_texture_range APPLE_float_pixels APPLE_vertex_program_evaluators APPLE_aux_depth_stencil APPLE_object_purgeable APPLE_row_bytes ARB_draw_elements_base_vertex ARB_provoking_vertex ARB_sync ARB_texture_multisample ARB_draw_buffers_blend ARB_sample_shading NV_video_capture NV_copy_image EXT_separate_shader_objects NV_parameter_buffer_object2 NV_shader_buffer_load NV_vertex_buffer_unified_memory NV_texture_barrier ARB_shading_language_include ARB_blend_func_extended ARB_sampler_objects ARB_timer_query ARB_vertex_type_2_10_10_10_rev ARB_draw_indirect ARB_gpu_shader_fp64 ARB_shader_subroutine ARB_tessellation_shader ARB_transform_feedback2 ARB_transform_feedback3 AMD_conservative_depth # Categories for extensions with no functions - need not be included now # ARB_texture_env_add ARB_texture_cube_map ARB_texture_border_clamp @@ -59,10 +60,11 @@ category: display-list drawing drawing-control feedback framebuf misc modeling p # EXT_vertex_array_bgra ARB_depth_clamp ARB_fragment_coord_conventions # ARB_seamless_cube_map ARB_vertex_array_bgra ARB_texture_cube_map_array # ARB_texture_gather ARB_texture_query_lod +# AMD_shader_stencil_export AMD_seamless_cubemap_per_texture # Core version in which a function was introduced, or against # which an extension can be implemented -version: 1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 +version: 1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 3.3 4.0 # Core version in which a function was removed deprecated: 3.1 # GLX Single, Rendering, or Vendor Private opcode @@ -7852,34 +7854,11 @@ FramebufferTexture(target, attachment, texture, level) glxflags ignore offset ? -# FramebufferTextureLayer redeclared in ARB_framebuffer_object +# FramebufferTextureLayer already declared in ARB_framebuffer_object # FramebufferTextureLayer(target, attachment, texture, level, layer) -# return void -# param target GLenum in value -# param attachment GLenum in value -# param texture UInt32 in value -# param level Int32 in value -# param layer Int32 in value -# category VERSION_3_2 -# version 1.2 -# extension -# glxropcode ? -# glxflags ignore -# offset ? -FramebufferTextureFace(target, attachment, texture, level, face) - return void - param target GLenum in value - param attachment GLenum in value - param texture UInt32 in value - param level Int32 in value - param face GLenum in value - category VERSION_3_2 - version 1.2 - extension - glxropcode ? - glxflags ignore - offset ? +# Not promoted to the core along with the rest +# FramebufferTextureFace(target, attachment, texture, level, face) # OpenGL 3.2 (ARB_seamless_cube_map) commands - none # OpenGL 3.2 (ARB_vertex_array_bgra) commands - none @@ -7891,6 +7870,50 @@ passthru: /* ARB_sync */ passthru: /* ARB_texture_multisample */ +############################################################################### +############################################################################### +# +# OpenGL 3.3 commands +# +############################################################################### +############################################################################### + +# New commands in OpenGL 3.3 - none +newcategory: VERSION_3_3 + +passthru: /* OpenGL 3.3 also reuses entry points from these extensions: */ +passthru: /* ARB_blend_func_extended */ +passthru: /* ARB_sampler_objects */ +passthru: /* ARB_explicit_attrib_location, but it has none */ +passthru: /* ARB_occlusion_query2 (no entry points) */ +passthru: /* ARB_shader_bit_encoding (no entry points) */ +passthru: /* ARB_texture_rgb10_a2ui (no entry points) */ +passthru: /* ARB_texture_swizzle (no entry points) */ +passthru: /* ARB_timer_query */ +passthru: /* ARB_vertex_type_2_10_10_10_rev */ + + +############################################################################### +############################################################################### +# +# OpenGL 4.0 commands +# +############################################################################### +############################################################################### + +# New commands in OpenGL 4.0 - none +newcategory: VERSION_4_0 + +passthru: /* OpenGL 4.0 also reuses entry points from these extensions: */ +passthru: /* ARB_gpu_shader5 (no entry points) */ +passthru: /* ARB_gpu_shader_fp64 */ +passthru: /* ARB_shader_subroutine */ +passthru: /* ARB_tessellation_shader */ +passthru: /* ARB_texture_buffer_object_rgb32 (no entry points) */ +passthru: /* ARB_transform_feedback2 */ +passthru: /* ARB_transform_feedback3 */ + + ############################################################################### ############################################################################### # @@ -11282,66 +11305,1730 @@ newcategory: ARB_seamless_cube_map # ############################################################################### -FenceSync(condition, flags) - return sync - param condition GLenum in value - param flags GLbitfield in value - category ARB_sync +FenceSync(condition, flags) + return sync + param condition GLenum in value + param flags GLbitfield in value + category ARB_sync + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +IsSync(sync) + return Boolean + param sync sync in value + category ARB_sync + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +DeleteSync(sync) + return void + param sync sync in value + category ARB_sync + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ClientWaitSync(sync, flags, timeout) + return GLenum + param sync sync in value + param flags GLbitfield in value + param timeout UInt64 in value + category ARB_sync + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +WaitSync(sync, flags, timeout) + return void + param sync sync in value + param flags GLbitfield in value + param timeout UInt64 in value + category ARB_sync + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +GetInteger64v(pname, params) + return void + param pname GLenum in value + param params Int64 out array [COMPSIZE(pname)] + category ARB_sync + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +GetSynciv(sync, pname, bufSize, length, values) + return void + param sync sync in value + param pname GLenum in value + param bufSize SizeI in value + param length SizeI out array [1] + param values Int32 out array [length] + category ARB_sync + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #67 +# ARB_texture_multisample commands +# +############################################################################### + +TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations) + return void + param target GLenum in value + param samples SizeI in value + param internalformat Int32 in value + param width SizeI in value + param height SizeI in value + param fixedsamplelocations Boolean in value + category ARB_texture_multisample + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations) + return void + param target GLenum in value + param samples SizeI in value + param internalformat Int32 in value + param width SizeI in value + param height SizeI in value + param depth SizeI in value + param fixedsamplelocations Boolean in value + category ARB_texture_multisample + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +GetMultisamplefv(pname, index, val) + return void + param pname GLenum in value + param index UInt32 in value + param val Float32 out array [COMPSIZE(pname)] + category ARB_texture_multisample + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +SampleMaski(index, mask) + return void + param index UInt32 in value + param mask GLbitfield in value + category ARB_texture_multisample + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #68 +# ARB_vertex_array_bgra commands +# +############################################################################### + +# (none) +newcategory: ARB_vertex_array_bgra + +############################################################################### +# +# ARB Extension #69 +# ARB_draw_buffers_blend commands +# +############################################################################### + +@@@ Add ARB suffixes here & functions! +BlendEquationi(buf, mode) + return void + param buf UInt32 in value + param mode GLenum in value + category ARB_draw_buffers_blend + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +BlendEquationSeparatei(buf, modeRGB, modeAlpha) + return void + param buf UInt32 in value + param modeRGB GLenum in value + param modeAlpha GLenum in value + category ARB_draw_buffers_blend + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +BlendFunci(buf, src, dst) + return void + param buf UInt32 in value + param src GLenum in value + param dst GLenum in value + category ARB_draw_buffers_blend + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha) + return void + param buf UInt32 in value + param srcRGB GLenum in value + param dstRGB GLenum in value + param srcAlpha GLenum in value + param dstAlpha GLenum in value + category ARB_draw_buffers_blend + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #70 +# ARB_sample_shading commands +# +############################################################################### + +@@@ Add ARB suffixes here & functions! +MinSampleShading(value) + return void + param value ClampedColorF in value + category ARB_sample_shading + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #71 +# ARB_texture_cube_map_array commands +# +############################################################################### + +# (none) +newcategory: ARB_texture_cube_map_array + +############################################################################### +# +# ARB Extension #72 +# ARB_texture_gather commands +# +############################################################################### + +# (none) +newcategory: ARB_texture_gather + +############################################################################### +# +# ARB Extension #73 +# ARB_texture_query_lod commands +# +############################################################################### + +# (none) +newcategory: ARB_texture_query_lod + +############################################################################### +# +# ARB Extension #74 - WGL_ARB_create_context_profile +# ARB Extension #75 - GLX_ARB_create_context_profile +# +############################################################################### + +############################################################################### +# +# ARB Extension #76 +# ARB_shading_language_include commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +NamedStringARB(type, namelen, name, stringlen, string) + return void + param type GLenum in value + param namelen Int32 in value + param name Char in array [namelen] + param stringlen Int32 in value + param string Char in array [stringlen] + category ARB_shading_language_include + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +DeleteNamedStringARB(namelen, name) + return void + param namelen Int32 in value + param name Char in array [namelen] + category ARB_shading_language_include + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +CompileShaderIncludeARB(shader, count, path, length) + return void + param shader UInt32 in value + param count SizeI in value + param path CharPointer in array [count] + param length Int32 in array [count] + category ARB_shading_language_include + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +IsNamedStringARB(namelen, name) + return Boolean + param namelen Int32 in value + param name Char in array [namelen] + category ARB_shading_language_include + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +GetNamedStringARB(namelen, name, bufSize, stringlen, string) + return void + param namelen Int32 in value + param name Char in array [namelen] + param bufSize SizeI in value + param stringlen Int32 out array [1] + param string Char out array [bufSize] + category ARB_shading_language_include + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +GetNamedStringivARB(namelen, name, pname, params) + return void + param namelen Int32 in value + param name Char in array [namelen] + param pname GLenum in value + param params Int32 out array [COMPSIZE(pname)] + category ARB_shading_language_include + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #77 +# ARB_texture_compression_bptc commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +############################################################################### +# +# ARB Extension #78 +# ARB_blend_func_extended commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +BindFragDataLocationIndexed(program, colorNumber, index, name) + return void + param program UInt32 in value + param colorNumber UInt32 in value + param index UInt32 in value + param name Char in array [] + category ARB_blend_func_extended + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +GetFragDataIndex(program, name) + return Int32 + param program UInt32 in value + param name Char in array [] + category ARB_blend_func_extended + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #79 +# ARB_explicit_attrib_location commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +############################################################################### +# +# ARB Extension #80 +# ARB_occlusion_query2 commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +############################################################################### +# +# ARB Extension #81 +# ARB_sampler_objects commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +GenSamplers(count, samplers) + return void + param count SizeI in value + param samplers UInt32 out array [count] + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +DeleteSamplers(count, samplers) + return void + param count SizeI in value + param samplers UInt32 in array [count] + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +IsSampler(sampler) + return Boolean + param sampler UInt32 in value + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +BindSampler(unit, sampler) + return void + param unit GLenum in value + param sampler UInt32 in value + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +SamplerParameteri(sampler, pname, param) + return void + param sampler UInt32 in value + param pname GLenum in value + param param Int32 in value + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +SamplerParameteriv(sampler, pname, param) + return void + param sampler UInt32 in value + param pname GLenum in value + param param Int32 in array [COMPSIZE(pname)] + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +SamplerParameterf(sampler, pname, param) + return void + param sampler UInt32 in value + param pname GLenum in value + param param Float32 in value + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +SamplerParameterfv(sampler, pname, param) + return void + param sampler UInt32 in value + param pname GLenum in value + param param Float32 in array [COMPSIZE(pname)] + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +SamplerParameterIiv(sampler, pname, param) + return void + param sampler UInt32 in value + param pname GLenum in value + param param Int32 in array [COMPSIZE(pname)] + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +SamplerParameterIuiv(sampler, pname, param) + return void + param sampler UInt32 in value + param pname GLenum in value + param param UInt32 in array [COMPSIZE(pname)] + category ARB_sampler_objects + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +GetSamplerParameteriv(sampler, pname, params) + return void + param sampler UInt32 in value + param pname GLenum in value + param params Int32 out array [COMPSIZE(pname)] + category ARB_sampler_objects + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +GetSamplerParameterIiv(sampler, pname, params) + return void + param sampler UInt32 in value + param pname GLenum in value + param params Int32 out array [COMPSIZE(pname)] + category ARB_sampler_objects + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +GetSamplerParameterfv(sampler, pname, params) + return void + param sampler UInt32 in value + param pname GLenum in value + param params Float32 out array [COMPSIZE(pname)] + category ARB_sampler_objects + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +GetSamplerParameterIfv(sampler, pname, params) + return void + param sampler UInt32 in value + param pname GLenum in value + param params Float32 out array [COMPSIZE(pname)] + category ARB_sampler_objects + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #82 +# ARB_shader_bit_encoding commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +############################################################################### +# +# ARB Extension #83 +# ARB_texture_rgb10_a2ui commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +############################################################################### +# +# ARB Extension #84 +# ARB_texture_swizzle commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +############################################################################### +# +# ARB Extension #85 +# ARB_timer_query commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +QueryCounter(id, target) + return void + param id UInt32 in value + param target GLenum in value + category ARB_timer_query + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +GetQueryObjecti64v(id, pname, params) + return void + param id UInt32 in value + param pname GLenum in value + param params Int64 out array [COMPSIZE(pname)] + category ARB_timer_query + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +GetQueryObjectui64v(id, pname, params) + return void + param id UInt32 in value + param pname GLenum in value + param params UInt64 out array [COMPSIZE(pname)] + category ARB_timer_query + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #86 +# ARB_vertex_type_2_10_10_10_rev commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +VertexP2ui(type, value) + return void + param type GLenum in value + param value UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexP2uiv(type, value) + return void + param type GLenum in value + param value UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexP3ui(type, value) + return void + param type GLenum in value + param value UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexP3uiv(type, value) + return void + param type GLenum in value + param value UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexP4ui(type, value) + return void + param type GLenum in value + param value UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexP4uiv(type, value) + return void + param type GLenum in value + param value UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexCoordP1ui(type, coords) + return void + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexCoordP1uiv(type, coords) + return void + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexCoordP2ui(type, coords) + return void + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexCoordP2uiv(type, coords) + return void + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexCoordP3ui(type, coords) + return void + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexCoordP3uiv(type, coords) + return void + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexCoordP4ui(type, coords) + return void + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexCoordP4uiv(type, coords) + return void + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiTexCoordP1ui(texture, type, coords) + return void + param texture GLenum in value + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiTexCoordP1uiv(texture, type, coords) + return void + param texture GLenum in value + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiTexCoordP2ui(texture, type, coords) + return void + param texture GLenum in value + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiTexCoordP2uiv(texture, type, coords) + return void + param texture GLenum in value + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiTexCoordP3ui(texture, type, coords) + return void + param texture GLenum in value + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiTexCoordP3uiv(texture, type, coords) + return void + param texture GLenum in value + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiTexCoordP4ui(texture, type, coords) + return void + param texture GLenum in value + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiTexCoordP4uiv(texture, type, coords) + return void + param texture GLenum in value + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +NormalP3ui(type, coords) + return void + param type GLenum in value + param coords UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +NormalP3uiv(type, coords) + return void + param type GLenum in value + param coords UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ColorP3ui(type, color) + return void + param type GLenum in value + param color UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ColorP3uiv(type, color) + return void + param type GLenum in value + param color UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ColorP4ui(type, color) + return void + param type GLenum in value + param color UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ColorP4uiv(type, color) + return void + param type GLenum in value + param color UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +SecondaryColorP3ui(type, color) + return void + param type GLenum in value + param color UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +SecondaryColorP3uiv(type, color) + return void + param type GLenum in value + param color UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexAttribP1ui(index, type, normalized, value) + return void + param index UInt32 in value + param type GLenum in value + param normalized Boolean in value + param value UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexAttribP1uiv(index, type, normalized, value) + return void + param index UInt32 in value + param type GLenum in value + param normalized Boolean in value + param value UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexAttribP2ui(index, type, normalized, value) + return void + param index UInt32 in value + param type GLenum in value + param normalized Boolean in value + param value UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexAttribP2uiv(index, type, normalized, value) + return void + param index UInt32 in value + param type GLenum in value + param normalized Boolean in value + param value UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexAttribP3ui(index, type, normalized, value) + return void + param index UInt32 in value + param type GLenum in value + param normalized Boolean in value + param value UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexAttribP3uiv(index, type, normalized, value) + return void + param index UInt32 in value + param type GLenum in value + param normalized Boolean in value + param value UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexAttribP4ui(index, type, normalized, value) + return void + param index UInt32 in value + param type GLenum in value + param normalized Boolean in value + param value UInt32 in value + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +VertexAttribP4uiv(index, type, normalized, value) + return void + param index UInt32 in value + param type GLenum in value + param normalized Boolean in value + param value UInt32 in array [1] + category ARB_vertex_type_2_10_10_10_rev + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #87 +# ARB_draw_indirect commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +DrawArraysIndirect(mode, indirect) + return void + param mode GLenum in value + param indirect Void in array [] + category ARB_draw_indirect + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +DrawElementsIndirect(mode, type, indirect) + return void + param mode GLenum in value + param type GLenum in value + param indirect Void in array [] + category ARB_draw_indirect + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #88 +# ARB_gpu_shader5 commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +############################################################################### +# +# ARB Extension #89 +# ARB_gpu_shader_fp64 commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +Uniform1d(location, x) + return void + param location Int32 in value + param x Float64 in value + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +Uniform2d(location, x, y) + return void + param location Int32 in value + param x Float64 in value + param y Float64 in value + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +Uniform3d(location, x, y, z) + return void + param location Int32 in value + param x Float64 in value + param y Float64 in value + param z Float64 in value + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +Uniform4d(location, x, y, z, w) + return void + param location Int32 in value + param x Float64 in value + param y Float64 in value + param z Float64 in value + param w Float64 in value + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +Uniform1dv(location, count, value) + return void + param location Int32 in value + param count SizeI in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +Uniform2dv(location, count, value) + return void + param location Int32 in value + param count SizeI in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +Uniform3dv(location, count, value) + return void + param location Int32 in value + param count SizeI in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +Uniform4dv(location, count, value) + return void + param location Int32 in value + param count SizeI in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix2dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix3dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix4dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix2x3dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix2x4dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix3x2dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix3x4dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix4x2dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformMatrix4x3dv(location, count, transpose, value) + return void + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +GetUniformdv(program, location, params) + return void + param program UInt32 in value + param location Int32 in value + param params Float64 out array [location] + category ARB_gpu_shader_fp64 + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +ProgramUniform1dEXT(program, location, x) + return void + param program UInt32 in value + param location Int32 in value + param x Float64 in value + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniform2dEXT(program, location, x, y) + return void + param program UInt32 in value + param location Int32 in value + param x Float64 in value + param y Float64 in value + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniform3dEXT(program, location, x, y, z) + return void + param program UInt32 in value + param location Int32 in value + param x Float64 in value + param y Float64 in value + param z Float64 in value + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniform4dEXT(program, location, x, y, z, w) + return void + param program UInt32 in value + param location Int32 in value + param x Float64 in value + param y Float64 in value + param z Float64 in value + param w Float64 in value + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniform1dvEXT(program, location, count, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniform2dvEXT(program, location, count, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniform3dvEXT(program, location, count, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniform4dvEXT(program, location, count, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix2dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix3dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix4dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix2x3dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix2x4dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix3x2dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix3x4dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix4x2dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformMatrix4x3dvEXT(program, location, count, transpose, value) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param transpose Boolean in value + param value Float64 in array [count] + category ARB_gpu_shader_fp64 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #90 +# ARB_shader_subroutine commands +# +############################################################################### + +# ??? VERIFY DONE ??? + +GetSubroutineUniformLocation(program, shadertype, name) + return Int32 + param program UInt32 in value + param shadertype GLenum in value + param name Char in array [] + category ARB_shader_subroutine + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? + +GetSubroutineIndex(program, shadertype, name) + return UInt32 + param program UInt32 in value + param shadertype GLenum in value + param name Char in array [] + category ARB_shader_subroutine + dlflags notlistable version 1.2 extension - glxropcode ? + glxsingle ? glxflags ignore offset ? -IsSync(sync) - return Boolean - param sync sync in value - category ARB_sync +GetActiveSubroutineUniformiv(program, shadertype, index, pname, values) + return void + param program UInt32 in value + param shadertype GLenum in value + param index UInt32 in value + param pname GLenum in value + param values Int32 out array [COMPSIZE(pname)] + category ARB_shader_subroutine + dlflags notlistable version 1.2 extension - glxropcode ? + glxsingle ? glxflags ignore offset ? -DeleteSync(sync) +GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name) return void - param sync sync in value - category ARB_sync + param program UInt32 in value + param shadertype GLenum in value + param index UInt32 in value + param bufsize SizeI in value + param length SizeI out array [1] + param name Char out array [bufsize] + category ARB_shader_subroutine + dlflags notlistable version 1.2 extension - glxropcode ? + glxsingle ? glxflags ignore offset ? -ClientWaitSync(sync, flags, timeout) - return GLenum - param sync sync in value - param flags GLbitfield in value - param timeout UInt64 in value - category ARB_sync +GetActiveSubroutineName(program, shadertype, index, bufsize, length, name) + return void + param program UInt32 in value + param shadertype GLenum in value + param index UInt32 in value + param bufsize SizeI in value + param length SizeI out array [1] + param name Char out array [bufsize] + category ARB_shader_subroutine + dlflags notlistable version 1.2 extension - glxropcode ? + glxsingle ? glxflags ignore offset ? -WaitSync(sync, flags, timeout) +UniformSubroutinesuiv(shadertype, count, indices) return void - param sync sync in value - param flags GLbitfield in value - param timeout UInt64 in value - category ARB_sync + param shadertype GLenum in value + param count SizeI in value + param indices UInt32 in array [count] + category ARB_shader_subroutine version 1.2 extension glxropcode ? glxflags ignore offset ? -GetInteger64v(pname, params) +GetUniformSubroutineuiv(shadertype, location, params) return void - param pname GLenum in value - param params Int64 out array [COMPSIZE(pname)] - category ARB_sync + param shadertype GLenum in value + param location Int32 in value + param params UInt32 out array [1] + category ARB_shader_subroutine dlflags notlistable version 1.2 extension @@ -11349,14 +13036,13 @@ GetInteger64v(pname, params) glxflags ignore offset ? -GetSynciv(sync, pname, bufSize, length, values) +GetProgramStageiv(program, shadertype, pname, values) return void - param sync sync in value + param program UInt32 in value + param shadertype GLenum in value param pname GLenum in value - param bufSize SizeI in value - param length SizeI out array [1] - param values Int32 out array [length] - category ARB_sync + param values Int32 out array [1] + category ARB_shader_subroutine dlflags notlistable version 1.2 extension @@ -11366,60 +13052,29 @@ GetSynciv(sync, pname, bufSize, length, values) ############################################################################### # -# ARB Extension #67 -# ARB_texture_multisample commands +# ARB Extension #91 +# ARB_tessellation_shader commands # ############################################################################### -TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations) - return void - param target GLenum in value - param samples SizeI in value - param internalformat Int32 in value - param width SizeI in value - param height SizeI in value - param fixedsamplelocations Boolean in value - category ARB_texture_multisample - version 1.2 - extension - glxropcode ? - glxflags ignore - offset ? +# ??? VERIFY DONE ??? -TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations) +PatchParameteri(pname, value) return void - param target GLenum in value - param samples SizeI in value - param internalformat Int32 in value - param width SizeI in value - param height SizeI in value - param depth SizeI in value - param fixedsamplelocations Boolean in value - category ARB_texture_multisample + param pname GLenum in value + param value Int32 in value + category ARB_tessellation_shader version 1.2 extension glxropcode ? glxflags ignore offset ? -GetMultisamplefv(pname, index, val) +PatchParameterfv(pname, values) return void param pname GLenum in value - param index UInt32 in value - param val Float32 out array [COMPSIZE(pname)] - category ARB_texture_multisample - dlflags notlistable - version 1.2 - extension - glxsingle ? - glxflags ignore - offset ? - -SampleMaski(index, mask) - return void - param index UInt32 in value - param mask GLbitfield in value - category ARB_texture_multisample + param values Float32 in array [COMPSIZE(pname)] + category ARB_tessellation_shader version 1.2 extension glxropcode ? @@ -11428,81 +13083,88 @@ SampleMaski(index, mask) ############################################################################### # -# ARB Extension #68 -# ARB_vertex_array_bgra commands +# ARB Extension #92 +# ARB_texture_buffer_object_rgb32 commands # ############################################################################### -# (none) -newcategory: ARB_vertex_array_bgra +# ??? VERIFY DONE ??? ############################################################################### # -# ARB Extension #69 -# ARB_draw_buffers_blend commands +# ARB Extension #93 +# ARB_transform_feedback2 commands # ############################################################################### -BlendEquationi(buf, mode) +# ??? VERIFY DONE ??? + +BindTransformFeedback(target, id) return void - param buf UInt32 in value - param mode GLenum in value - category ARB_draw_buffers_blend + param target GLenum in value + param id UInt32 in value + category ARB_transform_feedback2 version 1.2 extension glxropcode ? glxflags ignore offset ? -BlendEquationSeparatei(buf, modeRGB, modeAlpha) +DeleteTransformFeedbacks(n, ids) return void - param buf UInt32 in value - param modeRGB GLenum in value - param modeAlpha GLenum in value - category ARB_draw_buffers_blend + param n SizeI in value + param ids UInt32 in array [n] + category ARB_transform_feedback2 version 1.2 extension glxropcode ? glxflags ignore offset ? -BlendFunci(buf, src, dst) +GenTransformFeedbacks(n, ids) return void - param buf UInt32 in value - param src GLenum in value - param dst GLenum in value - category ARB_draw_buffers_blend + param n SizeI in value + param ids UInt32 out array [n] + category ARB_transform_feedback2 version 1.2 extension glxropcode ? glxflags ignore offset ? -BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha) +IsTransformFeedback(id) + return Boolean + param id UInt32 in value + category ARB_transform_feedback2 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +PauseTransformFeedback() return void - param buf UInt32 in value - param srcRGB GLenum in value - param dstRGB GLenum in value - param srcAlpha GLenum in value - param dstAlpha GLenum in value - category ARB_draw_buffers_blend + category ARB_transform_feedback2 version 1.2 extension glxropcode ? glxflags ignore offset ? -############################################################################### -# -# ARB Extension #70 -# ARB_sample_shading commands -# -############################################################################### +ResumeTransformFeedback() + return void + category ARB_transform_feedback2 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? -MinSampleShading(value) +DrawTransformFeedback(mode, id) return void - param value ClampedColorF in value - category ARB_sample_shading + param mode GLenum in value + param id UInt32 in value + category ARB_transform_feedback2 version 1.2 extension glxropcode ? @@ -11511,40 +13173,61 @@ MinSampleShading(value) ############################################################################### # -# ARB Extension #71 -# ARB_texture_cube_map_array commands +# ARB Extension #94 +# ARB_transform_feedback3 commands # ############################################################################### -# (none) -newcategory: ARB_texture_cube_map_array - -############################################################################### -# -# ARB Extension #72 -# ARB_texture_gather commands -# -############################################################################### +# ??? VERIFY DONE ??? -# (none) -newcategory: ARB_texture_gather +DrawTransformFeedbackStream(mode, id, stream) + return void + param mode GLenum in value + param id UInt32 in value + param stream UInt32 in value + category ARB_transform_feedback3 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? -############################################################################### -# -# ARB Extension #73 -# ARB_texture_query_lod commands -# -############################################################################### +BeginQueryIndexed(target, index, id) + return void + param target GLenum in value + param index UInt32 in value + param id UInt32 in value + category ARB_transform_feedback3 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? -# (none) -newcategory: ARB_texture_query_lod +EndQueryIndexed(target, index) + return void + param target GLenum in value + param index UInt32 in value + category ARB_transform_feedback3 + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? -############################################################################### -# -# ARB Extension #74 - WGL_ARB_create_context_profile -# ARB Extension #75 - GLX_ARB_create_context_profile -# -############################################################################### +GetQueryIndexediv(target, index, pname, params) + return void + param target GLenum in value + param index UInt32 in value + param pname GLenum in value + param params Int32 out array [COMPSIZE(pname)] + category ARB_transform_feedback3 + dlflags notlistable + version 1.2 + extension + glxsingle ? + glxflags ignore + offset ? ############################################################################### @@ -21050,6 +22733,9 @@ newcategory: NV_vertex_program3 # ############################################################################### +# (none) +# newcategory: EXT_texture_compression_dxt1 + ############################################################################### # # Extension #310 @@ -26545,7 +28231,7 @@ IsBufferResidentNV(target) glxflags ignore offset ? -NamedMakeBufferResidentNV(buffer, access) +MakeNamedBufferResidentNV(buffer, access) return void param buffer UInt32 in value param access GLenum in value @@ -26556,7 +28242,7 @@ NamedMakeBufferResidentNV(buffer, access) glxflags ignore offset ? -NamedMakeBufferNonResidentNV(buffer) +MakeNamedBufferNonResidentNV(buffer) return void param buffer UInt32 in value category NV_shader_buffer_load @@ -26842,3 +28528,36 @@ TextureBarrierNV() glxflags ignore offset ? +############################################################################### +# +# Extension #382 +# AMD_shader_stencil_export commands +# +############################################################################### + +newcategory: AMD_shader_stencil_export + +############################################################################### +# +# Extension #383 +# AMD_seamless_cubemap_per_texture commands +# +############################################################################### + +newcategory: AMD_seamless_cubemap_per_texture + +############################################################################### +# +# Extension #384 - GLX_INTEL_swap_event +# +############################################################################### + +############################################################################### +# +# Extension #385 +# AMD_conservative_depth commands +# +############################################################################### + +newcategory: AMD_conservative_depth + diff --git a/src/glx/apple/specs/gl.tm b/src/glx/apple/specs/gl.tm index 8c8a851d9f..fb4f8515cd 100644 --- a/src/glx/apple/specs/gl.tm +++ b/src/glx/apple/specs/gl.tm @@ -284,10 +284,15 @@ Half16NV,*,*, GLhalfNV,*,* PixelDataRangeTargetNV,*,*, GLenum,*,* # Generic types for as-yet-unspecified enums TypeEnum,*,*, GLenum,*,* +GLbitfield,*,*, GLbitfield,*,* GLenum,*,*, GLenum,*,* +Int64,*,*, GLint64,*,* +UInt64,*,*, GLuint64,*,* +# Object handle & data pointers handleARB,*,*, GLhandleARB,*,* charARB,*,*, GLcharARB,*,* charPointerARB,*,*, GLcharARB*,*,* +sync,*,*, GLsync,*,*, # EXT_timer_query Int64EXT,*,*, GLint64EXT,*,* UInt64EXT,*,*, GLuint64EXT,*,* diff --git a/src/glx/apple/specs/glx.spec b/src/glx/apple/specs/glx.spec index b7ff63bb8e..b8b8df296c 100644 --- a/src/glx/apple/specs/glx.spec +++ b/src/glx/apple/specs/glx.spec @@ -1,7 +1,10 @@ -# Copyright (C) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2006-2010 The Khronos Group, Inc. # # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . +# +# $Revision: 10796 $ on $Date: 2010-03-19 17:31:10 -0700 (Fri, 19 Mar 2010) $ required-props: param: retval retained diff --git a/src/glx/apple/specs/glxenum.spec b/src/glx/apple/specs/glxenum.spec index fb25ddf9da..547f19e1c2 100644 --- a/src/glx/apple/specs/glxenum.spec +++ b/src/glx/apple/specs/glxenum.spec @@ -1,7 +1,10 @@ -# Copyright (C) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2006-2010 The Khronos Group, Inc. # # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . +# +# $Revision: 10796 $ on $Date: 2010-03-19 17:31:10 -0700 (Fri, 19 Mar 2010) $ # This is the GLX enumerant registry. # @@ -84,7 +87,7 @@ GLXSyncType enum: GLXEventMask enum: PBUFFER_CLOBBER_MASK = 0x08000000 # SelectEvent mask BUFFER_CLOBBER_MASK_SGIX = 0x08000000 # SelectEventSGIX mask -# INTEL_future_use = 0x04000000 # SelectEvent mask (for GLX_INTEL_swap_event) + BUFFER_SWAP_COMPLETE_INTEL_MASK = 0x04000000 # SelectEvent mask (for GLX_INTEL_swap_event) GLXPbufferClobberMask enum: FRONT_LEFT_BUFFER_BIT = 0x00000001 # PbufferClobberEvent mask @@ -390,9 +393,12 @@ SUN_future_use: 0x8170-0x817F # INTEL: 0x8180 - 0x818F -# INTEL_swap_event: 0x8180-??? (in process, see Khronos bug 5752) +# INTEL_swap_event: 0x8180-0x8182 +# EXCHANGE_COMPLETE_INTEL = 0x8180 +# COPY_COMPLETE_INTEL = 0x8181 +# FLIP_COMPLETE_INTEL = 0x8182 -INTEL_future_use: 0x8180-0x818F +INTEL_future_use: 0x8183-0x818F ############################################################################### ### Please remember that new GLX enum allocations must be obtained by request diff --git a/src/glx/apple/specs/glxenumext.spec b/src/glx/apple/specs/glxenumext.spec index 762a19abef..797e6970dd 100644 --- a/src/glx/apple/specs/glxenumext.spec +++ b/src/glx/apple/specs/glxenumext.spec @@ -1,7 +1,10 @@ -# Copyright (C) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2006-2010 The Khronos Group, Inc. # # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . +# +# $Revision: 10796 $ on $Date: 2010-03-19 17:31:10 -0700 (Fri, 19 Mar 2010) $ # List of GLX enumerants for glxext.h header # @@ -22,9 +25,9 @@ passthru: passthru: /* Header file version number, required by OpenGL ABI for Linux */ -passthru: /* glxext.h last updated 2009/10/08 */ +passthru: /* glxext.h last updated 2010/02/10 */ passthru: /* Current version at http://www.opengl.org/registry/ */ -passthru: #define GLX_GLXEXT_VERSION 25 +passthru: #define GLX_GLXEXT_VERSION 27 ############################################################################### # @@ -501,3 +504,12 @@ EXT_swap_control enum: # No new tokens # Extension #376 NV_copy_image enum: + +############################################################################### + +# Extension #384 +INTEL_swap_event enum: + BUFFER_SWAP_COMPLETE_INTEL_MASK = 0x04000000 + EXCHANGE_COMPLETE_INTEL = 0x8180 + COPY_COMPLETE_INTEL = 0x8181 + FLIP_COMPLETE_INTEL = 0x8182 diff --git a/src/glx/apple/specs/glxext.spec b/src/glx/apple/specs/glxext.spec index c953adbb1b..c25b7e6b38 100644 --- a/src/glx/apple/specs/glxext.spec +++ b/src/glx/apple/specs/glxext.spec @@ -1,10 +1,13 @@ # glxext.spec file # DON'T REMOVE PREVIOUS LINE!!! libspec depends on it! # -# Copyright (C) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 1991-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2006-2010 The Khronos Group, Inc. # # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . +# +# $Revision: 10796 $ on $Date: 2010-03-19 17:31:10 -0700 (Fri, 19 Mar 2010) $ required-props: param: retval retained @@ -1289,7 +1292,7 @@ SwapIntervalEXT(dpy, drawable, interval) ############################################################################### # # Extension #376 -# GLX_NV_copy_image commands +# NV_copy_image commands # ############################################################################### @@ -1316,3 +1319,12 @@ CopyImageSubDataNV(dpy, srcCtx, srcName, srcTarget, srcLevel, srcX, srcY, srcZ, category NV_copy_image glxflags client-handcode server-handcode +############################################################################### +# +# Extension #384 +# INTEL_swap_event commands +# +############################################################################### + +# (none) +newcategory: INTEL_swap_event diff --git a/src/glx/apple/specs/update.sh b/src/glx/apple/specs/update.sh new file mode 100755 index 0000000000..f8c3158a53 --- /dev/null +++ b/src/glx/apple/specs/update.sh @@ -0,0 +1,4 @@ +for f in enum.spec enumext.spec gl.spec gl.tm glx.spec glxenum.spec glxenumext.spec glxext.spec ; do + curl -LO http://www.opengl.org/registry/api/$f +done + -- cgit v1.2.3