xorg-server: Changes to 'debian-unstable'
GL/Makefile.in | 1
GL/glx/Makefile.in | 1
GL/mesa/Makefile.in | 11
GL/mesa/X/Makefile.in | 20
GL/mesa/array_cache/Makefile.in | 1
GL/mesa/glapi/Makefile.in | 2
GL/mesa/main/Makefile.in | 14
GL/mesa/math/Makefile.in | 2
GL/mesa/shader/Makefile.in | 33
GL/mesa/shader/grammar/Makefile.in | 2
GL/mesa/shader/slang/Makefile.in | 64
GL/mesa/swrast/Makefile.in | 20
GL/mesa/swrast_setup/Makefile.in | 2
GL/mesa/tnl/Makefile.in | 47
GL/mesa/vbo/Makefile.in | 842 ++++++++
Makefile.in | 1
XTrap/Makefile.in | 1
Xext/Makefile.in | 1
Xi/Makefile.in | 1
aclocal.m4 | 500 +++--
afb/Makefile.in | 1
cfb/Makefile.in | 1
cfb32/Makefile.in | 1
composite/Makefile.in | 1
configure | 992 ++++++----
damageext/Makefile.in | 1
dbe/Makefile.in | 1
debian/changelog | 12
debian/control | 2
debian/patches/125_glx_remove-stray__GLinterface.diff | 32
debian/patches/126_glxproxy_remove-stray__GLinterface.diff | 11
debian/patches/127_mesa-6.5.3-compat.diff | 421 ++++
debian/patches/series | 3
debian/rules | 4
dix/Makefile.in | 1
doc/Makefile.in | 2
exa/Makefile.in | 1
fb/Makefile.in | 1
hw/Makefile.in | 1
hw/darwin/Makefile.in | 1
hw/dmx/Makefile.in | 1
hw/dmx/config/Makefile.in | 1
hw/dmx/doc/Makefile.in | 1
hw/dmx/examples/Makefile.in | 1
hw/dmx/glxProxy/Makefile.in | 1
hw/dmx/input/Makefile.in | 1
hw/kdrive/Makefile.in | 1
hw/kdrive/ati/Makefile.in | 1
hw/kdrive/chips/Makefile.in | 1
hw/kdrive/ephyr/Makefile.in | 1
hw/kdrive/epson/Makefile.in | 1
hw/kdrive/fake/Makefile.in | 1
hw/kdrive/fbdev/Makefile.in | 1
hw/kdrive/i810/Makefile.in | 1
hw/kdrive/linux/Makefile.in | 1
hw/kdrive/mach64/Makefile.in | 1
hw/kdrive/mga/Makefile.in | 1
hw/kdrive/neomagic/Makefile.in | 1
hw/kdrive/nvidia/Makefile.in | 1
hw/kdrive/pm2/Makefile.in | 1
hw/kdrive/r128/Makefile.in | 1
hw/kdrive/sdl/Makefile.in | 1
hw/kdrive/sis300/Makefile.in | 1
hw/kdrive/smi/Makefile.in | 1
hw/kdrive/src/Makefile.in | 1
hw/kdrive/vesa/Makefile.in | 1
hw/kdrive/via/Makefile.in | 1
hw/vfb/Makefile.in | 2
hw/xfree86/Makefile.in | 2
hw/xfree86/common/Makefile.in | 1
hw/xfree86/ddc/Makefile.in | 1
hw/xfree86/dixmods/Makefile.in | 1
hw/xfree86/dixmods/extmod/Makefile.in | 1
hw/xfree86/doc/Makefile.in | 1
hw/xfree86/doc/devel/Makefile.in | 1
hw/xfree86/doc/man/Makefile.in | 2
hw/xfree86/doc/sgml/Makefile.in | 1
hw/xfree86/dri/Makefile.in | 1
hw/xfree86/dummylib/Makefile.in | 1
hw/xfree86/exa/Makefile.in | 2
hw/xfree86/fbdevhw/Makefile.in | 2
hw/xfree86/i2c/Makefile.in | 1
hw/xfree86/int10/Makefile.in | 1
hw/xfree86/loader/Makefile.in | 1
hw/xfree86/modes/Makefile.in | 1
hw/xfree86/os-support/Makefile.in | 1
hw/xfree86/os-support/bsd/Makefile.in | 1
hw/xfree86/os-support/bus/Makefile.in | 1
hw/xfree86/os-support/hurd/Makefile.in | 1
hw/xfree86/os-support/linux/Makefile.in | 1
hw/xfree86/os-support/lynxos/Makefile.in | 1
hw/xfree86/os-support/misc/Makefile.in | 1
hw/xfree86/os-support/sco/Makefile.in | 1
hw/xfree86/os-support/solaris/Makefile.in | 1
hw/xfree86/os-support/sysv/Makefile.in | 1
hw/xfree86/os-support/usl/Makefile.in | 1
hw/xfree86/parser/Makefile.in | 1
hw/xfree86/rac/Makefile.in | 1
hw/xfree86/ramdac/Makefile.in | 1
hw/xfree86/scanpci/Makefile.in | 1
hw/xfree86/shadowfb/Makefile.in | 1
hw/xfree86/utils/Makefile.in | 1
hw/xfree86/utils/cvt/Makefile.in | 2
hw/xfree86/utils/gtf/Makefile.in | 2
hw/xfree86/utils/ioport/Makefile.in | 1
hw/xfree86/utils/kbd_mode/Makefile.in | 2
hw/xfree86/utils/pcitweak/Makefile.in | 2
hw/xfree86/utils/scanpci/Makefile.in | 2
hw/xfree86/utils/xorgcfg/Makefile.in | 2
hw/xfree86/utils/xorgconfig/Makefile.in | 2
hw/xfree86/vbe/Makefile.in | 1
hw/xfree86/vgahw/Makefile.in | 1
hw/xfree86/x86emu/Makefile.in | 1
hw/xfree86/xaa/Makefile.in | 1
hw/xfree86/xf1bpp/Makefile.in | 1
hw/xfree86/xf4bpp/Makefile.in | 1
hw/xfree86/xf8_16bpp/Makefile.in | 1
hw/xfree86/xf8_32bpp/Makefile.in | 1
hw/xgl/Makefile.in | 1
hw/xgl/egl/Makefile.in | 1
hw/xgl/egl/module/Makefile.in | 1
hw/xgl/glx/Makefile.in | 1
hw/xgl/glx/module/Makefile.in | 1
hw/xgl/glxext/Makefile.in | 1
hw/xgl/glxext/module/Makefile.in | 1
hw/xnest/Makefile.in | 2
hw/xprint/Makefile.in | 1
hw/xprint/config/C/Makefile.in | 1
hw/xprint/config/C/print/Makefile.in | 1
hw/xprint/config/C/print/attributes/Makefile.in | 1
hw/xprint/config/C/print/ddx-config/Makefile.in | 1
hw/xprint/config/C/print/ddx-config/raster/Makefile.in | 1
hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in | 1
hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in | 1
hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in | 1
hw/xprint/config/C/print/models/GSdefault/Makefile.in | 1
hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in | 1
hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in | 1
hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in | 1
hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in | 1
hw/xprint/config/C/print/models/HPLJ4family/Makefile.in | 1
hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in | 1
hw/xprint/config/C/print/models/Makefile.in | 1
hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in | 1
hw/xprint/config/C/print/models/PSdefault/Makefile.in | 1
hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in | 1
hw/xprint/config/C/print/models/PSspooldir/Makefile.in | 1
hw/xprint/config/C/print/models/SPSPARC2/Makefile.in | 1
hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in | 1
hw/xprint/config/Makefile.in | 1
hw/xprint/config/en_US/Makefile.in | 1
hw/xprint/config/en_US/print/Makefile.in | 1
hw/xprint/config/en_US/print/attributes/Makefile.in | 1
hw/xprint/doc/Makefile.in | 2
hw/xprint/etc/Makefile.in | 1
hw/xprint/etc/Xsession.d/Makefile.in | 1
hw/xprint/etc/init.d/Makefile.in | 2
hw/xprint/etc/profile.d/Makefile.in | 1
hw/xprint/pcl-mono/Makefile.in | 1
hw/xprint/pcl/Makefile.in | 1
hw/xprint/ps/Makefile.in | 1
hw/xprint/raster/Makefile.in | 1
hw/xwin/Makefile.in | 1
include/Makefile.in | 1
ltmain.sh | 233 +-
mfb/Makefile.in | 1
mi/Makefile.in | 1
miext/Makefile.in | 1
miext/cw/Makefile.in | 1
miext/damage/Makefile.in | 1
miext/rootless/Makefile.in | 1
miext/shadow/Makefile.in | 1
os/Makefile.in | 1
randr/Makefile.in | 1
record/Makefile.in | 1
render/Makefile.in | 1
xfixes/Makefile.in | 1
xkb/Makefile.in | 1
178 files changed, 2709 insertions(+), 732 deletions(-)
New commits:
commit e81626d35c14595223b6244f9032cb7dfeba95f2
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 9 16:32:25 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index fac90cd..07bd4f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.3.0.0.dfsg-12) UNRELEASED; urgency=low
+xorg-server (2:1.3.0.0.dfsg-12) unstable; urgency=low
[ Brice Goglin ]
* Add 51_xkb-and-loathing.diff to fix a hang in OpenOffice.org
@@ -22,7 +22,7 @@ xorg-server (2:1.3.0.0.dfsg-12) UNRELEASED; urgency=low
* Include the Debian package version in OSVENDOR to make it appear in the
X log.
- -- Julien Cristau <jcristau@debian.org> Thu, 09 Aug 2007 16:21:59 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Aug 2007 16:32:14 +0200
xorg-server (2:1.3.0.0.dfsg-11) unstable; urgency=low
commit 520155513088f0d6c561af683af3b12098e7a1f1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 9 16:24:50 2007 +0200
Cosmetic changes in debian/rules
* include the Debian package version in OSVENDOR to make it show up in the log
* delete ylwrap in debian/rules clean
diff --git a/debian/changelog b/debian/changelog
index b931f20..fac90cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,10 @@ xorg-server (2:1.3.0.0.dfsg-12) UNRELEASED; urgency=low
126_glxproxy_remove-stray__GLinterface.diff and 127_mesa-6.5.3-compat.diff
to build with mesa >= 6.5.3, and bump build-dependency on
mesa-swx11-source.
+ * Include the Debian package version in OSVENDOR to make it appear in the
+ X log.
- -- Julien Cristau <jcristau@debian.org> Tue, 31 Jul 2007 12:36:27 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Aug 2007 16:21:59 +0200
xorg-server (2:1.3.0.0.dfsg-11) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index fd85905..9c55742 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ confflags += --disable-static \
--with-xkb-output=/var/lib/xkb \
--enable-xfree86-utils \
--with-os-name="$(shell uname)" \
- --with-os-vendor=Debian \
+ --with-os-vendor="Debian ($(SOURCE_NAME) $(SOURCE_VERSION))" \
--with-int10=x86emu \
--disable-type1
@@ -84,7 +84,7 @@ clean: xsfclean
rm -f hw/xfree86/common/xf86Build.h
# more generated files
rm -f include/dix-config.h include/do-not-use-config.h \
- include/xorg-config.h include/xorg-server.h
+ include/xorg-config.h include/xorg-server.h ylwrap
dh_clean
commit 254c7a8537800566a8146998f0b459e62b238ea8
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 31 18:21:15 2007 +0200
Update for mesa >= 6.5.3.
Add three patches from the ubuntu package (stolen from another distro)
to build against mesa-swx11-source >= 6.5.3.
Bump build-dep accordingly, and autoreconf.
diff --git a/GL/Makefile.in b/GL/Makefile.in
index 1b5856d..50ae9f0 100644
--- a/GL/Makefile.in
+++ b/GL/Makefile.in
@@ -297,6 +297,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/GL/glx/Makefile.in b/GL/glx/Makefile.in
index afe3fb8..7c9b359 100644
--- a/GL/glx/Makefile.in
+++ b/GL/glx/Makefile.in
@@ -320,6 +320,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/GL/mesa/Makefile.in b/GL/mesa/Makefile.in
index c474c71..2f555f7 100644
--- a/GL/mesa/Makefile.in
+++ b/GL/mesa/Makefile.in
@@ -55,9 +55,9 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libGLcore_la_DEPENDENCIES = main/libmain.la math/libmath.la \
- array_cache/libac.la swrast/libswrast.la swrast_setup/libss.la \
- tnl/libtnl.la shader/libshader.la shader/grammar/libgrammar.la \
- shader/slang/libslang.la X/libX.la
+ swrast/libswrast.la swrast_setup/libss.la tnl/libtnl.la \
+ shader/libshader.la shader/grammar/libgrammar.la \
+ shader/slang/libslang.la vbo/libvbo.la X/libX.la
am_libGLcore_la_OBJECTS = dummy.lo
libGLcore_la_OBJECTS = $(am_libGLcore_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
@@ -316,6 +316,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -544,18 +545,18 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
xglmoduledir = @xglmoduledir@
xpconfigdir = @xpconfigdir@
-SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
+SUBDIRS = main math swrast swrast_setup tnl shader X glapi vbo
noinst_LTLIBRARIES = libGLcore.la
libGLcore_la_SOURCES = dummy.c
libGLcore_la_LIBADD = main/libmain.la \
math/libmath.la \
- array_cache/libac.la \
swrast/libswrast.la \
swrast_setup/libss.la \
tnl/libtnl.la \
shader/libshader.la \
shader/grammar/libgrammar.la \
shader/slang/libslang.la \
+ vbo/libvbo.la \
X/libX.la
all: all-recursive
diff --git a/GL/mesa/X/Makefile.in b/GL/mesa/X/Makefile.in
index 624b382..879d5d0 100644
--- a/GL/mesa/X/Makefile.in
+++ b/GL/mesa/X/Makefile.in
@@ -55,9 +55,9 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libX_la_LIBADD =
-am_libX_la_OBJECTS = xf86glx.lo xf86glx_util.lo
-nodist_libX_la_OBJECTS = xm_api.lo xm_buffer.lo xm_dd.lo xm_line.lo \
- xm_span.lo xm_tri.lo driverfuncs.lo
+am_libX_la_OBJECTS = xf86glx.lo
+nodist_libX_la_OBJECTS = xm_api.lo xm_buffer.lo xm_dd.lo xm_image.lo \
+ xm_line.lo xm_span.lo xm_tri.lo driverfuncs.lo
libX_la_OBJECTS = $(am_libX_la_OBJECTS) $(nodist_libX_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -308,6 +308,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -539,7 +540,6 @@ xpconfigdir = @xpconfigdir@
noinst_LTLIBRARIES = libX.la
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -559,18 +559,14 @@ INCLUDES = -I@MESA_SOURCE@/include \
AM_CFLAGS = \
$(DIX_CFLAGS) \
-DXFree86Server \
- @GLX_DEFINES@ \
- -DXFree86Server
-
-libX_la_SOURCES = xf86glx.c \
- xf86glx_util.c \
- xf86glx_util.h \
- xf86glxint.h
+ @GLX_DEFINES@
+libX_la_SOURCES = xf86glx.c
nodist_libX_la_SOURCES = \
xm_api.c \
xm_buffer.c \
xm_dd.c \
+ xm_image.c \
xm_line.c \
xm_span.c \
xm_tri.c \
@@ -629,10 +625,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/driverfuncs.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86glx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86glx_util.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_api.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_buffer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_dd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_image.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_line.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_span.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_tri.Plo@am__quote@
diff --git a/GL/mesa/array_cache/Makefile.in b/GL/mesa/array_cache/Makefile.in
index f77adc1..9352495 100644
--- a/GL/mesa/array_cache/Makefile.in
+++ b/GL/mesa/array_cache/Makefile.in
@@ -306,6 +306,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/GL/mesa/glapi/Makefile.in b/GL/mesa/glapi/Makefile.in
index 21e855c..4f6fdbd 100644
--- a/GL/mesa/glapi/Makefile.in
+++ b/GL/mesa/glapi/Makefile.in
@@ -306,6 +306,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -542,7 +543,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/main/Makefile.in b/GL/mesa/main/Makefile.in
index 387c1ee..7ad8a8c 100644
--- a/GL/mesa/main/Makefile.in
+++ b/GL/mesa/main/Makefile.in
@@ -63,9 +63,9 @@ nodist_libmain_la_OBJECTS = accum.lo api_arrayelt.lo api_loopback.lo \
drawpix.lo enable.lo enums.lo eval.lo execmem.lo extensions.lo \
fbobject.lo feedback.lo fog.lo framebuffer.lo get.lo \
getstring.lo hash.lo hint.lo histogram.lo image.lo imports.lo \
- light.lo lines.lo matrix.lo mipmap.lo mm.lo occlude.lo \
- pixel.lo points.lo polygon.lo rastpos.lo rbadaptors.lo \
- renderbuffer.lo state.lo stencil.lo texcompress.lo \
+ light.lo lines.lo matrix.lo mipmap.lo mm.lo pixel.lo points.lo \
+ polygon.lo queryobj.lo rastpos.lo rbadaptors.lo \
+ renderbuffer.lo shaders.lo state.lo stencil.lo texcompress.lo \
texcompress_fxt1.lo texcompress_s3tc.lo texenvprogram.lo \
texformat.lo teximage.lo texobj.lo texrender.lo texstate.lo \
texstore.lo varray.lo $(am__objects_1) vtxfmt.lo
@@ -319,6 +319,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -555,7 +556,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -607,13 +607,14 @@ nodist_libmain_la_SOURCES = accum.c \
matrix.c \
mipmap.c \
mm.c \
- occlude.c \
pixel.c \
points.c \
polygon.c \
+ queryobj.c \
rastpos.c \
rbadaptors.c \
renderbuffer.c \
+ shaders.c \
state.c \
stencil.c \
texcompress.c \
@@ -721,13 +722,14 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mipmap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occlude.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/points.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polygon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queryobj.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastpos.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rbadaptors.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renderbuffer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shaders.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/state.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stencil.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texcompress.Plo@am__quote@
diff --git a/GL/mesa/math/Makefile.in b/GL/mesa/math/Makefile.in
index 6e576f9..478ed21 100644
--- a/GL/mesa/math/Makefile.in
+++ b/GL/mesa/math/Makefile.in
@@ -308,6 +308,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -544,7 +545,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/shader/Makefile.in b/GL/mesa/shader/Makefile.in
index e948c29..b2386c4 100644
--- a/GL/mesa/shader/Makefile.in
+++ b/GL/mesa/shader/Makefile.in
@@ -56,9 +56,10 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libshader_la_LIBADD =
nodist_libshader_la_OBJECTS = arbprogparse.lo arbprogram.lo \
- atifragshader.lo nvfragparse.lo nvprogram.lo nvvertexec.lo \
- nvvertparse.lo program.lo shaderobjects.lo \
- shaderobjects_3dlabs.lo
+ atifragshader.lo nvfragparse.lo nvprogram.lo nvvertparse.lo \
+ prog_debug.lo prog_execute.lo prog_instruction.lo \
+ prog_parameter.lo prog_print.lo program.lo programopt.lo \
+ prog_statevars.lo shader_api.lo
libshader_la_OBJECTS = $(nodist_libshader_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -316,6 +317,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -553,7 +555,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -572,11 +573,16 @@ nodist_libshader_la_SOURCES = \
atifragshader.c \
nvfragparse.c \
nvprogram.c \
- nvvertexec.c \
- nvvertparse.c \
+ nvvertparse.c \
+ prog_debug.c \
+ prog_execute.c \
+ prog_instruction.c \
+ prog_parameter.c \
+ prog_print.c \
program.c \
- shaderobjects.c \
- shaderobjects_3dlabs.c
+ programopt.c \
+ prog_statevars.c \
+ shader_api.c
all: all-recursive
@@ -634,11 +640,16 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atifragshader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvfragparse.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvprogram.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvvertexec.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvvertparse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prog_debug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prog_execute.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prog_instruction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prog_parameter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prog_print.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prog_statevars.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/program.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shaderobjects.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shaderobjects_3dlabs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/programopt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shader_api.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/GL/mesa/shader/grammar/Makefile.in b/GL/mesa/shader/grammar/Makefile.in
index 70349bf..4e94a3f 100644
--- a/GL/mesa/shader/grammar/Makefile.in
+++ b/GL/mesa/shader/grammar/Makefile.in
@@ -306,6 +306,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -542,7 +543,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../../X \
- -I../../array_cache \
-I../../glapi \
-I../../main \
-I../../math \
diff --git a/GL/mesa/shader/slang/Makefile.in b/GL/mesa/shader/slang/Makefile.in
index df2eca3..732f9b3 100644
--- a/GL/mesa/shader/slang/Makefile.in
+++ b/GL/mesa/shader/slang/Makefile.in
@@ -55,16 +55,14 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libslang_la_LIBADD =
-nodist_libslang_la_OBJECTS = slang_analyse.lo \
- slang_assemble_assignment.lo slang_assemble.lo \
- slang_assemble_conditional.lo slang_assemble_constructor.lo \
- slang_assemble_typeinfo.lo slang_compile.lo \
- slang_compile_function.lo slang_compile_operation.lo \
- slang_compile_struct.lo slang_compile_variable.lo \
- slang_execute.lo slang_execute_x86.lo slang_export.lo \
- slang_library_texsample.lo slang_library_noise.lo \
- slang_link.lo slang_preprocess.lo slang_storage.lo \
- slang_utility.lo
+nodist_libslang_la_OBJECTS = slang_builtin.lo slang_codegen.lo \
+ slang_compile.lo slang_compile_function.lo \
+ slang_compile_operation.lo slang_compile_struct.lo \
+ slang_compile_variable.lo slang_emit.lo slang_ir.lo \
+ slang_label.lo slang_library_noise.lo slang_link.lo \
+ slang_log.lo slang_mem.lo slang_preprocess.lo slang_print.lo \
+ slang_simplify.lo slang_storage.lo slang_typeinfo.lo \
+ slang_utility.lo slang_vartable.lo
libslang_la_OBJECTS = $(nodist_libslang_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -315,6 +313,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -552,7 +551,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../grammar \
-I../../X \
- -I../../array_cache \
-I../../glapi \
-I../../main \
-I../../math \
@@ -563,26 +561,27 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../.. \
-I$(top_srcdir)/hw/xfree86/os-support
-nodist_libslang_la_SOURCES = slang_analyse.c \
- slang_assemble_assignment.c \
- slang_assemble.c \
- slang_assemble_conditional.c \
- slang_assemble_constructor.c \
- slang_assemble_typeinfo.c \
+nodist_libslang_la_SOURCES = slang_builtin.c \
+ slang_codegen.c \
slang_compile.c \
slang_compile_function.c \
slang_compile_operation.c \
slang_compile_struct.c \
slang_compile_variable.c \
- slang_execute.c \
- slang_execute_x86.c \
- slang_export.c \
- slang_library_texsample.c \
+ slang_emit.c \
+ slang_ir.c \
+ slang_label.c \
slang_library_noise.c \
slang_link.c \
+ slang_log.c \
+ slang_mem.c \
slang_preprocess.c \
+ slang_print.c \
+ slang_simplify.c \
slang_storage.c \
- slang_utility.c
+ slang_typeinfo.c \
+ slang_utility.c \
+ slang_vartable.c
all: all-am
@@ -635,26 +634,27 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_analyse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_assemble.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_assemble_assignment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_assemble_conditional.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_assemble_constructor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_assemble_typeinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_builtin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_codegen.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_compile.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_compile_function.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_compile_operation.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_compile_struct.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_compile_variable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_execute.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_execute_x86.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_export.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_emit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_ir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_label.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_library_noise.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_library_texsample.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_link.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_log.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_mem.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_preprocess.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_print.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_simplify.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_storage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_typeinfo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_utility.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slang_vartable.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/GL/mesa/swrast/Makefile.in b/GL/mesa/swrast/Makefile.in
index c80817b..bb3795a 100644
--- a/GL/mesa/swrast/Makefile.in
+++ b/GL/mesa/swrast/Makefile.in
@@ -56,12 +56,12 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libswrast_la_LIBADD =
nodist_libswrast_la_OBJECTS = s_aaline.lo s_aatriangle.lo s_accum.lo \
- s_alpha.lo s_arbshader.lo s_atifragshader.lo s_bitmap.lo \
- s_blend.lo s_blit.lo s_buffers.lo s_context.lo s_copypix.lo \
- s_depth.lo s_drawpix.lo s_feedback.lo s_fog.lo s_imaging.lo \
- s_lines.lo s_logic.lo s_masking.lo s_nvfragprog.lo s_points.lo \
- s_readpix.lo s_span.lo s_stencil.lo s_texcombine.lo \
- s_texfilter.lo s_texstore.lo s_triangle.lo s_zoom.lo
+ s_alpha.lo s_atifragshader.lo s_bitmap.lo s_blend.lo s_blit.lo \
+ s_buffers.lo s_context.lo s_copypix.lo s_depth.lo s_drawpix.lo \
+ s_feedback.lo s_fog.lo s_fragprog.lo s_imaging.lo s_lines.lo \
+ s_logic.lo s_masking.lo s_points.lo s_readpix.lo s_span.lo \
+ s_stencil.lo s_texcombine.lo s_texfilter.lo s_texstore.lo \
+ s_triangle.lo s_zoom.lo
libswrast_la_OBJECTS = $(nodist_libswrast_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -312,6 +312,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -548,7 +549,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -565,7 +565,6 @@ nodist_libswrast_la_SOURCES = s_aaline.c \
s_aatriangle.c \
s_accum.c \
s_alpha.c \
- s_arbshader.c \
s_atifragshader.c \
s_bitmap.c \
s_blend.c \
@@ -577,11 +576,11 @@ nodist_libswrast_la_SOURCES = s_aaline.c \
s_drawpix.c \
s_feedback.c \
s_fog.c \
+ s_fragprog.c \
s_imaging.c \
s_lines.c \
s_logic.c \
s_masking.c \
- s_nvfragprog.c \
s_points.c \
s_readpix.c \
s_span.c \
@@ -647,7 +646,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_aatriangle.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_accum.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_alpha.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_arbshader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_atifragshader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_bitmap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_blend.Plo@am__quote@
@@ -659,11 +657,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_drawpix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_feedback.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_fog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_fragprog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_imaging.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_lines.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_logic.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_masking.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_nvfragprog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_points.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_readpix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_span.Plo@am__quote@
diff --git a/GL/mesa/swrast_setup/Makefile.in b/GL/mesa/swrast_setup/Makefile.in
index 649a22f..dc59292 100644
--- a/GL/mesa/swrast_setup/Makefile.in
+++ b/GL/mesa/swrast_setup/Makefile.in
@@ -306,6 +306,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -542,7 +543,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/tnl/Makefile.in b/GL/mesa/tnl/Makefile.in
index 9684f2d..f5e38c7 100644
--- a/GL/mesa/tnl/Makefile.in
+++ b/GL/mesa/tnl/Makefile.in
@@ -55,14 +55,11 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libtnl_la_LIBADD =
-nodist_libtnl_la_OBJECTS = t_array_api.lo t_array_import.lo \
- t_context.lo t_pipeline.lo t_save_api.lo t_save_loopback.lo \
- t_save_playback.lo t_vb_arbprogram.lo t_vb_arbprogram_sse.lo \
- t_vb_arbshader.lo t_vb_cull.lo t_vb_fog.lo t_vb_light.lo \
- t_vb_normals.lo t_vb_points.lo t_vb_program.lo t_vb_render.lo \
- t_vb_texgen.lo t_vb_texmat.lo t_vb_vertex.lo t_vertex.lo \
- t_vertex_generic.lo t_vertex_sse.lo t_vp_build.lo t_vtx_api.lo \
- t_vtx_eval.lo t_vtx_exec.lo t_vtx_generic.lo t_vtx_x86.lo
+nodist_libtnl_la_OBJECTS = t_context.lo t_draw.lo t_pipeline.lo \
+ t_vb_cull.lo t_vb_fog.lo t_vb_light.lo t_vb_normals.lo \
+ t_vb_points.lo t_vb_program.lo t_vb_render.lo t_vb_texgen.lo \
+ t_vb_texmat.lo t_vb_vertex.lo t_vertex.lo t_vertex_generic.lo \
+ t_vertex_sse.lo t_vp_build.lo
libtnl_la_OBJECTS = $(nodist_libtnl_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -313,6 +310,7 @@ RES_TRUE = @RES_TRUE@
RGB_DB = @RGB_DB@
SCREENSAVER_FALSE = @SCREENSAVER_FALSE@
SCREENSAVER_TRUE = @SCREENSAVER_TRUE@
+SED = @SED@
SERVERCONFIGdir = @SERVERCONFIGdir@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -549,7 +547,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -561,16 +558,9 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I.. \
-I$(top_srcdir)/hw/xfree86/os-support
-nodist_libtnl_la_SOURCES = t_array_api.c \
- t_array_import.c \
- t_context.c \
+nodist_libtnl_la_SOURCES = t_context.c \
+ t_draw.c \
t_pipeline.c \
- t_save_api.c \
- t_save_loopback.c \
- t_save_playback.c \
- t_vb_arbprogram.c \
- t_vb_arbprogram_sse.c \
- t_vb_arbshader.c \
t_vb_cull.c \
t_vb_fog.c \
t_vb_light.c \
@@ -584,12 +574,7 @@ nodist_libtnl_la_SOURCES = t_array_api.c \
t_vertex.c \
t_vertex_generic.c \
t_vertex_sse.c \
- t_vp_build.c \
- t_vtx_api.c \
- t_vtx_eval.c \
- t_vtx_exec.c \
- t_vtx_generic.c \
- t_vtx_x86.c
+ t_vp_build.c
all: all-am
@@ -642,16 +627,9 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_array_api.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_array_import.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_context.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_draw.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pipeline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_save_api.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_save_loopback.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_save_playback.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vb_arbprogram.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vb_arbprogram_sse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vb_arbshader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vb_cull.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vb_fog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vb_light.Plo@am__quote@
@@ -666,11 +644,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vertex_generic.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vertex_sse.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vp_build.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vtx_api.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vtx_eval.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vtx_exec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vtx_generic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_vtx_x86.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/GL/mesa/vbo/Makefile.in b/GL/mesa/vbo/Makefile.in
new file mode 100644
index 0000000..7d525d6
--- /dev/null
+++ b/GL/mesa/vbo/Makefile.in
@@ -0,0 +1,842 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = GL/mesa/vbo
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
+ $(top_builddir)/include/xorg-server.h \
+ $(top_builddir)/include/dix-config.h \
+ $(top_builddir)/include/xgl-config.h \
+ $(top_builddir)/include/xorg-config.h \
+ $(top_builddir)/include/xkb-config.h \
+ $(top_builddir)/include/xwin-config.h \
+ $(top_builddir)/include/kdrive-config.h
Reply to: