Merge branch 'origin'
[mesa.git] / src / mesa / main / texcompress_s3tc.c
index 08697f46c4294f94cee941fb2260582e2171429a..99b703de4a5647616a8134f3b0cd16c3925e44d7 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.5.2
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,6 +28,9 @@
  * GL_EXT_texture_compression_s3tc support.
  */
 
+#ifndef USE_EXTERNAL_DXTN_LIB
+#define USE_EXTERNAL_DXTN_LIB 0
+#endif
 
 #include "glheader.h"
 #include "imports.h"
 #include "texformat.h"
 #include "texstore.h"
 
+#if USE_EXTERNAL_DXTN_LIB && !defined(__MINGW32__)
+#include <dlfcn.h>
+#endif
+
+#ifdef __MINGW32__
+#define DXTN_LIBNAME "dxtn.dll"
+#define RTLD_LAZY 0
+#define RTLD_GLOBAL 0
+#elif defined(__DJGPP__)
+#define DXTN_LIBNAME "dxtn.dxe"
+#else
+#define DXTN_LIBNAME "libtxc_dxtn.so"
+#endif
+
+
+typedef void (*dxtFetchTexelFuncExt)( GLint srcRowstride, GLubyte *pixdata, GLint col, GLint row, GLvoid *texelOut );
+
+dxtFetchTexelFuncExt fetch_ext_rgb_dxt1 = NULL;
+dxtFetchTexelFuncExt fetch_ext_rgba_dxt1 = NULL;
+dxtFetchTexelFuncExt fetch_ext_rgba_dxt3 = NULL;
+dxtFetchTexelFuncExt fetch_ext_rgba_dxt5 = NULL;
+
+typedef void (*dxtCompressTexFuncExt)(GLint srccomps, GLint width,
+                                      GLint height, const GLchan *srcPixData,
+                                      GLenum destformat, GLubyte *dest,
+                                      GLint dstRowStride);
+
+static dxtCompressTexFuncExt ext_tx_compress_dxtn = NULL;
+
+static void *dxtlibhandle = NULL;
+
+
+typedef void (*GenericFunc)(void);
+
+
+/**
+ * Wrapper for dlopen().
+ * XXX Probably move this and the following wrappers into imports.h someday.
+ */
+static void *
+_mesa_dlopen(const char *libname, int flags)
+{
+#if USE_EXTERNAL_DXTN_LIB
+#ifdef __MINGW32__
+   return LoadLibrary(libname);
+#else
+   return dlopen(libname, flags);
+#endif
+#else
+   return (GenericFunc) NULL;
+#endif /* USE_EXTERNAL_DXTN_LIB */
+}
+
+
+/**
+ * Wrapper for dlsym() that does a cast to a generic function type,
+ * rather than a void *.  This reduces the number of warnings that are
+ * generated.
+ */
+static GenericFunc
+_mesa_dlsym(void *handle, const char *fname)
+{
+#if USE_EXTERNAL_DXTN_LIB
+#ifdef __MINGW32__
+   return (GenericFunc) GetProcAddress(handle, fname);
+#elif defined(__DJGPP__)
+   /* need '_' prefix on symbol names */
+   char fname2[1000];
+   fname2[0] = '_';
+   _mesa_strncpy(fname2 + 1, fname, 998);
+   fname2[999] = 0;
+   return (GenericFunc) dlsym(handle, fname2);
+#else
+   return (GenericFunc) dlsym(handle, fname);
+#endif
+#else
+   return (GenericFunc) NULL;
+#endif /* USE_EXTERNAL_DXTN_LIB */
+}
+
+
+/**
+ * Wrapper for dlclose().
+ */
+static void
+_mesa_dlclose(void *handle)
+{
+#if USE_EXTERNAL_DXTN_LIB
+#ifdef __MINGW32__
+   FreeLibrary(handle);
+#else
+   dlclose(handle);
+#endif
+#endif
+}
+
 
 
 void
 _mesa_init_texture_s3tc( GLcontext *ctx )
 {
    /* called during context initialization */
+   ctx->Mesa_DXTn = GL_FALSE;
+#if USE_EXTERNAL_DXTN_LIB
+   if (!dxtlibhandle) {
+      dxtlibhandle = _mesa_dlopen(DXTN_LIBNAME, RTLD_LAZY | RTLD_GLOBAL);
+      if (!dxtlibhandle) {
+        _mesa_warning(ctx, "couldn't open " DXTN_LIBNAME ", software DXTn "
+           "compression/decompression unavailable");
+      }
+      else {
+         /* the fetch functions are not per context! Might be problematic... */
+         fetch_ext_rgb_dxt1 = (dxtFetchTexelFuncExt)
+            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgb_dxt1");
+         fetch_ext_rgba_dxt1 = (dxtFetchTexelFuncExt)
+            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt1");
+         fetch_ext_rgba_dxt3 = (dxtFetchTexelFuncExt)
+            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt3");
+         fetch_ext_rgba_dxt5 = (dxtFetchTexelFuncExt)
+            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt5");
+         ext_tx_compress_dxtn = (dxtCompressTexFuncExt)
+            _mesa_dlsym(dxtlibhandle, "tx_compress_dxtn");
+
+         if (!fetch_ext_rgb_dxt1 ||
+             !fetch_ext_rgba_dxt1 ||
+             !fetch_ext_rgba_dxt3 ||
+             !fetch_ext_rgba_dxt5 ||
+             !ext_tx_compress_dxtn) {
+           _mesa_warning(ctx, "couldn't reference all symbols in "
+              DXTN_LIBNAME ", software DXTn compression/decompression "
+              "unavailable");
+            fetch_ext_rgb_dxt1 = NULL;
+            fetch_ext_rgba_dxt1 = NULL;
+            fetch_ext_rgba_dxt3 = NULL;
+            fetch_ext_rgba_dxt5 = NULL;
+            ext_tx_compress_dxtn = NULL;
+            _mesa_dlclose(dxtlibhandle);
+            dxtlibhandle = NULL;
+         }
+      }
+   }
+   if (dxtlibhandle) {
+      ctx->Mesa_DXTn = GL_TRUE;
+      _mesa_warning(ctx, "software DXTn compression/decompression available");
+   }
+#else
+   (void) ctx;
+#endif
 }
 
-
 /**
  * Called via TexFormat->StoreImage to store an RGB_DXT1 texture.
  */
 static GLboolean
-texstore_rgb_dxt1(STORE_PARAMS)
+texstore_rgb_dxt1(TEXSTORE_PARAMS)
 {
    const GLchan *pixels;
    GLint srcRowStride;
@@ -64,6 +208,8 @@ texstore_rgb_dxt1(STORE_PARAMS)
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
+   (void) dstZoffset;
+   (void) dstImageOffsets;
 
    if (srcFormat != GL_RGB ||
        srcType != CHAN_TYPE ||
@@ -90,13 +236,17 @@ texstore_rgb_dxt1(STORE_PARAMS)
    }
 
    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
+                                        dstFormat->MesaFormat,
                                         texWidth, (GLubyte *) dstAddr);
 
-#if 0
-   compress_dxt1(ctx, srcWidth, srcHeight, srcFormat, pixels, srcRowStride,
-                 dst, dstRowStride);
-#endif
+   if (ext_tx_compress_dxtn) {
+      (*ext_tx_compress_dxtn)(3, srcWidth, srcHeight, pixels,
+                              GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
+                              dst, dstRowStride);
+   }
+   else {
+      _mesa_problem(ctx, "external dxt library not available");
+   }
 
    if (tempImage)
       _mesa_free((void *) tempImage);
@@ -109,7 +259,7 @@ texstore_rgb_dxt1(STORE_PARAMS)
  * Called via TexFormat->StoreImage to store an RGBA_DXT1 texture.
  */
 static GLboolean
