From 45bad298dd917e31e6bc61f58fc2ea8366333178 Mon Sep 17 00:00:00 2001 From: William Robinson Date: Sun, 21 Oct 2007 00:42:45 +0100 Subject: [PATCH] Fixes for some rare OpenGL function names. More verbosity when making exceptions to ending rules. --- generators/string-lispify.rb | 17 +++++++++++- lib/opengl-apple_flush_buffer_range.lisp | 2 +- lib/opengl-apple_vertex_array_range.lisp | 2 +- lib/opengl-arb_occlusion_query.lisp | 2 +- lib/opengl-arb_vertex_buffer_object.lisp | 2 +- lib/opengl-arb_vertex_program.lisp | 2 +- lib/opengl-ext_draw_buffers2.lisp | 4 +-- lib/opengl-ext_framebuffer_object.lisp | 4 +-- lib/opengl-nv_depth_buffer_float.lisp | 4 +-- lib/opengl-nv_fence.lisp | 2 +- lib/opengl-nv_parameter_buffer_object.lisp | 2 +- lib/opengl-nv_register_combiners2.lisp | 4 +-- lib/opengl-nv_vertex_program.lisp | 4 +-- lib/opengl-sgix_fragment_lighting.lisp | 2 +- lib/opengl-version_1_5.lisp | 4 +-- lib/opengl-version_2_0.lisp | 4 +-- lib/opengl.lisp | 44 +++++++++++++++--------------- 17 files changed, 60 insertions(+), 45 deletions(-) diff --git a/generators/string-lispify.rb b/generators/string-lispify.rb index 8aeca16..d2c4387 100644 --- a/generators/string-lispify.rb +++ b/generators/string-lispify.rb @@ -33,6 +33,7 @@ class Array collect do |e| [e,*e.sub(GL_SUFFIXES,'-\\1').split('-')] end.collect do |orig,e,vendor_suffix| + #puts("Expanding e #{e.inspect} to #{e.sub(/([0-9])?(u?(i|s|b)|h|f|d)v?$/,'-\\0')}") stem,arg_suffix=e.sub(/([0-9])?(u?(i|s|b)|h|f|d)v?$/,'-\\0').split('-') stems[stem]||={} if arg_suffix && arg_suffix!='' @@ -42,9 +43,23 @@ class Array #pp [orig,stem,arg_suffix||'',vendor_suffix] [orig,stem,arg_suffix||'',vendor_suffix] end + # re-join endings that do not share a stem with another function name split.collect do |orig,e,arg_suffix,vendor_suffix| - shared_stem=stems[e].keys.length > 1 + # also keep those ending in 'v', as these are never (probably) going to be at the end of words + # also keep 'i' as these are all integer suffices + # other special-case words + shared_stem=((stems[e].keys.length > 1) or arg_suffix.match(/v$/) or arg_suffix=='i' \ + or e.match(/Bounds$/) or e.match(/Depth$/)) + # special case, things ending in edv (ie. participle-v), reattach 'd' and remove from arg_suffix + if (e.match(/e$/) and arg_suffix.match(/^d.*v$/)) + e+='d' + arg_suffix=arg_suffix[1..-1] + puts "Fixing participle-v case: #{orig.inspect}, #{e.inspect} suffix: #{arg_suffix.inspect}" + end e_split=(shared_stem ? e : e+arg_suffix).gsub(/([a-z])([A-Z0-9])/,'\\1-\\2').split('-') + if arg_suffix!='' and not shared_stem + puts "Re-attaching arg_suffix for #{orig.inspect}, #{e.inspect}+#{arg_suffix.inspect}" + end [orig,*e_split].concat([shared_stem ? arg_suffix : '',vendor_suffix]) end end diff --git a/lib/opengl-apple_flush_buffer_range.lisp b/lib/opengl-apple_flush_buffer_range.lisp index 898cf92..476f9bf 100644 --- a/lib/opengl-apple_flush_buffer_range.lisp +++ b/lib/opengl-apple_flush_buffer_range.lisp @@ -14,7 +14,7 @@ :extension nil :glxropcode ("?") :glxflags ("ignore") :glsopcode ("?") :offset ("?"))) (defglextfun - (("BufferParameteriAPPLE" buffer-parameteri-apple) :args + (("BufferParameteriAPPLE" buffer-parameter-i-apple) :args ((:name |target| :type |GLenum| :direction :in) (:name |pname| :type |GLenum| :direction :in) (:name |param| :type |Int32| :direction :in)) diff --git a/lib/opengl-apple_vertex_array_range.lisp b/lib/opengl-apple_vertex_array_range.lisp index 3a12e8b..b12c7be 100644 --- a/lib/opengl-apple_vertex_array_range.lisp +++ b/lib/opengl-apple_vertex_array_range.lisp @@ -10,7 +10,7 @@ (defconstant +storage-cached-apple+ #x85BE) (defconstant +storage-shared-apple+ #x85BF) (defglextfun - (("VertexArrayParameteriAPPLE" vertex-array-parameteri-apple) :args + (("VertexArrayParameteriAPPLE" vertex-array-parameter-i-apple) :args ((:name |pname| :type |VertexArrayPNameAPPLE| :direction :in) (:name |param| :type |Int32| :direction :in)) :return ("void") :category ("APPLE_vertex_array_range") :version ("1.2") diff --git a/lib/opengl-arb_occlusion_query.lisp b/lib/opengl-arb_occlusion_query.lisp index 39573be..52ba8a1 100644 --- a/lib/opengl-arb_occlusion_query.lisp +++ b/lib/opengl-arb_occlusion_query.lisp @@ -25,7 +25,7 @@ :version ("1.5") :extension nil :alias ("GetQueryObjectiv") :glsalias ("GetQueryObjectiv"))) (defglextfun - (("GetQueryivARB" get-queryiv-arb) :args + (("GetQueryivARB" get-query-iv-arb) :args ((:name |target| :type |GLenum| :direction :in) (:name |pname| :type |GLenum| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size pname)) diff --git a/lib/opengl-arb_vertex_buffer_object.lisp b/lib/opengl-arb_vertex_buffer_object.lisp index 47612f7..29222bc 100644 --- a/lib/opengl-arb_vertex_buffer_object.lisp +++ b/lib/opengl-arb_vertex_buffer_object.lisp @@ -43,7 +43,7 @@ ("notlistable") :version ("1.2") :extension nil :alias ("GetBufferPointerv") :glsalias ("GetBufferPointerv"))) (defglextfun - (("GetBufferParameterivARB" get-buffer-parameteriv-arb) :args + (("GetBufferParameterivARB" get-buffer-parameter-iv-arb) :args ((:name |target| :type |BufferTargetARB| :direction :in) (:name |pname| :type |BufferPNameARB| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size (|pname|))) diff --git a/lib/opengl-arb_vertex_program.lisp b/lib/opengl-arb_vertex_program.lisp index cb0579f..51a96db 100644 --- a/lib/opengl-arb_vertex_program.lisp +++ b/lib/opengl-arb_vertex_program.lisp @@ -134,7 +134,7 @@ :version ("1.3") :extension ("soft" "WINSOFT" "NV10") :glsflags ("ignore") :glxflags ("ignore") :offset ("681"))) (defglextfun - (("GetProgramivARB" get-programiv-arb) :args + (("GetProgramivARB" get-program-iv-arb) :args ((:name |target| :type |ProgramTargetARB| :direction :in) (:name |pname| :type |ProgramPropertyARB| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size #x1)) diff --git a/lib/opengl-ext_draw_buffers2.lisp b/lib/opengl-ext_draw_buffers2.lisp index 7d20926..c8f2194 100644 --- a/lib/opengl-ext_draw_buffers2.lisp +++ b/lib/opengl-ext_draw_buffers2.lisp @@ -25,7 +25,7 @@ ("ignore") :glfflags ("ignore") :glsflags ("ignore") :extension ("soft" "WINSOFT"))) (defglextfun - (("GetIntegerIndexedvEXT" get-integer-indexedv-ext) :args + (("GetIntegerIndexedvEXT" get-integer-indexed-v-ext) :args ((:name |target| :type |GLenum| :direction :in) (:name |index| :type |UInt32| :direction :in) (:name |data| :type |Int32| :direction :out :array t :size (|target|))) @@ -33,7 +33,7 @@ ("notlistable") :glxflags ("ignore") :glfflags ("ignore") :glsflags ("ignore") :extension ("soft" "WINSOFT"))) (defglextfun - (("GetBooleanIndexedvEXT" get-boolean-indexedv-ext) :args + (("GetBooleanIndexedvEXT" get-boolean-indexed-v-ext) :args ((:name |target| :type |GLenum| :direction :in) (:name |index| :type |UInt32| :direction :in) (:name |data| :type |Boolean| :direction :out :array t :size (|target|))) diff --git a/lib/opengl-ext_framebuffer_object.lisp b/lib/opengl-ext_framebuffer_object.lisp index 74d57f3..9fdd679 100644 --- a/lib/opengl-ext_framebuffer_object.lisp +++ b/lib/opengl-ext_framebuffer_object.lisp @@ -61,7 +61,7 @@ ("4325") :glxflags ("ignore") :glsopcode ("?") :offset ("?"))) (defglextfun (("GetFramebufferAttachmentParameterivEXT" - get-framebuffer-attachment-parameteriv-ext) + get-framebuffer-attachment-parameter-iv-ext) :args ((:name |target| :type |FramebufferTarget| :direction :in) (:name |attachment| :type |FramebufferAttachment| :direction :in) @@ -143,7 +143,7 @@ :category ("EXT_framebuffer_object") :version ("1.2") :extension nil :glxvendorpriv ("1425") :glxflags ("ignore") :glsopcode ("?") :offset ("?"))) (defglextfun - (("GetRenderbufferParameterivEXT" get-renderbuffer-parameteriv-ext) :args + (("GetRenderbufferParameterivEXT" get-renderbuffer-parameter-iv-ext) :args ((:name |target| :type |RenderbufferTarget| :direction :in) (:name |pname| :type |GLenum| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size (|pname|))) diff --git a/lib/opengl-nv_depth_buffer_float.lisp b/lib/opengl-nv_depth_buffer_float.lisp index 63f3dd6..64cdb2e 100644 --- a/lib/opengl-nv_depth_buffer_float.lisp +++ b/lib/opengl-nv_depth_buffer_float.lisp @@ -8,14 +8,14 @@ (defconstant +float-32-unsigned-int-24-8-rev-nv+ #x8DAD) (defconstant +depth-buffer-float-mode-nv+ #x8DAF) (defglextfun - (("DepthBoundsdNV" depth-boundsd-nv) :args + (("DepthBoundsdNV" depth-bounds-d-nv) :args ((:name |zmin| :type |Float64| :direction :in) (:name |zmax| :type |Float64| :direction :in)) :return ("void") :category ("NV_depth_buffer_float") :extension ("soft" "WINSOFT" "NV50") :version ("2.0") :glfflags ("ignore") :glsflags ("ignore") :glxflags ("ignore"))) (defglextfun - (("ClearDepthdNV" clear-depthd-nv) :args + (("ClearDepthdNV" clear-depth-d-nv) :args ((:name |depth| :type |Float64| :direction :in)) :return ("void") :category ("NV_depth_buffer_float") :extension ("soft" "WINSOFT" "NV50") :version ("2.0") :glfflags ("ignore") :glsflags ("ignore") :glxflags ("ignore"))) diff --git a/lib/opengl-nv_fence.lisp b/lib/opengl-nv_fence.lisp index 1693f55..8e2bcbf 100644 --- a/lib/opengl-nv_fence.lisp +++ b/lib/opengl-nv_fence.lisp @@ -20,7 +20,7 @@ ("soft" "WINSOFT" "NV10") :glxvendorpriv ("1312") :glxflags ("ignore") :glsflags ("get") :glsopcode ("0x0219") :offset ("652"))) (defglextfun - (("GetFenceivNV" get-fenceiv-nv) :args + (("GetFenceivNV" get-fence-iv-nv) :args ((:name |fence| :type |FenceNV| :direction :in) (:name |pname| :type |FenceParameterNameNV| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size (|pname|))) diff --git a/lib/opengl-nv_parameter_buffer_object.lisp b/lib/opengl-nv_parameter_buffer_object.lisp index 2bca7fc..a4c41cc 100644 --- a/lib/opengl-nv_parameter_buffer_object.lisp +++ b/lib/opengl-nv_parameter_buffer_object.lisp @@ -29,7 +29,7 @@ :extension ("soft" "WINSOFT" "NV50") :glfflags ("ignore") :glsflags ("ignore") :glxflags ("ignore"))) (defglextfun - (("ProgramBufferParametersfvNV" program-buffer-parametersfv-nv) :args + (("ProgramBufferParametersfvNV" program-buffer-parameters-fv-nv) :args ((:name |target| :type |ProgramTarget| :direction :in) (:name |buffer| :type |UInt32| :direction :in) (:name |index| :type |UInt32| :direction :in) diff --git a/lib/opengl-nv_register_combiners2.lisp b/lib/opengl-nv_register_combiners2.lisp index 45c934e..8bb83be 100644 --- a/lib/opengl-nv_register_combiners2.lisp +++ b/lib/opengl-nv_register_combiners2.lisp @@ -5,7 +5,7 @@ (defconstant +per-stage-constants-nv+ #x8535) (defglextfun - (("GetCombinerStageParameterfvNV" get-combiner-stage-parameterfv-nv) :args + (("GetCombinerStageParameterfvNV" get-combiner-stage-parameter-fv-nv) :args ((:name |stage| :type |CombinerStageNV| :direction :in) (:name |pname| :type |CombinerParameterNV| :direction :in) (:name |params| :type |Float32| :direction :out :array t :size (|pname|))) @@ -13,7 +13,7 @@ ("NV_register_combiners2") :version ("1.1") :extension nil :glxflags ("ignore") :glsflags ("get") :glsopcode ("0x0226") :offset ("?"))) (defglextfun - (("CombinerStageParameterfvNV" combiner-stage-parameterfv-nv) :args + (("CombinerStageParameterfvNV" combiner-stage-parameter-fv-nv) :args ((:name |stage| :type |CombinerStageNV| :direction :in) (:name |pname| :type |CombinerParameterNV| :direction :in) (:name |params| :type |CheckedFloat32| :direction :in :array t :size diff --git a/lib/opengl-nv_vertex_program.lisp b/lib/opengl-nv_vertex_program.lisp index 6113f17..0b5fb1c 100644 --- a/lib/opengl-nv_vertex_program.lisp +++ b/lib/opengl-nv_vertex_program.lisp @@ -528,7 +528,7 @@ :glsflags ("client" "get") :glsopcode ("0x0232") :alias ("GetVertexAttribdv") :glsalias ("GetVertexAttribdv"))) (defglextfun - (("GetTrackMatrixivNV" get-track-matrixiv-nv) :args + (("GetTrackMatrixivNV" get-track-matrix-iv-nv) :args ((:name |target| :type |VertexAttribEnumNV| :direction :in) (:name |address| :type |UInt32| :direction :in) (:name |pname| :type |VertexAttribEnumNV| :direction :in) @@ -548,7 +548,7 @@ :glxvendorpriv ("1299") :glsflags ("get") :glsopcode ("0x0230") :offset ("586"))) (defglextfun - (("GetProgramivNV" get-programiv-nv) :args + (("GetProgramivNV" get-program-iv-nv) :args ((:name |id| :type |UInt32| :direction :in) (:name |pname| :type |VertexAttribEnumNV| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size #x4)) diff --git a/lib/opengl-sgix_fragment_lighting.lisp b/lib/opengl-sgix_fragment_lighting.lisp index bb4ebec..f23774e 100644 --- a/lib/opengl-sgix_fragment_lighting.lisp +++ b/lib/opengl-sgix_fragment_lighting.lisp @@ -6,7 +6,7 @@ (defconstant +current-raster-normal-sgix+ #x8406) (defconstant +current-raster-normal-sgix+ #x8406) (defglextfun - (("LightEnviSGIX" light-envi-sgix) :args + (("LightEnviSGIX" light-env-i-sgix) :args ((:name |pname| :type |LightEnvParameterSGIX| :direction :in) (:name |param| :type |CheckedInt32| :direction :in)) :return ("void") :category ("SGIX_fragment_lighting") :glxflags ("ignore") diff --git a/lib/opengl-version_1_5.lisp b/lib/opengl-version_1_5.lisp index 591e482..d368e3b 100644 --- a/lib/opengl-version_1_5.lisp +++ b/lib/opengl-version_1_5.lisp @@ -62,7 +62,7 @@ ("1.5") :extension nil :glxsingle ("?") :glxflags ("ignore") :glsflags ("get") :glsopcode ("?") :offset ("694"))) (defglfun - (("GetBufferParameteriv" get-buffer-parameteriv) :args + (("GetBufferParameteriv" get-buffer-parameter-iv) :args ((:name |target| :type |BufferTargetARB| :direction :in) (:name |pname| :type |BufferPNameARB| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size (|pname|))) @@ -144,7 +144,7 @@ ("1.5") :extension nil :glxsingle ("165") :glxflags ("ignore") :glsflags ("get") :glsopcode ("?") :offset ("706"))) (defglfun - (("GetQueryiv" get-queryiv) :args + (("GetQueryiv" get-query-iv) :args ((:name |target| :type |GLenum| :direction :in) (:name |pname| :type |GLenum| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size pname)) diff --git a/lib/opengl-version_2_0.lisp b/lib/opengl-version_2_0.lisp index 64ba36f..5a38c4e 100644 --- a/lib/opengl-version_2_0.lisp +++ b/lib/opengl-version_2_0.lisp @@ -620,7 +620,7 @@ ("2.0") :extension nil :glxsingle ("?") :glxflags ("ignore") :glsflags ("get") :glsopcode ("?") :offset ("?"))) (defglfun - (("GetShaderiv" get-shaderiv) :args + (("GetShaderiv" get-shader-iv) :args ((:name |shader| :type |UInt32| :direction :in) (:name |pname| :type |GLenum| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size pname)) @@ -637,7 +637,7 @@ ("2.0") :extension nil :glxsingle ("?") :glxflags ("ignore") :glsflags ("get") :glsopcode ("?") :offset ("?"))) (defglfun - (("GetProgramiv" get-programiv) :args + (("GetProgramiv" get-program-iv) :args ((:name |program| :type |UInt32| :direction :in) (:name |pname| :type |GLenum| :direction :in) (:name |params| :type |Int32| :direction :out :array t :size pname)) diff --git a/lib/opengl.lisp b/lib/opengl.lisp index 7b07115..64e68de 100644 --- a/lib/opengl.lisp +++ b/lib/opengl.lisp @@ -2120,7 +2120,7 @@ blend-func-separate +src1-alpha+ +src2-alpha+ get-buffer-pointerv -get-buffer-parameteriv +get-buffer-parameter-iv unmap-buffer map-buffer get-buffer-sub-data @@ -2132,7 +2132,7 @@ delete-buffers bind-buffer get-query-object-uiv get-query-object-iv -get-queryiv +get-query-iv end-query begin-query is-query @@ -2293,9 +2293,9 @@ get-uniform-fv get-uniform-location get-shader-source get-shader-info-log -get-shaderiv +get-shader-iv get-program-info-log -get-programiv +get-program-iv get-attrib-location get-attached-shaders get-active-uniform @@ -2447,8 +2447,8 @@ begin-transform-feedback-nv is-enabled-indexed-ext disable-indexed-ext enable-indexed-ext -get-integer-indexedv-ext -get-boolean-indexedv-ext +get-integer-indexed-v-ext +get-boolean-indexed-v-ext color-mask-indexed-ext +max-program-parameter-buffer-bindings-nv+ +max-program-parameter-buffer-size-nv+ @@ -2457,7 +2457,7 @@ color-mask-indexed-ext +fragment-program-parameter-buffer-nv+ program-buffer-parameters-i-uiv-nv program-buffer-parameters-i-iv-nv -program-buffer-parametersfv-nv +program-buffer-parameters-fv-nv +renderbuffer-coverage-samples-nv+ +renderbuffer-color-samples-nv+ +max-multisample-coverage-modes-nv+ @@ -2467,8 +2467,8 @@ renderbuffer-storage-multisample-coverage-nv +depth32f-stencil8-nv+ +float-32-unsigned-int-24-8-rev-nv+ +depth-buffer-float-mode-nv+ -depth-boundsd-nv -clear-depthd-nv +depth-bounds-d-nv +clear-depth-d-nv depth-ranged-nv +texture-buffer-ext+ +max-texture-buffer-size-ext+ @@ -2592,7 +2592,7 @@ program-local-parameter-i-4i-nv +buffer-serialized-modify-apple+ +buffer-flushing-unmap-apple+ flush-mapped-buffer-range-apple -buffer-parameteri-apple +buffer-parameter-i-apple program-local-parameters-4fv-ext program-env-parameters-4fv-ext +time-elapsed-ext+ @@ -2663,7 +2663,7 @@ string-marker-gremedy +renderbuffer-depth-size-ext+ +renderbuffer-stencil-size-ext+ generate-mipmap-ext -get-framebuffer-attachment-parameteriv-ext +get-framebuffer-attachment-parameter-iv-ext framebuffer-renderbuffer-ext framebuffer-texture-3d-ext framebuffer-texture-2d-ext @@ -2673,7 +2673,7 @@ gen-framebuffers-ext delete-framebuffers-ext bind-framebuffer-ext is-framebuffer-ext -get-renderbuffer-parameteriv-ext +get-renderbuffer-parameter-iv-ext renderbuffer-storage-ext gen-renderbuffers-ext delete-renderbuffers-ext @@ -2791,7 +2791,7 @@ draw-buffers-ati +vertex-array-range-pointer-apple+ +storage-cached-apple+ +storage-shared-apple+ -vertex-array-parameteri-apple +vertex-array-parameter-i-apple flush-vertex-array-range-apple vertex-array-range-apple +vertex-array-binding-apple+ @@ -3350,9 +3350,9 @@ get-vertex-attrib-pointerv-nv get-vertex-attrib-iv-nv get-vertex-attrib-fv-nv get-vertex-attrib-dv-nv -get-track-matrixiv-nv +get-track-matrix-iv-nv get-program-string-nv -get-programiv-nv +get-program-iv-nv get-program-parameter-fv-nv get-program-parameter-dv-nv gen-programs-nv @@ -3361,8 +3361,8 @@ delete-programs-nv bind-program-nv are-programs-resident-nv +per-stage-constants-nv+ -get-combiner-stage-parameterfv-nv -combiner-stage-parameterfv-nv +get-combiner-stage-parameter-fv-nv +combiner-stage-parameter-fv-nv +eval-2d-nv+ +eval-triangular-2d-nv+ +map-tessellation-nv+ @@ -3401,7 +3401,7 @@ map-control-points-nv +fence-condition-nv+ set-fence-nv finish-fence-nv -get-fenceiv-nv +get-fence-iv-nv test-fence-nv is-fence-nv gen-fences-nv @@ -3945,7 +3945,7 @@ delete-object-arb +samples-passed-arb+ get-query-object-uiv-arb get-query-object-iv-arb -get-queryiv-arb +get-query-iv-arb end-query-arb begin-query-arb is-query-arb @@ -3983,7 +3983,7 @@ gen-queries-arb +dynamic-read-arb+ +dynamic-copy-arb+ get-buffer-pointerv-arb -get-buffer-parameteriv-arb +get-buffer-parameter-iv-arb unmap-buffer-arb map-buffer-arb get-buffer-sub-data-arb @@ -4078,7 +4078,7 @@ get-vertex-attrib-iv-arb get-vertex-attrib-fv-arb get-vertex-attrib-dv-arb get-program-string-arb -get-programiv-arb +get-program-iv-arb get-program-local-parameter-fv-arb get-program-local-parameter-dv-arb get-program-env-parameter-fv-arb @@ -4315,7 +4315,7 @@ multi-tex-coord-1d-arb client-active-texture-arb active-texture-arb +current-raster-normal-sgix+ -light-envi-sgix +light-env-i-sgix get-fragment-material-iv-sgix get-fragment-material-fv-sgix get-fragment-light-iv-sgix -- 2.11.4.GIT