summaryrefslogtreecommitdiffstats
path: root/src/glx/apple/gen_funcs.tcl
diff options
context:
space:
mode:
authorJeremy Huddleston <[email protected]>2010-01-02 00:03:53 -0500
committerJeremy Huddleston <[email protected]>2010-04-27 11:26:51 -0700
commitf5aa5377a52c50c94b6a6d6d48c0057dbe874692 (patch)
tree1a6376407eb458e855f9bdf2287ff94633486eb4 /src/glx/apple/gen_funcs.tcl
parentde96d063b1eba9137d96074c9434aafe858d3271 (diff)
apple: Use mesa gl.h rather than generating one.
Signed-off-by: Jeremy Huddleston <[email protected]>
Diffstat (limited to 'src/glx/apple/gen_funcs.tcl')
-rw-r--r--src/glx/apple/gen_funcs.tcl13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/glx/apple/gen_funcs.tcl b/src/glx/apple/gen_funcs.tcl
index ff314dc6a7d..e78eb3278cf 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 {