WebSVN – Kolibri OS – Diff – /contrib/sdk/sources/Mesa/src/gallium/auxiliary/util/u_format_s3tc.c

    util_dl_proc fetch_2d_texel_rgb_dxt1;
    util_dl_proc fetch_2d_texel_rgba_dxt1;
    util_dl_proc fetch_2d_texel_rgba_dxt3;
    util_dl_proc fetch_2d_texel_rgba_dxt5;
    util_dl_proc tx_compress_dxtn;
+   char *force_s3tc_enable;
+    return;
 #if 0
    if (!first_time)
       return;
    first_time = FALSE;
    if (util_format_s3tc_enabled)
       return;
+//   library = util_dl_open(DXTN_LIBNAME);
+   if (!library) {
+      if ((force_s3tc_enable = getenv("force_s3tc_enable")) &&
+          !strcmp(force_s3tc_enable, "true")) {
+         debug_printf("couldn't open " DXTN_LIBNAME ", enabling DXTn due to "
             "force_s3tc_enable=true environment variable\n");
-   library = util_dl_open(DXTN_LIBNAME);
+         util_format_s3tc_enabled = TRUE;
+      } else {
-   if (!library) {
+         debug_printf("couldn't open " DXTN_LIBNAME ", software DXTn "
-      debug_printf("couldn't open " DXTN_LIBNAME ", software DXTn "
+            "compression/decompression unavailable\n");
                    "compression/decompression unavailable\n");
       return;
    util_format_dxt1_rgba_fetch = (util_format_dxtn_fetch_t)fetch_2d_texel_rgba_dxt1;
    util_format_dxt3_rgba_fetch = (util_format_dxtn_fetch_t)fetch_2d_texel_rgba_dxt3;
    util_format_dxt5_rgba_fetch = (util_format_dxtn_fetch_t)fetch_2d_texel_rgba_dxt5;
    util_format_dxtn_pack = (util_format_dxtn_pack_t)tx_compress_dxtn;
    util_format_s3tc_enabled = TRUE;
+   #endif
+}
 static INLINE void
 util_format_dxtn_rgb_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
                                         const uint8_t *src_row, unsigned src_stride,
                                         unsigned width, unsigned height,
                                         util_format_dxtn_fetch_t fetch,
-                                        unsigned block_size, boolean srgb)
+                                        unsigned block_size)
+{
    const unsigned bw = 4, bh = 4, comps = 4;
    unsigned x, y, i, j;
    for(y = 0; y < height; y += bh) {
       const uint8_t *src = src_row;
       for(x = 0; x < width; x += bw) {
          for(j = 0; j < bh; ++j) {
             for(i = 0; i < bw; ++i) {
                uint8_t *dst = dst_row + (y + j)*dst_stride/sizeof(*dst_row) + (x + i)*comps;
                fetch(0, src, i, j, dst);
-               if (srgb) {
-                  dst[0] = util_format_srgb_to_linear_8unorm(dst[0]);
-                  dst[1] = util_format_srgb_to_linear_8unorm(dst[1]);
-                  dst[2] = util_format_srgb_to_linear_8unorm(dst[2]);
-               }
+            }
+         }
          src += block_size;
+      }
       src_row += src_stride;
                                         unsigned width, unsigned height)
+{
    util_format_dxtn_rgb_unpack_rgba_8unorm(dst_row, dst_stride,
                                            src_row, src_stride,
                                            width, height,
-                                           util_format_dxt1_rgb_fetch,
+                                           util_format_dxt1_rgb_fetch, 8);
-, FALSE);
+}
 void
 util_format_dxt1_rgba_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
                                          const uint8_t *src_row, unsigned src_stride,
                                          unsigned width, unsigned height)
+{
    util_format_dxtn_rgb_unpack_rgba_8unorm(dst_row, dst_stride,
                                            src_row, src_stride,
                                            width, height,
-                                           util_format_dxt1_rgba_fetch,
-, FALSE);
+                                           util_format_dxt1_rgba_fetch, 8);
+}
 void
 util_format_dxt3_rgba_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
                                          const uint8_t *src_row, unsigned src_stride,
                                          unsigned width, unsigned height)
