Fix pow <small> and a very stypid bug with dummy srcs(0 equals to tmp0.x)</small...

[mesa.git] / src / mesa / main / texformat.h

diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index c785d107e6c807c0dc07c77006a13b8c0a8d5c95..63f524bbe13ae673735ba5313899d75e7f87d2de 100644 (file)
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -34,8 +34,6 @@
 #ifndef TEXFORMAT_H
 #define TEXFORMAT_H
 
-#define NEWTEXSTORE 1
-
 
 #include "mtypes.h"
 
@@ -54,8 +52,7 @@ enum _format {
     * Drivers can override the default formats and convert texture images to
     * one of these as required.  The driver's
     * dd_function_table::ChooseTextureFormat function will choose one of these
-    * formats.  These formats are all little endian, as shown below.  They will
-    * be most useful for x86-based PC graphics card drivers.
+    * formats.
     *
     * \note In the default case, some of these formats will be duplicates of
     * the generic formats listed below.  However, these formats guarantee their
@@ -66,27 +63,27 @@ enum _format {
                                /* msb <------ TEXEL BITS -----------> lsb */
                                /* ---- ---- ---- ---- ---- ---- ---- ---- */
    MESA_FORMAT_RGBA8888,       /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
-   MESA_FORMAT_ABGR8888,       /* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
+   MESA_FORMAT_RGBA8888_REV,   /* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
    MESA_FORMAT_ARGB8888,       /* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
-   MESA_FORMAT_BGRA8888,       /* BBBB BBBB GGGG GGGG RRRR RRRR AAAA AAAA */
+   MESA_FORMAT_ARGB8888_REV,   /* BBBB BBBB GGGG GGGG RRRR RRRR AAAA AAAA */
    MESA_FORMAT_RGB888,         /*           RRRR RRRR GGGG GGGG BBBB BBBB */
    MESA_FORMAT_BGR888,         /*           BBBB BBBB GGGG GGGG RRRR RRRR */
    MESA_FORMAT_RGB565,         /*                     RRRR RGGG GGGB BBBB */
-   MESA_FORMAT_BGR565,         /*                     BBBB BGGG GGGR RRRR */
+   MESA_FORMAT_RGB565_REV,     /*                     GGGB BBBB RRRR RGGG */
    MESA_FORMAT_ARGB4444,       /*                     AAAA RRRR GGGG BBBB */
-   MESA_FORMAT_BGRA4444,       /*                     AAAA RRRR GGGG BBBB */
+   MESA_FORMAT_ARGB4444_REV,   /*                     GGGG BBBB AAAA RRRR */
    MESA_FORMAT_ARGB1555,       /*                     ARRR RRGG GGGB BBBB */
-   MESA_FORMAT_BGRA5551,       /*                     BBBB BGGG GGRR RRRA */
+   MESA_FORMAT_ARGB1555_REV,   /*                     GGGB BBBB ARRR RRGG */
    MESA_FORMAT_AL88,           /*                     AAAA AAAA LLLL LLLL */
-   MESA_FORMAT_LA88,           /*                     LLLL LLLL AAAA AAAA */
+   MESA_FORMAT_AL88_REV,       /*                     LLLL LLLL AAAA AAAA */
    MESA_FORMAT_RGB332,         /*                               RRRG GGBB */
-   MESA_FORMAT_BGR233,         /*                               BBGG GRRR */
    MESA_FORMAT_A8,             /*                               AAAA AAAA */
    MESA_FORMAT_L8,             /*                               LLLL LLLL */
    MESA_FORMAT_I8,             /*                               IIII IIII */
    MESA_FORMAT_CI8,            /*                               CCCC CCCC */
    MESA_FORMAT_YCBCR,          /*                     YYYY YYYY UorV UorV */
    MESA_FORMAT_YCBCR_REV,      /*                     UorV UorV YYYY YYYY */
+   MESA_FORMAT_Z24_S8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */
    /*@}*/
 
    /**
@@ -105,7 +102,7 @@ enum _format {
     * \name Generic GLchan-based formats.
     *
     * Software-oriented texture formats.  Texels are arrays of GLchan
-    * values so there will be no big/little endian issues.
+    * values so there are no byte order issues.
     *
     * \note Because these are based on the GLchan data type, one cannot assume
     * 8 bits per channel with these formats.  If you require GLubyte channels,
@@ -183,26 +180,25 @@ extern const struct gl_texture_format _mesa_texformat_intensity_float16;
 /** \name Assorted hardware-friendly formats */
 /*@{*/
 extern const struct gl_texture_format _mesa_texformat_rgba8888;
-extern const struct gl_texture_format _mesa_texformat_abgr8888;
+extern const struct gl_texture_format _mesa_texformat_rgba8888_rev;
 extern const struct gl_texture_format _mesa_texformat_argb8888;
-extern const struct gl_texture_format _mesa_texformat_bgra8888;
+extern const struct gl_texture_format _mesa_texformat_argb8888_rev;
 extern const struct gl_texture_format _mesa_texformat_rgb888;
 extern const struct gl_texture_format _mesa_texformat_bgr888;
 extern const struct gl_texture_format _mesa_texformat_rgb565;
-extern const struct gl_texture_format _mesa_texformat_bgr565;
+extern const struct gl_texture_format _mesa_texformat_rgb565_rev;
 extern const struct gl_texture_format _mesa_texformat_argb4444;
-extern const struct gl_texture_format _mesa_texformat_bgra4444;
+extern const struct gl_texture_format _mesa_texformat_argb4444_rev;
 extern const struct gl_texture_format _mesa_texformat_argb1555;
-extern const struct gl_texture_format _mesa_texformat_bgra5551;
+extern const struct gl_texture_format _mesa_texformat_argb1555_rev;
 extern const struct gl_texture_format _mesa_texformat_al88;
-extern const struct gl_texture_format _mesa_texformat_la88;
+extern const struct gl_texture_format _mesa_texformat_al88_rev;
 extern const struct gl_texture_format _mesa_texformat_rgb332;
-extern const struct gl_texture_format _mesa_texformat_bgr233;
 extern const struct gl_texture_format _mesa_texformat_a8;
 extern const struct gl_texture_format _mesa_texformat_l8;
 extern const struct gl_texture_format _mesa_texformat_i8;
 extern const struct gl_texture_format _mesa_texformat_ci8;
-
+extern const struct gl_texture_format _mesa_texformat_z24_s8;
 /*@}*/
 
 /** \name YCbCr formats */