diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-28 07:21:25 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-28 07:21:25 -0600 |
| commit | 1fa7789e828d1005e2473fc7cd364bd45eb30843 (patch) | |
| tree | 5e3e1978e6cc511e90298622b7a04840a285782d /src/glx/apple/GL_aliases | |
| parent | 37e98e5cd217075d58456753ed8450dc116fe32c (diff) | |
| parent | eecd2a59c1205246cc220ab09a79988838bb1759 (diff) | |
Merge branch '7.8'
Conflicts:
src/glx/dri2_glx.c
src/glx/glx_pbuffer.c
Diffstat (limited to 'src/glx/apple/GL_aliases')
| -rw-r--r-- | src/glx/apple/GL_aliases | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/glx/apple/GL_aliases b/src/glx/apple/GL_aliases new file mode 100644 index 0000000000..8de22383a7 --- /dev/null +++ b/src/glx/apple/GL_aliases @@ -0,0 +1,10 @@ +#GL_EXT_texture_object +alias AreTexturesResidentEXT AreTexturesResident +alias BindTextureEXT BindTexture +alias DeleteTexturesEXT DeleteTextures +alias GenTexturesEXT GenTextures +alias IsTextureEXT IsTexture +alias PrioritizeTexturesEXT PrioritizeTextures + +# Due to type conflicts, we handle this differently +#alias TexImage3DEXT TexImage3D |