[Xquartz-changes] [392] AppleSGLX/trunk

[source_changes at macosforge.org]

Revision: 392
          http://trac.macosforge.org/projects/xquartz/changeset/392
Author:   jeremyhu at freedesktop.org
Date:     2009-12-24 17:17:16 -0800 (Thu, 24 Dec 2009)
Log Message:
-----------
Correct bad prototypes.

Modified Paths:
--------------
    AppleSGLX/trunk/gen_api_library.tcl
    AppleSGLX/trunk/gen_funcs.tcl

Modified: AppleSGLX/trunk/gen_api_library.tcl
===================================================================
--- AppleSGLX/trunk/gen_api_library.tcl	2009-12-24 01:48:39 UTC (rev 391)
+++ AppleSGLX/trunk/gen_api_library.tcl	2009-12-25 01:17:16 UTC (rev 392)
@@ -113,6 +113,8 @@
     puts $fd $::license
 
     puts $fd {
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
 #include <dlfcn.h>
 #include "glxclient.h"
 #include "apple_xgl_api.h"
@@ -177,7 +179,7 @@
 	    set body "[set return]__gl_api.[set f]([set callvars]);"
 	}
 
-        puts $fd "[dict get $attr return] gl[set f]([set pstr]) \{\n\t$body\n\}"
+        puts $fd "GLAPI [dict get $attr return] APIENTRY gl[set f]([set pstr]) \{\n\t$body\n\}"
     }
 
     puts $fd $::init_code

Modified: AppleSGLX/trunk/gen_funcs.tcl
===================================================================
--- AppleSGLX/trunk/gen_funcs.tcl	2009-12-24 01:48:39 UTC (rev 391)
+++ AppleSGLX/trunk/gen_funcs.tcl	2009-12-25 01:17:16 UTC (rev 392)
@@ -199,7 +199,6 @@
     MinmaxTarget GLenum
     GetMinmaxParameterPName GLenum
     TextureTarget GLenum
-    TextureComponentCount GLenum
     TextureUnit GLenum
     CompressedTextureARB "void"
     BlendFuncSeparateParameterEXT GLenum
@@ -226,6 +225,7 @@
     ClampColorTargetARB unknown3.0
     ClampColorModeARB unknown3.0
     VertexAttribEnum GLenum
+    VertexAttribEnumNV GLenum
     DrawBufferName unknown3.0
     WeightPointerTypeARB GLenum
     ProgramTargetARB GLenum
@@ -245,8 +245,39 @@
     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
 }
 
 proc psplit s {
@@ -375,7 +406,7 @@
 	set ptype [lindex $p 1]
 	
 	if {![info exists typemap($ptype)]} {
-	    set missingTypes($ptype) $func
+	    set ::missingTypes($ptype) $func
 	    continue
 	}
 	
@@ -384,11 +415,9 @@
 	#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 || "MultiDrawArraysEXT" eq $func) 
-	    && ("first" eq $var)} {
+	if {("MultiDrawArrays" eq $func) && ("first" eq $var)} {
 	    set final_type "const $type *"
-	} elseif {("MultiDrawArrays" eq $func 
-		   || "MultiDrawArraysEXT" eq $func) && "count" eq $var} {
+	} elseif {("MultiDrawArrays" eq $func) && ("count" eq $var)} {
 	    set final_type "const $type *"
 	} elseif {"array" eq [lindex $p 3]} {
 	    if {"in" eq [lindex $p 2]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20091224/ebf9bba3/attachment.html>