Some small build related changes to make the texus2 library the default.

glide3x/configure.in

@@ -112,7 +112,7 @@ AC_ARG_ENABLE([amd3d],
                esac],[enable_amd3d=false])
 AM_CONDITIONAL(GL_AMD3D,     test x$enable_amd3d = xtrue)
 #
-# --enable-fx-texus2 enables new texus library.
+# --enable-fx-texlib=texus2 enables new texus library.
 #
 AC_ARG_ENABLE([fx-texlib],
               [dnl
@@ -127,7 +127,7 @@ AC_ARG_ENABLE([fx-texlib],
                *)
                    AC_MSG_ERROR([Illegal value (${enableval}) for --enable-fx-texus])
                    ;;
-               esac],[TEXTURE_UTILITIES_DIR=texus])
+               esac],[TEXTURE_UTILITIES_DIR=texus2])
 AC_SUBST(TEXTURE_UTILITIES_DIR)
 #
 # These are conditional variables whose value is set by

glide3x/h5/glide3/src/makefile.autoconf.am

@@ -206,6 +206,7 @@ VGLIDE_SRC=$(FX_GLIDE_CTRISETUP_SRC)
 
 WHOLE_LIBS = $(top_builddir)/swlibs/fxmisc/libfxmisc.la \
              $(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \
+			 $(top_builddir)/swlibs/$(TEXTURE_UTILITIES_DIR)/lib/libtexus.la \
              $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
 LINK_LIBS  = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
 

swlibs/texus/lib/makefile.autoconf.am

@@ -32,9 +32,9 @@ LDEFS  = $(FX_GLIDE3_DEFS)
 # We still have to figure out what to do with shared.
 # libraries.
 #
-include_HEADERS        = texus.h
 noinst_HEADERS         = texusint.h
 noinst_LTLIBRARIES     = libtexus.la
+include_HEADERS        = texus.h
 libtexus_la_SOURCES    = texuslib.c clamp.c read.c resample.c mipmap.c \
                          quantize.c ncc.c nccnnet.c pal256.c dequant.c \
                          view.c util.c diffuse.c write.c tga.c 3df.c \

swlibs/texus2/lib/makefile.autoconf.am

@@ -23,12 +23,16 @@
 #
 # First, the defines.
 #
-DBGOPTS = -DHWC_DEBUG -DGDBG_INFO_ON -g
+
+if GLIDE_DEBUG
+DBGOPTS = -DHWC_DEBUG -g
+endif
 LDEFS   = -DGLIDE_DIAGS -DHWC_CSIM -DGLIDE3 -DGLIDE3_ALPHA \
           -DGD_DEBUGGING -DGLIDE_SIMULATOR $(DBGOPTS)
 
-lib_LTLIBRARIES     = libtexus.la
-include_HEADERS     = texus.h texusint.h
+noinst_LTLIBRARIES  = libtexus.la
+noinst_HEADERS      = texusint.h
+include_HEADERS     = texus.h
 libtexus_la_SOURCES = texuslib.c clamp.c read.c \
                       resample.c mipmap.c quantize.c ncc.c nccnnet.c \
                       pal256.c pal6666.c dequant.c view.c util.c \

swlibs/texus2/lib/texus.h

@@ -72,7 +72,7 @@ typedef FxU32 GrTextureFormat_t;
 #define GR_TEXFMT_AP_88                 0xe
 #define GR_TEXFMT_RSVD4                 0xf
 
-// sst2 formats 
+/* sst2 formats */
 #define GR_TEXFMT_ARGB_CMP_FXT1        0x11
 #define GR_TEXFMT_ARGB_8888            0x12
 #define GR_TEXFMT_YUYV_422             0x13
@@ -165,13 +165,13 @@ typedef struct
   FxU32        mem_required;    /* memory required for mip map in bytes. */
 } Gu3dfInfo;
 
-#endif          // __GLIDE_H__
+#endif          /* __GLIDE_H__*/
 
 #define GR_TEXFMT_32BIT                                 0x12
 #define GR_TEXFMT_RGB_888                               0xff
 #define GR_TEXFMT_ANY                                   0x7fffffff
 
-// Save typing fingers
+/* Save typing fingers*/
 #define GR_TEXFMT_A_8                                   GR_TEXFMT_ALPHA_8
 #define GR_TEXFMT_I_8                                   GR_TEXFMT_INTENSITY_8
 #define GR_TEXFMT_AI_44                                 GR_TEXFMT_ALPHA_INTENSITY_44
@@ -274,9 +274,9 @@ FxBool txWrite( Gu3dfInfo *info, FILE *fp, FxU32 flags );
 /*
  * Conversion of a single mip level
  */
-void txImgQuantize( char *dst, char *src, 
-                    int w, int h, 
-                    FxU32 format, FxU32 dither);
+extern void txImgQuantize( char *dst, char *src, 
+                           int w, int h, 
+                           FxU32 format, FxU32 dither);
 
 /*
  * Error handling.

swlibs/texus2/lib/texusint.h

@@ -40,11 +40,11 @@ int txBitsPerPixel(GrTextureFormat_t format);
 
 #define TX_MAX_LEVEL       16
 typedef struct  _TxMip {
-        int             format;                         // GR_TEXFMT_...
-        int             width;                          // pixels
-        int             height;                         // pixels
-        int             depth;                          // mipmap levels
-        int             size;                           // bytes
+    int             format;                         /* GR_TEXFMT_... */
+    int             width;                          /* pixels */
+    int             height;                         /* pixels */
+    int             depth;                          /* mipmap levels */
+    int             size;                           /* bytes */
         void    *data[TX_MAX_LEVEL];
         FxU32   pal[256];
 } TxMip;
@@ -128,18 +128,18 @@ extern TxErrorCallbackFnc_t _txErrorCallback;
 extern  char *Format_Name[];
 
 
-// General read functions for 3DF/TXS files
+/* General read functions for 3DF/TXS files */
 
 
-//FxBool _txRead3DFNCCTable (FILE* stream, FxI32* ncc_table);
-//FxBool _txRead3DFPalTable (FILE* stream, FxI32* pal);
+/*FxBool _txRead3DFNCCTable (FILE* stream, FxI32* ncc_table); */
+/*FxBool _txRead3DFPalTable (FILE* stream, FxI32* pal); */
 
-// General write functions for 3DF/TXS files
+/* General write functions for 3DF/TXS files */
 
-//FxBool _txWrite3dfNCCTable (FILE *stream, FxU32 *yab);
-//FxBool _txWrite3dfPalTable (FILE *stream, FxU32 *pal);
+/*FxBool _txWrite3dfNCCTable (FILE *stream, FxU32 *yab); */
+/*FxBool _txWrite3dfPalTable (FILE *stream, FxU32 *pal); */
 
-// TXS constants
+/* TXS constants */
 
 #define TXS_COOKIE             "TXSF"
 #define TXS_COOKIE_SIZE        5
@@ -176,7 +176,7 @@ typedef struct
 	FxU16 width;
 	FxU16 height;
 	FxU16 mipmap_levels;
-	FxU32 data_offset;  // in bytes
+    FxU32 data_offset;  /* in bytes */
 } TXSHeader;
 
 /* TXS info structure