diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-10-11 22:37:14 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-10-11 22:37:14 +0000 |
| commit | f3f51bc844c8749250724d164722402cb9a07dc7 (patch) | |
| tree | 68ccc40931c2d10f7a521d531609aeeb5b1637f9 /configs | |
| parent | 8a5871a98c23ce1a1d893b681f59dc8c42228dd1 (diff) | |
| download | external_mesa3d-f3f51bc844c8749250724d164722402cb9a07dc7.zip external_mesa3d-f3f51bc844c8749250724d164722402cb9a07dc7.tar.gz external_mesa3d-f3f51bc844c8749250724d164722402cb9a07dc7.tar.bz2 | |
Fix bug #4681.
glDeleteTextures and glDeleteTexturesEXT were erroneously listed as
aliases of each other. For anything /except/ GLX protocol they are
aliases. This set of changes allows functions that are functionally
identical but have different GLX protocol to be listed as aliases.
When building with GLX_INDIRECT_RENDERING set, different static
functions are used. These functions determine whether the current
context is direct rendering or not. If the context is direct
rendering, the aliased function (e.g., glDeleteTextures in the case of
glDeleteTexturesEXT) is called. If the context is not direct
rendering, the correct GLX protocol is sent.
For a deeper explanation of what is changed, please see:
http://dri.freedesktop.org/wiki/PartiallyAliasedFunctions
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/freebsd-dri | 3 | ||||
| -rw-r--r-- | configs/linux-dri | 3 | ||||
| -rw-r--r-- | configs/linux-indirect | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 2ee2112..68877c6 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -14,7 +14,8 @@ OPT_FLAGS = -O EXPAT_INCLUDES = -I/usr/local/include X11_INCLUDES = -I/usr/X11R6/include DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ - -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \ $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES) diff --git a/configs/linux-dri b/configs/linux-dri index 1c3b404..8504297 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -22,7 +22,8 @@ ARCH_FLAGS ?= DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ -D_BSD_SOURCE -D_GNU_SOURCE \ -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ - -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN X11_INCLUDES = -I/usr/X11R6/include diff --git a/configs/linux-indirect b/configs/linux-indirect index b764515..bd33345 100644 --- a/configs/linux-indirect +++ b/configs/linux-indirect @@ -23,6 +23,7 @@ ARCH_FLAGS ?= DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ -D_BSD_SOURCE -D_GNU_SOURCE \ + -DGLX_INDIRECT_RENDERING \ -DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN X11_INCLUDES = -I/usr/X11R6/include |