summaryrefslogtreecommitdiff
path: root/src/glx/apple/GL_aliases
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2010-01-02 00:03:53 -0500
committerJeremy Huddleston <jeremyhu@apple.com>2010-04-27 11:26:51 -0700
commitf5aa5377a52c50c94b6a6d6d48c0057dbe874692 (patch)
tree1a6376407eb458e855f9bdf2287ff94633486eb4 /src/glx/apple/GL_aliases
parentde96d063b1eba9137d96074c9434aafe858d3271 (diff)
apple: Use mesa gl.h rather than generating one.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Diffstat (limited to 'src/glx/apple/GL_aliases')
-rw-r--r--src/glx/apple/GL_aliases4
1 files changed, 3 insertions, 1 deletions
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