updated texture sources files to match Mesa trunk

1 files changed, 12 insertions, 8 deletions

diff --git a/xc/lib/GL/mesa/main/Imakefile.inc b/xc/lib/GL/mesa/main/Imakefile.inc
index eda2699d9..5d19f0545 100644
--- a/xc/lib/GL/mesa/main/Imakefile.inc
+++ b/xc/lib/GL/mesa/main/Imakefile.inc
@@ -58,12 +58,13 @@ COREMESABASESRCS = \
 		$(MESABUILDDIR)state.c \
 		$(MESABUILDDIR)stencil.c \
 		$(MESABUILDDIR)texcompress.c \
+		$(MESABUILDDIR)texcompress_fxt1.c \
+		$(MESABUILDDIR)texcompress_s3tc.c \
 		$(MESABUILDDIR)texformat.c \
 		$(MESABUILDDIR)teximage.c \
 		$(MESABUILDDIR)texobj.c \
 		$(MESABUILDDIR)texstate.c \
 		$(MESABUILDDIR)texstore.c \
-		$(MESABUILDDIR)texutil.c \
 		$(MESABUILDDIR)varray.c \
 		$(MESABUILDDIR)vtxfmt.c
 
@@ -162,6 +163,8 @@ LinkSourceFile(state.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(stencil.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(stencil.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(texcompress.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texcompress_fxt1.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texcompress_s3tc.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(texcompress.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(texformat.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(texformat.h, $(MESASRCDIR)/src/mesa/main)
@@ -174,9 +177,6 @@ LinkSourceFile(texstate.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(texstate.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(texstore.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(texstore.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(texutil.c, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(texutil.h, $(MESASRCDIR)/src/mesa/main)
-LinkSourceFile(texutil_tmp.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(varray.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(varray.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(version.h, $(MESASRCDIR)/src/mesa/main)
@@ -235,12 +235,13 @@ COREMESABASEOBJS = \
 		$(MESABUILDDIR)state.o \
 		$(MESABUILDDIR)stencil.o \
 		$(MESABUILDDIR)texcompress.o \
+		$(MESABUILDDIR)texcompress_fxt1.o \
+		$(MESABUILDDIR)texcompress_s3tc.o \
 		$(MESABUILDDIR)texformat.o \
 		$(MESABUILDDIR)teximage.o \
 		$(MESABUILDDIR)texobj.o \
 		$(MESABUILDDIR)texstate.o \
 		$(MESABUILDDIR)texstore.o \
-		$(MESABUILDDIR)texutil.o \
 		$(MESABUILDDIR)varray.o \
 		$(MESABUILDDIR)vtxfmt.o
 
@@ -295,12 +296,13 @@ COREMESABASEUOBJS = \
 		$(MESABUILDDIR)unshared/state.o \
 		$(MESABUILDDIR)unshared/stencil.o \
 		$(MESABUILDDIR)unshared/texcompress.o \
+		$(MESABUILDDIR)unshared/texcompress_fxt1.o \
+		$(MESABUILDDIR)unshared/texcompress_s3tc.o \
 		$(MESABUILDDIR)unshared/texformat.o \
 		$(MESABUILDDIR)unshared/teximage.o \
 		$(MESABUILDDIR)unshared/texobj.o \
 		$(MESABUILDDIR)unshared/texstate.o \
 		$(MESABUILDDIR)unshared/texstore.o \
-		$(MESABUILDDIR)unshared/texutil.o \
 		$(MESABUILDDIR)unshared/varray.o \
 		$(MESABUILDDIR)unshared/vtxfmt.o
 #else
@@ -357,12 +359,13 @@ COREMESABASEDOBJS = \
 		$(MESABUILDDIR)debugger/state.o \
 		$(MESABUILDDIR)debugger/stencil.o \
 		$(MESABUILDDIR)debugger/texcompress.o \
+		$(MESABUILDDIR)debugger/texcompress_fxt1.o \
+		$(MESABUILDDIR)debugger/texcompress_s3tc.o \
 		$(MESABUILDDIR)debugger/texformat.o \
 		$(MESABUILDDIR)debugger/teximage.o \
 		$(MESABUILDDIR)debugger/texobj.o \
 		$(MESABUILDDIR)debugger/texstate.o \
 		$(MESABUILDDIR)debugger/texstore.o \
-		$(MESABUILDDIR)debugger/texutil.o \
 		$(MESABUILDDIR)debugger/varray.o \
 		$(MESABUILDDIR)debugger/vtxfmt.o
 
@@ -416,11 +419,12 @@ COREMESABASEPOBJS = \
 		$(MESABUILDDIR)profiled/state.o \
 		$(MESABUILDDIR)profiled/stencil.o \
 		$(MESABUILDDIR)profiled/texcompress.o \
+		$(MESABUILDDIR)profiled/texcompress_fxt1.o \
+		$(MESABUILDDIR)profiled/texcompress_s3tc.o \
 		$(MESABUILDDIR)profiled/texformat.o \
 		$(MESABUILDDIR)profiled/teximage.o \
 		$(MESABUILDDIR)profiled/texobj.o \
 		$(MESABUILDDIR)profiled/texstate.o \
 		$(MESABUILDDIR)profiled/texstore.o \
-		$(MESABUILDDIR)profiled/texutil.o \
 		$(MESABUILDDIR)profiled/varray.o \
 		$(MESABUILDDIR)profiled/vtxfmt.o