-texstore_rgba_dxt1(STORE_PARAMS)
+texstore_rgba_dxt1(TEXSTORE_PARAMS)
 {
    const GLchan *pixels;
    GLint srcRowStride;
@@ -121,6 +271,8 @@ texstore_rgba_dxt1(STORE_PARAMS)
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
+   (void) dstZoffset;
+   (void) dstImageOffsets;
 
    if (srcFormat != GL_RGBA ||
        srcType != CHAN_TYPE ||
@@ -147,12 +299,17 @@ texstore_rgba_dxt1(STORE_PARAMS)
    }
 
    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
+                                        dstFormat->MesaFormat,
                                         texWidth, (GLubyte *) dstAddr);
-#if 0
-   compress_dxt1(ctx, srcWidth, srcHeight, srcFormat, pixels, srcRowStride,
-                 dst, dstRowStride);
-#endif
+   if (ext_tx_compress_dxtn) {
+      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,
+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
+                              dst, dstRowStride);
+   }
+   else {
+      _mesa_problem(ctx, "external dxt library not available");
+   }
+
    if (tempImage)
       _mesa_free((void*) tempImage);
 
@@ -164,7 +321,7 @@ texstore_rgba_dxt1(STORE_PARAMS)
  * Called via TexFormat->StoreImage to store an RGBA_DXT3 texture.
  */
 static GLboolean
-texstore_rgba_dxt3(STORE_PARAMS)
+texstore_rgba_dxt3(TEXSTORE_PARAMS)
 {
    const GLchan *pixels;
    GLint srcRowStride;
@@ -176,6 +333,8 @@ texstore_rgba_dxt3(STORE_PARAMS)
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
+   (void) dstZoffset;
+   (void) dstImageOffsets;
 
    if (srcFormat != GL_RGBA ||
        srcType != CHAN_TYPE ||
@@ -201,12 +360,17 @@ texstore_rgba_dxt3(STORE_PARAMS)
    }
 
    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,
+                                        dstFormat->MesaFormat,
                                         texWidth, (GLubyte *) dstAddr);
-#if 0
-   compress_rgba_dxt3(ctx, srcWidth, srcHeight, pixels,
-                      srcRowStride, dst, dstRowStride);
-#endif
+   if (ext_tx_compress_dxtn) {
+      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,
+                              GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,
+                              dst, dstRowStride);
+   }
+   else {
+      _mesa_problem(ctx, "external dxt library not available");
+   }
+
    if (tempImage)
       _mesa_free((void *) tempImage);
 
@@ -218,7 +382,7 @@ texstore_rgba_dxt3(STORE_PARAMS)
  * Called via TexFormat->StoreImage to store an RGBA_DXT5 texture.
  */
 static GLboolean
-texstore_rgba_dxt5(STORE_PARAMS)
+texstore_rgba_dxt5(TEXSTORE_PARAMS)
 {
    const GLchan *pixels;
    GLint srcRowStride;
@@ -230,6 +394,8 @@ texstore_rgba_dxt5(STORE_PARAMS)
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
+   (void) dstZoffset;
+   (void) dstImageOffsets;
 
    if (srcFormat != GL_RGBA ||
        srcType != CHAN_TYPE ||
@@ -255,12 +421,17 @@ texstore_rgba_dxt5(STORE_PARAMS)
    }
 
    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,
+                                        dstFormat->MesaFormat,
                                         texWidth, (GLubyte *) dstAddr);
-#if 0
-   compress_rgba_dxt5(ctx, srcWidth, srcHeight, pixels,
-                      srcRowStride, dst, dstRowStride);
-#endif
+   if (ext_tx_compress_dxtn) {
+      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,
+                              GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,
+                              dst, dstRowStride);
+   }
+   else {
+      _mesa_problem(ctx, "external dxt library not available");
+   }
+
    if (tempImage)
       _mesa_free((void *) tempImage);
 
@@ -272,6 +443,14 @@ static void
 fetch_texel_2d_rgb_dxt1( const struct gl_texture_image *texImage,
                          GLint i, GLint j, GLint k, GLchan *texel )
 {
+   (void) k;
+   if (fetch_ext_rgb_dxt1) {
+      ASSERT (sizeof(GLchan) == sizeof(GLubyte));
+      fetch_ext_rgb_dxt1(texImage->RowStride,
+                         (GLubyte *)(texImage)->Data, i, j, texel);
+   }
+   else
+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available\n");
 }
 
 