+{
    util_format_dxtn_rgb_unpack_rgba_8unorm(dst_row, dst_stride,
                                            src_row, src_stride,
-                                           width, height,
-                                           util_format_dxt3_rgba_fetch,
+                                           width, height,
-, FALSE);
+                                           util_format_dxt3_rgba_fetch, 16);
+}
 void
 util_format_dxt5_rgba_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
                                          const uint8_t *src_row, unsigned src_stride,
                                          unsigned width, unsigned height)
+{
    util_format_dxtn_rgb_unpack_rgba_8unorm(dst_row, dst_stride,
-                                           src_row, src_stride,
-                                           width, height,
+                                           src_row, src_stride,
-                                           util_format_dxt5_rgba_fetch,
+                                           width, height,
-, FALSE);
+                                           util_format_dxt5_rgba_fetch, 16);
+}
 static INLINE void
 util_format_dxtn_rgb_unpack_rgba_float(float *dst_row, unsigned dst_stride,
                                        const uint8_t *src_row, unsigned src_stride,
                                        unsigned width, unsigned height,
                                        util_format_dxtn_fetch_t fetch,
-                                       unsigned block_size, boolean srgb)
+                                       unsigned block_size)
+{
    unsigned x, y, i, j;
    for(y = 0; y < height; y += 4) {
       const uint8_t *src = src_row;
       for(x = 0; x < width; x += 4) {
          for(j = 0; j < 4; ++j) {
-            for(i = 0; i < 4; ++i) {
-               float *dst = dst_row + (y + j)*dst_stride/sizeof(*dst_row) + (x + i)*4;
-               uint8_t tmp[4];
-               fetch(0, src, i, j, tmp);
-               if (srgb) {
-                  dst[0] = util_format_srgb_8unorm_to_linear_float(tmp[0]);
-                  dst[1] = util_format_srgb_8unorm_to_linear_float(tmp[1]);
+            for(i = 0; i < 4; ++i) {
-                  dst[2] = util_format_srgb_8unorm_to_linear_float(tmp[2]);
+               float *dst = dst_row + (y + j)*dst_stride/sizeof(*dst_row) + (x + i)*4;
                uint8_t tmp[4];
-               else {
-                  dst[0] = ubyte_to_float(tmp[0]);
+               fetch(0, src, i, j, tmp);
-                  dst[1] = ubyte_to_float(tmp[1]);
+               dst[0] = ubyte_to_float(tmp[0]);
-                  dst[2] = ubyte_to_float(tmp[2]);
+               dst[1] = ubyte_to_float(tmp[1]);
                dst[2] = ubyte_to_float(tmp[2]);
                dst[3] = ubyte_to_float(tmp[3]);
                                        unsigned width, unsigned height)
+{
    util_format_dxtn_rgb_unpack_rgba_float(dst_row, dst_stride,
                                           src_row, src_stride,
                                           width, height,
-                                          util_format_dxt1_rgb_fetch,
+                                          util_format_dxt1_rgb_fetch, 8);
-, FALSE);
+}
 void
 util_format_dxt1_rgba_unpack_rgba_float(float *dst_row, unsigned dst_stride,
                                         const uint8_t *src_row, unsigned src_stride,
                                         unsigned width, unsigned height)
+{
    util_format_dxtn_rgb_unpack_rgba_float(dst_row, dst_stride,
                                           src_row, src_stride,
                                           width, height,
-                                          util_format_dxt1_rgba_fetch,
-, FALSE);
+                                          util_format_dxt1_rgba_fetch, 8);
+}
 void
 util_format_dxt3_rgba_unpack_rgba_float(float *dst_row, unsigned dst_stride,
                                         const uint8_t *src_row, unsigned src_stride,
                                         unsigned width, unsigned height)
+{
    util_format_dxtn_rgb_unpack_rgba_float(dst_row, dst_stride,
                                           src_row, src_stride,
-                                          width, height,
-                                          util_format_dxt3_rgba_fetch,
+                                          width, height,
-, FALSE);
+                                          util_format_dxt3_rgba_fetch, 16);
+}
 void
 util_format_dxt5_rgba_unpack_rgba_float(float *dst_row, unsigned dst_stride,
                                         const uint8_t *src_row, unsigned src_stride,
                                         unsigned width, unsigned height)
+{
    util_format_dxtn_rgb_unpack_rgba_float(dst_row, dst_stride,
-                                          src_row, src_stride,
-                                          width, height,
+                                          src_row, src_stride,
-                                          util_format_dxt5_rgba_fetch,
+                                          width, height,
-, FALSE);
+                                          util_format_dxt5_rgba_fetch, 16);
+}
 /*
  * Block compression.
- */
-static INLINE void
+ */
-util_format_dxtn_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
-                                  const uint8_t *src, unsigned src_stride,
+void
-                                  unsigned width, unsigned height,
+util_format_dxt1_rgb_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
-                                  enum util_format_dxtn format,
+                                      const uint8_t *src, unsigned src_stride,
-                                  unsigned block_size, boolean srgb)
+                                      unsigned width, unsigned height)
 {
-   const unsigned bw = 4, bh = 4, comps = 4;
+   const unsigned bw = 4, bh = 4, bytes_per_block = 8;
    unsigned x, y, i, j, k;
-   for(y = 0; y < height; y += bh) {
-      uint8_t *dst = dst_row;
+   for(y = 0; y < height; y += bh) {
-      for(x = 0; x < width; x += bw) {
+      uint8_t *dst = dst_row;
-         uint8_t tmp[4][4][4];  /* [bh][bw][comps] */
-         for(j = 0; j < bh; ++j) {
-            for(i = 0; i < bw; ++i) {
+      for(x = 0; x < width; x += bw) {
-               uint8_t src_tmp;
-               for(k = 0; k < 3; ++k) {
-                  src_tmp = src[(y + j)*src_stride/sizeof(*src) + (x+i)*comps + k];
+         uint8_t tmp[4][4][3];  /* [bh][bw][comps] */
-                  if (srgb) {
+         for(j = 0; j < bh; ++j) {
-                     tmp[j][i][k] = util_format_linear_to_srgb_8unorm(src_tmp);
-                  }
-                  else {
-                     tmp[j][i][k] = src_tmp;
-                  }
-               }
+            for(i = 0; i < bw; ++i) {
-               /* for sake of simplicity there's an unneeded 4th component for dxt1_rgb */
+               for(k = 0; k < 3; ++k) {
-               tmp[j][i][3] = src[(y + j)*src_stride/sizeof(*src) + (x+i)*comps + 3];
+                  tmp[j][i][k] = src[(y + j)*src_stride/sizeof(*src) + (x + i)*4 + k];
+               }
+            }
-         /* even for dxt1_rgb have 4 src comps */
-         util_format_dxtn_pack(4, 4, 4, &tmp[0][0][0], format, dst, 0);
-         dst += block_size;
-      }
-      dst_row += dst_stride / sizeof(*dst_row);
-   }
-}
-void
-util_format_dxt1_rgb_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
                                       const uint8_t *src, unsigned src_stride,
-                                      unsigned width, unsigned height)
+         util_format_dxtn_pack(3, 4, 4, &tmp[0][0][0], UTIL_FORMAT_DXT1_RGB, dst, 0);
          dst += bytes_per_block;
    util_format_dxtn_pack_rgba_8unorm(dst_row, dst_stride, src, src_stride,
-                                     width, height, UTIL_FORMAT_DXT1_RGB,
+      dst_row += dst_stride / sizeof(*dst_row);
 , FALSE);
 }
+void
+util_format_dxt1_rgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                       const uint8_t *src, unsigned src_stride,
+                                       unsigned width, unsigned height)
+{
+   const unsigned bw = 4, bh = 4, comps = 4, bytes_per_block = 8;
+   unsigned x, y, i, j, k;
+   for(y = 0; y < height; y += bh) {
+      uint8_t *dst = dst_row;
+      for(x = 0; x < width; x += bw) {
+         uint8_t tmp[4][4][4];  /* [bh][bw][comps] */
+         for(j = 0; j < bh; ++j) {
+            for(i = 0; i < bw; ++i) {
+               for(k = 0; k < comps; ++k) {
-void
+                  tmp[j][i][k] = src[(y + j)*src_stride/sizeof(*src) + (x + i)*comps + k];
+               }
 util_format_dxt1_rgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
                                        const uint8_t *src, unsigned src_stride,
-                                       unsigned width, unsigned height)
+         util_format_dxtn_pack(4, 4, 4, &tmp[0][0][0], UTIL_FORMAT_DXT1_RGBA, dst, 0);
          dst += bytes_per_block;
    util_format_dxtn_pack_rgba_8unorm(dst_row, dst_stride, src, src_stride,
-                                     width, height, UTIL_FORMAT_DXT1_RGBA,
+      dst_row += dst_stride / sizeof(*dst_row);
-, FALSE);
+   }
+}
+void
+util_format_dxt3_rgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                       const uint8_t *src, unsigned src_stride,
+                                       unsigned width, unsigned height)
+{
+   const unsigned bw = 4, bh = 4, comps = 4, bytes_per_block = 16;
+   unsigned x, y, i, j, k;
+   for(y = 0; y < height; y += bh) {
+      uint8_t *dst = dst_row;
+      for(x = 0; x < width; x += bw) {
-}
+         uint8_t tmp[4][4][4];  /* [bh][bw][comps] */
+         for(j = 0; j < bh; ++j) {
+            for(i = 0; i < bw; ++i) {
+               for(k = 0; k < comps; ++k) {
+                  tmp[j][i][k] = src[(y + j)*src_stride/sizeof(*src) + (x + i)*comps + k];
 void
 util_format_dxt3_rgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
                                        const uint8_t *src, unsigned src_stride,
-                                       unsigned width, unsigned height)
+         util_format_dxtn_pack(4, 4, 4, &tmp[0][0][0], UTIL_FORMAT_DXT3_RGBA, dst, 0);
          dst += bytes_per_block;
    util_format_dxtn_pack_rgba_8unorm(dst_row, dst_stride, src, src_stride,
-                                     width, height, UTIL_FORMAT_DXT3_RGBA,
+      dst_row += dst_stride / sizeof(*dst_row);
+   }
+}
+void
+util_format_dxt5_rgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                       const uint8_t *src, unsigned src_stride,
+                                       unsigned width, unsigned height)
+{
+   const unsigned bw = 4, bh = 4, comps = 4, bytes_per_block = 16;
+   unsigned x, y, i, j, k;
+   for(y = 0; y < height; y += bh) {
+      uint8_t *dst = dst_row;
-, FALSE);
+      for(x = 0; x < width; x += bw) {
+         uint8_t tmp[4][4][4];  /* [bh][bw][comps] */
+         for(j = 0; j < bh; ++j) {
-}
+            for(i = 0; i < bw; ++i) {
+               for(k = 0; k < comps; ++k) {
                   tmp[j][i][k] = src[(y + j)*src_stride/sizeof(*src) + (x + i)*comps + k];
-void
+               }
-util_format_dxt5_rgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+            }
                                        const uint8_t *src, unsigned src_stride,
-                                       unsigned width, unsigned height)
+         util_format_dxtn_pack(4, 4, 4, &tmp[0][0][0], UTIL_FORMAT_DXT5_RGBA, dst, 0);
-{
-   util_format_dxtn_pack_rgba_8unorm(dst_row, dst_stride, src, src_stride,
-                                     width, height, UTIL_FORMAT_DXT5_RGBA,
+         dst += bytes_per_block;
 , FALSE);
       dst_row += dst_stride / sizeof(*dst_row);
+   }
 static INLINE void
-util_format_dxtn_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
-                                 const float *src, unsigned src_stride,
+void
-                                 unsigned width, unsigned height,
+util_format_dxt1_rgb_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
-                                 enum util_format_dxtn format,
-                                 unsigned block_size, boolean srgb)
+                                     const float *src, unsigned src_stride,
-{
+                                     unsigned width, unsigned height)
-   unsigned x, y, i, j, k;
-   for(y = 0; y < height; y += 4) {
       uint8_t *dst = dst_row;
-      for(x = 0; x < width; x += 4) {
-         uint8_t tmp[4][4][4];
-         for(j = 0; j < 4; ++j) {
+   unsigned x, y, i, j, k;
-            for(i = 0; i < 4; ++i) {
+   for(y = 0; y < height; y += 4) {
-               float src_tmp;
-               for(k = 0; k < 3; ++k) {
-                  src_tmp = src[(y + j)*src_stride/sizeof(*src) + (x+i)*4 + k];
-                  if (srgb) {
-                     tmp[j][i][k] = util_format_linear_float_to_srgb_8unorm(src_tmp);
-                  }
+      uint8_t *dst = dst_row;
-                  else {
+      for(x = 0; x < width; x += 4) {
-                     tmp[j][i][k] = float_to_ubyte(src_tmp);
+         uint8_t tmp[4][4][3];
          for(j = 0; j < 4; ++j) {
             for(i = 0; i < 4; ++i) {
-               /* for sake of simplicity there's an unneeded 4th component for dxt1_rgb */
+               for(k = 0; k < 3; ++k) {
-               src_tmp = src[(y + j)*src_stride/sizeof(*src) + (x+i)*4 + 3];
+                  tmp[j][i][k] = float_to_ubyte(src[(y + j)*src_stride/sizeof(*src) + (x+i)*4 + k]);
-               tmp[j][i][3] = float_to_ubyte(src_tmp);
-            }
-         }
-         util_format_dxtn_pack(4, 4, 4, &tmp[0][0][0], format, dst, 0);
-         dst += block_size;
-      }
-      dst_row += 4*dst_stride/sizeof(*dst_row);
-   }
-}
 void
 util_format_dxt1_rgb_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
                                      const float *src, unsigned src_stride,
-                                     unsigned width, unsigned height)
+         util_format_dxtn_pack(3, 4, 4, &tmp[0][0][0], UTIL_FORMAT_DXT1_RGB, dst, 0);
+         dst += 8;
+      }
+      dst_row += 4*dst_stride/sizeof(*dst_row);
+   }
+}
+void
+util_format_dxt1_rgba_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
-{
+                                      const float *src, unsigned src_stride,
+                                      unsigned width, unsigned height)
+{
+   unsigned x, y, i, j, k;
-   util_format_dxtn_pack_rgba_float(dst_row, dst_stride, src, src_stride,
+   for(y = 0; y < height; y += 4) {
+      uint8_t *dst = dst_row;
+      for(x = 0; x < width; x += 4) {
-                                    width, height, UTIL_FORMAT_DXT1_RGB,
+         uint8_t tmp[4][4][4];
+         for(j = 0; j < 4; ++j) {
-, FALSE);
+            for(i = 0; i < 4; ++i) {
                for(k = 0; k < 4; ++k) {
                   tmp[j][i][k] = float_to_ubyte(src[(y + j)*src_stride/sizeof(*src) + (x+i)*4 + k]);
 void
 util_format_dxt1_rgba_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
                                       const float *src, unsigned src_stride,
+         util_format_dxtn_pack(4, 4, 4, &tmp[0][0][0], UTIL_FORMAT_DXT1_RGBA, dst, 0);
+         dst += 8;
+      }
+      dst_row += 4*dst_stride/sizeof(*dst_row);
+   }
+}
+void
-                                      unsigned width, unsigned height)
+util_format_dxt3_rgba_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
+                                      const float *src, unsigned src_stride,
+                                      unsigned width, unsigned height)
+{
-{
+   unsigned x, y, i, j, k;
+   for(y = 0; y < height; y += 4) {
+      uint8_t *dst = dst_row;
-   util_format_dxtn_pack_rgba_float(dst_row, dst_stride, src, src_stride,
+      for(x = 0; x < width; x += 4) {
+         uint8_t tmp[4][4][4];
-                                    width, height, UTIL_FORMAT_DXT1_RGBA,
+         for(j = 0; j < 4; ++j) {
-, FALSE);
+            for(i = 0; i < 4; ++i) {
                for(k = 0; k < 4; ++k) {
                   tmp[j][i][k] = float_to_ubyte(src[(y + j)*src_stride/sizeof(*src) + (x+i)*4 + k]);
 void
 util_format_dxt3_rgba_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
+         }
+         util_format_dxtn_pack(4, 4, 4, &tmp[0][0][0], UTIL_FORMAT_DXT3_RGBA, dst, 0);
+         dst += 16;
+      }
+      dst_row += 4*dst_stride/sizeof(*dst_row);
+   }
+}
-                                      const float *src, unsigned src_stride,
+void
+util_format_dxt5_rgba_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
+                                      const float *src, unsigned src_stride,
+                                      unsigned width, unsigned height)
-                                      unsigned width, unsigned height)
+{
+   unsigned x, y, i, j, k;
+   for(y = 0; y < height; y += 4) {
-{
+      uint8_t *dst = dst_row;
+      for(x = 0; x < width; x += 4) {
-   util_format_dxtn_pack_rgba_float(dst_row, dst_stride, src, src_stride,
+         uint8_t tmp[4][4][4];
-                                    width, height, UTIL_FORMAT_DXT3_RGBA,
+         for(j = 0; j < 4; ++j) {
-, FALSE);
+            for(i = 0; i < 4; ++i) {
+               for(k = 0; k < 4; ++k) {
+                  tmp[j][i][k] = float_to_ubyte(src[(y + j)*src_stride/sizeof(*src) + (x+i)*4 + k]);
+               }
+            }
-void
+         }
-util_format_dxt5_rgba_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
+         util_format_dxtn_pack(4, 4, 4, &tmp[0][0][0], UTIL_FORMAT_DXT5_RGBA, dst, 0);
-                                      const float *src, unsigned src_stride,
-                                      unsigned width, unsigned height)
+         dst += 16;
-{
-   util_format_dxtn_pack_rgba_float(dst_row, dst_stride, src, src_stride,
-                                    width, height, UTIL_FORMAT_DXT5_RGBA,
-, FALSE);
+      }
       dst_row += 4*dst_stride/sizeof(*dst_row);
+   }
 /*
- * SRGB variants.
- */
-void
-util_format_dxt1_srgb_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
-{
    uint8_t tmp[4];
-   util_format_dxt1_rgb_fetch(0, src, i, j, tmp);
+/*
-   dst[0] = util_format_srgb_to_linear_8unorm(tmp[0]);
+ * SRGB variants.
    dst[1] = util_format_srgb_to_linear_8unorm(tmp[1]);
-   dst[2] = util_format_srgb_to_linear_8unorm(tmp[2]);
-   dst[3] = 255;
+ * FIXME: shunts to RGB for now
-}
-void
-util_format_dxt1_srgba_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
  */
    uint8_t tmp[4];
-   util_format_dxt1_rgba_fetch(0, src, i, j, tmp);
+void
-   dst[0] = util_format_srgb_to_linear_8unorm(tmp[0]);
+util_format_dxt1_srgb_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
-   dst[1] = util_format_srgb_to_linear_8unorm(tmp[1]);
-   dst[2] = util_format_srgb_to_linear_8unorm(tmp[2]);
+{
-   dst[3] = tmp[3];
-}
-void
-util_format_dxt3_srgba_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
+   util_format_dxt1_rgb_unpack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride, width, height);
+}
-   uint8_t tmp[4];
-   util_format_dxt3_rgba_fetch(0, src, i, j, tmp);
+void
-   dst[0] = util_format_srgb_to_linear_8unorm(tmp[0]);
-   dst[1] = util_format_srgb_to_linear_8unorm(tmp[1]);
+util_format_dxt1_srgb_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
-   dst[2] = util_format_srgb_to_linear_8unorm(tmp[2]);
-   dst[3] = tmp[3];
-}
 void
-util_format_dxt5_srgba_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
+   util_format_dxt1_rgb_pack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride, width, height);
-{
+}
    uint8_t tmp[4];
-   util_format_dxt5_rgba_fetch(0, src, i, j, tmp);
-   dst[0] = util_format_srgb_to_linear_8unorm(tmp[0]);
+void
-   dst[1] = util_format_srgb_to_linear_8unorm(tmp[1]);
-   dst[2] = util_format_srgb_to_linear_8unorm(tmp[2]);
-   dst[3] = tmp[3];
-}
 util_format_dxt1_srgb_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
 void
-util_format_dxt1_srgb_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j)
+   util_format_dxt1_rgb_fetch_rgba_8unorm(dst, src, i, j);
+}
-   uint8_t tmp[4];
-   util_format_dxt1_rgb_fetch(0, src, i, j, tmp);
-   dst[0] = util_format_srgb_8unorm_to_linear_float(tmp[0]);
-   dst[1] = util_format_srgb_8unorm_to_linear_float(tmp[1]);
-   dst[2] = util_format_srgb_8unorm_to_linear_float(tmp[2]);
-   dst[3] = 1.0f;
 void
 util_format_dxt1_srgba_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
-void
+{
-util_format_dxt1_srgba_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j)
+   util_format_dxt1_rgba_unpack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride, width, height);
-{
-   uint8_t tmp[4];
+}
-   util_format_dxt1_rgba_fetch(0, src, i, j, tmp);
-   dst[0] = util_format_srgb_8unorm_to_linear_float(tmp[0]);
-   dst[1] = util_format_srgb_8unorm_to_linear_float(tmp[1]);
-   dst[2] = util_format_srgb_8unorm_to_linear_float(tmp[2]);
    dst[3] = ubyte_to_float(tmp[3]);
 void
+util_format_dxt1_srgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
 void
-util_format_dxt3_srgba_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j)
+   util_format_dxt1_rgba_pack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride, width, height);
-{
-   uint8_t tmp[4];
-   util_format_dxt3_rgba_fetch(0, src, i, j, tmp);
-   dst[0] = util_format_srgb_8unorm_to_linear_float(tmp[0]);
    dst[1] = util_format_srgb_8unorm_to_linear_float(tmp[1]);
    dst[2] = util_format_srgb_8unorm_to_linear_float(tmp[2]);
-   dst[3] = ubyte_to_float(tmp[3]);
+void
 util_format_dxt1_srgba_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
+{
-void
-util_format_dxt5_srgba_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j)
-{
-   uint8_t tmp[4];
-   util_format_dxt5_rgba_fetch(0, src, i, j, tmp);
+   util_format_dxt1_rgba_fetch_rgba_8unorm(dst, src, i, j);
    dst[0] = util_format_srgb_8unorm_to_linear_float(tmp[0]);
-   dst[1] = util_format_srgb_8unorm_to_linear_float(tmp[1]);
-   dst[2] = util_format_srgb_8unorm_to_linear_float(tmp[2]);
+void
-   dst[3] = ubyte_to_float(tmp[3]);
+util_format_dxt3_srgba_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
-}
-void
-util_format_dxt1_srgb_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+{
-   util_format_dxtn_rgb_unpack_rgba_8unorm(dst_row, dst_stride,
+   util_format_dxt3_rgba_unpack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride, width, height);
-                                           src_row, src_stride,
+}
                                            width, height,
-                                           util_format_dxt1_rgb_fetch,
+void
-, TRUE);
-}
-void
-util_format_dxt1_srgba_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+util_format_dxt3_srgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+{
-   util_format_dxtn_rgb_unpack_rgba_8unorm(dst_row, dst_stride,
+   util_format_dxt3_rgba_pack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride, width, height);
                                            src_row, src_stride,
-                                           width, height,
-                                           util_format_dxt1_rgba_fetch,
-, TRUE);
-}
 void
-util_format_dxt3_srgba_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+util_format_dxt3_srgba_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
 {
-   util_format_dxtn_rgb_unpack_rgba_8unorm(dst_row, dst_stride,
+   util_format_dxt3_rgba_fetch_rgba_8unorm(dst, src, i, j);
-                                           src_row, src_stride,
+}
-                                           width, height,
-                                           util_format_dxt3_rgba_fetch,
-, TRUE);
-}
 void
 util_format_dxt5_srgba_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+{
-   util_format_dxtn_rgb_unpack_rgba_8unorm(dst_row, dst_stride,
+   util_format_dxt5_rgba_unpack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride, width, height);
-                                           src_row, src_stride,
-                                           width, height,
-                                           util_format_dxt5_rgba_fetch,
-, TRUE);
+}
 void
-util_format_dxt1_srgb_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+util_format_dxt5_srgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
 {
-   util_format_dxtn_rgb_unpack_rgba_float(dst_row, dst_stride,
-                                          src_row, src_stride,
-                                          width, height,
-                                          util_format_dxt1_rgb_fetch,
-, TRUE);
+   util_format_dxt5_rgba_pack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride, width, height);
+}
 void
-util_format_dxt1_srgba_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+util_format_dxt5_srgba_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
-{
-   util_format_dxtn_rgb_unpack_rgba_float(dst_row, dst_stride,
                                           src_row, src_stride,
-                                          width, height,
+   util_format_dxt5_rgba_fetch_rgba_8unorm(dst, src, i, j);
-                                          util_format_dxt1_rgba_fetch,
+}
 , TRUE);
-}
+void
-void
-util_format_dxt3_srgba_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+util_format_dxt1_srgb_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+{
-   util_format_dxtn_rgb_unpack_rgba_float(dst_row, dst_stride,
+   util_format_dxt1_rgb_unpack_rgba_float(dst_row, dst_stride, src_row, src_stride, width, height);
                                           src_row, src_stride,
-                                          width, height,
-                                          util_format_dxt3_rgba_fetch,
-, TRUE);
 void
 util_format_dxt1_srgb_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height)
-void
+{
-util_format_dxt5_srgba_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+   util_format_dxt1_rgb_pack_rgba_float(dst_row, dst_stride, src_row, src_stride, width, height);
-{
+}
-   util_format_dxtn_rgb_unpack_rgba_float(dst_row, dst_stride,
-                                          src_row, src_stride,
                                           width, height,
-                                          util_format_dxt5_rgba_fetch,
+void
-, TRUE);
+util_format_dxt1_srgb_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j)
+{
+   util_format_dxt1_rgb_fetch_rgba_float(dst, src, i, j);
-void
-util_format_dxt1_srgb_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+}
    util_format_dxtn_pack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride,
-                                     width, height, UTIL_FORMAT_DXT1_RGB,
+void
-, TRUE);
+util_format_dxt1_srgba_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
-}
+{
-void
-util_format_dxt1_srgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+   util_format_dxt1_rgba_unpack_rgba_float(dst_row, dst_stride, src_row, src_stride, width, height);
+}
-   util_format_dxtn_pack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride,
-                                     width, height, UTIL_FORMAT_DXT1_RGBA,
+void
-, TRUE);
+util_format_dxt1_srgba_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height)
-}
 void
-util_format_dxt3_srgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+   util_format_dxt1_rgba_pack_rgba_float(dst_row, dst_stride, src_row, src_stride, width, height);
-{
+}
    util_format_dxtn_pack_rgba_8unorm(dst_row, dst_stride, src_row, src_stride,
-                                     width, height, UTIL_FORMAT_DXT3_RGBA,
+void
-, TRUE);
-}
 util_format_dxt1_srgba_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j)

Subversion Repositories Kolibri OS

(root)/contrib/sdk/sources/Mesa/src/gallium/auxiliary/util/u_format_s3tc.c – Rev 4358 → 5063