@@ -293,6 +472,13 @@ static void
 fetch_texel_2d_rgba_dxt1( const struct gl_texture_image *texImage,
                           GLint i, GLint j, GLint k, GLchan *texel )
 {
+   (void) k;
+   if (fetch_ext_rgba_dxt1) {
+      fetch_ext_rgba_dxt1(texImage->RowStride,
+                          (GLubyte *)(texImage)->Data, i, j, texel);
+   }
+   else
+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available\n");
 }
 
 
@@ -314,6 +500,14 @@ static void
 fetch_texel_2d_rgba_dxt3( const struct gl_texture_image *texImage,
                           GLint i, GLint j, GLint k, GLchan *texel )
 {
+   (void) k;
+   if (fetch_ext_rgba_dxt3) {
+      ASSERT (sizeof(GLchan) == sizeof(GLubyte));
+      fetch_ext_rgba_dxt3(texImage->RowStride, (GLubyte *)(texImage)->Data,
+                          i, j, texel);
+   }
+   else
+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available\n");
 }
 
 
@@ -335,6 +529,13 @@ static void
 fetch_texel_2d_rgba_dxt5( const struct gl_texture_image *texImage,
                           GLint i, GLint j, GLint k, GLchan *texel )
 {
+   (void) k;
+   if (fetch_ext_rgba_dxt5) {
+      fetch_ext_rgba_dxt5(texImage->RowStride, (GLubyte *)(texImage)->Data,
+                          i, j, texel);
+   }
+   else
+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available\n");
 }
 
 
@@ -364,6 +565,7 @@ const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
    0,                                  /* IntensityBits */
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
+   0,                                  /* StencilBits */
    0,                                  /* TexelBytes */
    texstore_rgb_dxt1,                  /* StoreTexImageFunc */
    NULL, /*impossible*/                /* FetchTexel1D */
@@ -372,6 +574,7 @@ const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
    NULL, /*impossible*/                /* FetchTexel1Df */
    fetch_texel_2d_f_rgb_dxt1,          /* FetchTexel2Df */
    NULL, /*impossible*/                /* FetchTexel3Df */
+   NULL                                        /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
@@ -386,6 +589,7 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
    0,                                  /* IntensityBits */
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
+   0,                                  /* StencilBits */
    0,                                  /* TexelBytes */
    texstore_rgba_dxt1,                 /* StoreTexImageFunc */
    NULL, /*impossible*/                /* FetchTexel1D */
@@ -394,6 +598,7 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
    NULL, /*impossible*/                /* FetchTexel1Df */
    fetch_texel_2d_f_rgba_dxt1,                 /* FetchTexel2Df */
    NULL, /*impossible*/                /* FetchTexel3Df */
+   NULL                                        /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
@@ -408,6 +613,7 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
    0,                                  /* IntensityBits */
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
+   0,                                  /* StencilBits */
    0,                                  /* TexelBytes */
    texstore_rgba_dxt3,                 /* StoreTexImageFunc */
    NULL, /*impossible*/                /* FetchTexel1D */
@@ -416,6 +622,7 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
    NULL, /*impossible*/                /* FetchTexel1Df */
    fetch_texel_2d_f_rgba_dxt3,                 /* FetchTexel2Df */
    NULL, /*impossible*/                /* FetchTexel3Df */
+   NULL                                        /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
@@ -430,6 +637,7 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
    0,                                  /* IntensityBits */
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
+   0,                                  /* StencilBits */
    0,                                  /* TexelBytes */
    texstore_rgba_dxt5,                 /* StoreTexImageFunc */
    NULL, /*impossible*/                /* FetchTexel1D */
@@ -438,4 +646,5 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
    NULL, /*impossible*/                /* FetchTexel1Df */
    fetch_texel_2d_f_rgba_dxt5,                 /* FetchTexel2Df */
    NULL, /*impossible*/                /* FetchTexel3Df */
+   NULL                                        /* StoreTexel */
 };