From: Marek Olšák <marek.ol...@amd.com>
The renaming was driven by the function st_mesa_format_to_pipe_format.
Only whole words are renamed to prevent regressions.
For the MESA formats which don't have corresponding PIPE formats, I tried
to follow the PIPE_FORMAT_* conventions except for a few REV packed formats,
whose renaming is left for a future patch.
---
NOTE: Only main/formats.h is shown in this diff. The rest is pretty boring.
All drivers compile successfully. Here's the whole patch:
http://cgit.freedesktop.org/~mareko/mesa/commit/?id=17ca34394517c91e57df1f99798ad0695fa1e27f
include/GL/internal/dri_interface.h | 2 +-
src/gallium/state_trackers/dri/common/dri_screen.c | 6 +-
src/mesa/drivers/dri/common/dri_util.c | 40 +-
src/mesa/drivers/dri/common/utils.c | 22 +-
src/mesa/drivers/dri/i915/i830_texstate.c | 34 +-
src/mesa/drivers/dri/i915/i830_vtbl.c | 20 +-
src/mesa/drivers/dri/i915/i915_context.c | 38 +-
src/mesa/drivers/dri/i915/i915_texstate.c | 52 +-
src/mesa/drivers/dri/i915/i915_vtbl.c | 20 +-
src/mesa/drivers/dri/i915/intel_blit.c | 24 +-
src/mesa/drivers/dri/i915/intel_fbo.c | 4 +-
src/mesa/drivers/dri/i915/intel_pixel_bitmap.c | 6 +-
src/mesa/drivers/dri/i915/intel_screen.c | 24 +-
src/mesa/drivers/dri/i915/intel_tex_image.c | 6 +-
src/mesa/drivers/dri/i965/brw_blorp.cpp | 10 +-
src/mesa/drivers/dri/i965/brw_blorp.h | 4 +-
src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 16 +-
src/mesa/drivers/dri/i965/brw_clear.c | 6 +-
src/mesa/drivers/dri/i965/brw_context.c | 4 +-
src/mesa/drivers/dri/i965/brw_misc_state.c | 18 +-
src/mesa/drivers/dri/i965/brw_surface_formats.c | 396 +++---
src/mesa/drivers/dri/i965/brw_tex_layout.c | 8 +-
src/mesa/drivers/dri/i965/brw_wm.c | 2 +-
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +-
src/mesa/drivers/dri/i965/intel_blit.c | 12 +-
src/mesa/drivers/dri/i965/intel_fbo.c | 8 +-
src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 46 +-
src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 6 +-
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 6 +-
src/mesa/drivers/dri/i965/intel_screen.c | 30 +-
src/mesa/drivers/dri/i965/intel_tex_image.c | 6 +-
src/mesa/drivers/dri/i965/intel_tex_subimage.c | 6 +-
src/mesa/drivers/dri/nouveau/nouveau_fbo.c | 10 +-
src/mesa/drivers/dri/nouveau/nouveau_screen.c | 6 +-
src/mesa/drivers/dri/nouveau/nouveau_texture.c | 34 +-
src/mesa/drivers/dri/nouveau/nouveau_util.h | 20 +-
src/mesa/drivers/dri/nouveau/nv04_context.c | 6 +-
src/mesa/drivers/dri/nouveau/nv04_state_fb.c | 6 +-
src/mesa/drivers/dri/nouveau/nv04_state_frag.c | 6 +-
src/mesa/drivers/dri/nouveau/nv04_state_raster.c | 2 +-
src/mesa/drivers/dri/nouveau/nv04_state_tex.c | 16 +-
src/mesa/drivers/dri/nouveau/nv04_surface.c | 168 +--
src/mesa/drivers/dri/nouveau/nv10_state_fb.c | 10 +-
src/mesa/drivers/dri/nouveau/nv10_state_frag.c | 8 +-
src/mesa/drivers/dri/nouveau/nv10_state_tex.c | 38 +-
src/mesa/drivers/dri/nouveau/nv10_state_tnl.c | 2 +-
src/mesa/drivers/dri/nouveau/nv20_state_fb.c | 12 +-
src/mesa/drivers/dri/nouveau/nv20_state_tex.c | 40 +-
src/mesa/drivers/dri/nouveau/nv20_state_tnl.c | 2 +-
src/mesa/drivers/dri/r200/r200_blit.c | 82 +-
src/mesa/drivers/dri/r200/r200_state_init.c | 6 +-
src/mesa/drivers/dri/r200/r200_texstate.c | 100 +-
src/mesa/drivers/dri/radeon/radeon_blit.c | 52 +-
src/mesa/drivers/dri/radeon/radeon_fbo.c | 16 +-
src/mesa/drivers/dri/radeon/radeon_pixel_read.c | 18 +-
src/mesa/drivers/dri/radeon/radeon_screen.c | 30 +-
src/mesa/drivers/dri/radeon/radeon_state_init.c | 6 +-
src/mesa/drivers/dri/radeon/radeon_tex_copy.c | 12 +-
src/mesa/drivers/dri/radeon/radeon_texstate.c | 62 +-
src/mesa/drivers/dri/radeon/radeon_texture.c | 84 +-
src/mesa/drivers/dri/swrast/swrast.c | 20 +-
src/mesa/drivers/haiku/swrast/SoftwareRast.cpp | 10 +-
src/mesa/drivers/osmesa/osmesa.c | 38 +-
src/mesa/drivers/x11/xm_buffer.c | 10 +-
src/mesa/main/accum.c | 8 +-
src/mesa/main/debug.c | 18 +-
src/mesa/main/fbobject.c | 8 +-
src/mesa/main/format_pack.c | 752 +++++-----
src/mesa/main/format_unpack.c | 558 ++++----
src/mesa/main/formats.c | 1440 ++++++++++----------
src/mesa/main/formats.h | 342 ++---
src/mesa/main/framebuffer.c | 6 +-
src/mesa/main/readpix.c | 8 +-
src/mesa/main/texcompress.c | 96 +-
src/mesa/main/texcompress_etc.c | 6 +-
src/mesa/main/texcompress_rgtc.c | 32 +-
src/mesa/main/texcompress_s3tc.c | 32 +-
src/mesa/main/texformat.c | 614 ++++-----
src/mesa/main/texgetimage.c | 4 +-
src/mesa/main/teximage.c | 146 +-
src/mesa/main/texobj.c | 2 +-
src/mesa/main/texparam.c | 2 +-
src/mesa/main/texstore.c | 740 +++++-----
src/mesa/state_tracker/st_format.c | 616 ++++-----
src/mesa/swrast/s_blit.c | 2 +-
src/mesa/swrast/s_depth.c | 44 +-
src/mesa/swrast/s_drawpix.c | 14 +-
src/mesa/swrast/s_renderbuffer.c | 18 +-
src/mesa/swrast/s_stencil.c | 8 +-
src/mesa/swrast/s_texfetch.c | 330 ++---
src/mesa/swrast/s_texfetch_tmp.h | 136 +-
src/mesa/swrast/s_texfilter.c | 16 +-
src/mesa/swrast/s_triangle.c | 38 +-
93 files changed, 3926 insertions(+), 3926 deletions(-)
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index 64b4b9a..8df6d4c 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -67,66 +67,66 @@ typedef enum
/*@{*/
/* msb <------ TEXEL BITS -----------> lsb */
/* ---- ---- ---- ---- ---- ---- ---- ---- */
- MESA_FORMAT_RGBA8888, /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
- 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_ARGB8888_REV, /* BBBB BBBB GGGG GGGG RRRR RRRR AAAA AAAA */
- MESA_FORMAT_RGBX8888, /* RRRR RRRR GGGG GGGG BBBB BBBB XXXX XXXX */
- MESA_FORMAT_RGBX8888_REV, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
- MESA_FORMAT_XRGB8888, /* xxxx xxxx RRRR RRRR GGGG GGGG BBBB BBBB */
- MESA_FORMAT_XRGB8888_REV, /* BBBB BBBB GGGG GGGG RRRR RRRR xxxx xxxx */
- 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_ABGR8888_UNORM, /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
+ MESA_FORMAT_RGBA8888_UNORM, /* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_BGRA8888_UNORM, /* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
+ MESA_FORMAT_ARGB8888_UNORM, /* BBBB BBBB GGGG GGGG RRRR RRRR AAAA AAAA */
+ MESA_FORMAT_XBGR8888_UNORM, /* RRRR RRRR GGGG GGGG BBBB BBBB XXXX XXXX */
+ MESA_FORMAT_RGBX8888_UNORM, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_BGRX8888_UNORM, /* xxxx xxxx RRRR RRRR GGGG GGGG BBBB BBBB */
+ MESA_FORMAT_XRGB8888_UNORM, /* BBBB BBBB GGGG GGGG RRRR RRRR xxxx xxxx */
+ MESA_FORMAT_B8G8R8_UNORM, /* RRRR RRRR GGGG GGGG BBBB BBBB */
+ MESA_FORMAT_R8G8B8_UNORM, /* BBBB BBBB GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_B5G6R5_UNORM, /* RRRR RGGG GGGB BBBB */
MESA_FORMAT_RGB565_REV, /* GGGB BBBB RRRR RGGG */
- MESA_FORMAT_ARGB4444, /* AAAA RRRR GGGG BBBB */
+ MESA_FORMAT_B4G4R4A4_UNORM, /* AAAA RRRR GGGG BBBB */
MESA_FORMAT_ARGB4444_REV, /* GGGG BBBB AAAA RRRR */
- MESA_FORMAT_RGBA5551, /* RRRR RGGG GGBB BBBA */
- MESA_FORMAT_ARGB1555, /* ARRR RRGG GGGB BBBB */
+ MESA_FORMAT_A1B5G5R5_UNORM, /* RRRR RGGG GGBB BBBA */
+ MESA_FORMAT_B5G5R5A1_UNORM, /* ARRR RRGG GGGB BBBB */
MESA_FORMAT_ARGB1555_REV, /* GGGB BBBB ARRR RRGG */
- MESA_FORMAT_AL44, /* AAAA LLLL */
- MESA_FORMAT_AL88, /* AAAA AAAA LLLL LLLL */
- MESA_FORMAT_AL88_REV, /* LLLL LLLL AAAA AAAA */
- MESA_FORMAT_AL1616, /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */
- MESA_FORMAT_AL1616_REV, /* LLLL LLLL LLLL LLLL AAAA AAAA AAAA AAAA */
- MESA_FORMAT_RGB332, /* RRRG GGBB */
- MESA_FORMAT_A8, /* AAAA AAAA */
- MESA_FORMAT_A16, /* AAAA AAAA AAAA AAAA */
- MESA_FORMAT_L8, /* LLLL LLLL */
- MESA_FORMAT_L16, /* LLLL LLLL LLLL LLLL */
- MESA_FORMAT_I8, /* IIII IIII */
- MESA_FORMAT_I16, /* IIII IIII IIII IIII */
- MESA_FORMAT_YCBCR, /* YYYY YYYY UorV UorV */
- MESA_FORMAT_YCBCR_REV, /* UorV UorV YYYY YYYY */
- MESA_FORMAT_R8, /* RRRR RRRR */
- MESA_FORMAT_GR88, /* GGGG GGGG RRRR RRRR */
- MESA_FORMAT_RG88, /* RRRR RRRR GGGG GGGG */
- MESA_FORMAT_R16, /* RRRR RRRR RRRR RRRR */
- MESA_FORMAT_GR1616, /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
- MESA_FORMAT_RG1616, /* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */
- MESA_FORMAT_ARGB2101010, /* AARR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */
- MESA_FORMAT_Z24_S8, /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */
- MESA_FORMAT_S8_Z24, /* SSSS SSSS ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
- MESA_FORMAT_Z16, /* ZZZZ ZZZZ ZZZZ ZZZZ */
- MESA_FORMAT_X8_Z24, /* xxxx xxxx ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
- MESA_FORMAT_Z24_X8, /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ xxxx xxxx */
- MESA_FORMAT_Z32, /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
- MESA_FORMAT_S8, /* SSSS SSSS */
+ MESA_FORMAT_L4A4_UNORM, /* AAAA LLLL */
+ MESA_FORMAT_L8A8_UNORM, /* AAAA AAAA LLLL LLLL */
+ MESA_FORMAT_A8L8_UNORM, /* LLLL LLLL AAAA AAAA */
+ MESA_FORMAT_L16A16_UNORM, /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */
+ MESA_FORMAT_A16L16_UNORM, /* LLLL LLLL LLLL LLLL AAAA AAAA AAAA AAAA */
+ MESA_FORMAT_B2G3R3_UNORM, /* RRRG GGBB */
+ MESA_FORMAT_A8_UNORM, /* AAAA AAAA */
+ MESA_FORMAT_A16_UNORM, /* AAAA AAAA AAAA AAAA */
+ MESA_FORMAT_L8_UNORM, /* LLLL LLLL */
+ MESA_FORMAT_L16_UNORM, /* LLLL LLLL LLLL LLLL */
+ MESA_FORMAT_I8_UNORM, /* IIII IIII */
+ MESA_FORMAT_I16_UNORM, /* IIII IIII IIII IIII */
+ MESA_FORMAT_UYVY, /* YYYY YYYY UorV UorV */
+ MESA_FORMAT_YUYV, /* UorV UorV YYYY YYYY */
+ MESA_FORMAT_R8_UNORM, /* RRRR RRRR */
+ MESA_FORMAT_R8G8_UNORM, /* GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_G8R8_UNORM, /* RRRR RRRR GGGG GGGG */
+ MESA_FORMAT_R16_UNORM, /* RRRR RRRR RRRR RRRR */
+ MESA_FORMAT_R16G16_UNORM, /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
+ MESA_FORMAT_G16R16_UNORM, /* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */
+ MESA_FORMAT_B10G10R10A2_UNORM, /* AARR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */
+ MESA_FORMAT_S8_UINT_Z24_UNORM, /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */
+ MESA_FORMAT_Z24_UNORM_S8_UINT, /* SSSS SSSS ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
+ MESA_FORMAT_Z16_UNORM, /* ZZZZ ZZZZ ZZZZ ZZZZ */
+ MESA_FORMAT_Z24X8_UNORM, /* xxxx xxxx ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
+ MESA_FORMAT_X8Z24_UNORM, /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ xxxx xxxx */
+ MESA_FORMAT_Z32_UNORM, /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
+ MESA_FORMAT_S8_UINT, /* SSSS SSSS */
/*@}*/
/**
* \name 8-bit/channel sRGB formats
*/
/*@{*/
- MESA_FORMAT_SRGB8, /* RRRR RRRR GGGG GGGG BBBB BBBB */
- MESA_FORMAT_SRGBA8, /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
- MESA_FORMAT_SARGB8, /* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
- MESA_FORMAT_SL8, /* LLLL LLLL */
- MESA_FORMAT_SLA8, /* AAAA AAAA LLLL LLLL */
- MESA_FORMAT_SRGB_DXT1,
- MESA_FORMAT_SRGBA_DXT1,
- MESA_FORMAT_SRGBA_DXT3,
- MESA_FORMAT_SRGBA_DXT5,
+ MESA_FORMAT_R8G8B8_SRGB, /* RRRR RRRR GGGG GGGG BBBB BBBB */
+ MESA_FORMAT_A8B8G8R8_SRGB, /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
+ MESA_FORMAT_B8G8R8A8_SRGB, /* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
+ MESA_FORMAT_L8_SRGB, /* LLLL LLLL */
+ MESA_FORMAT_L8A8_SRGB, /* AAAA AAAA LLLL LLLL */
+ MESA_FORMAT_DXT1_SRGB,
+ MESA_FORMAT_DXT1_SRGBA,
+ MESA_FORMAT_DXT3_SRGBA,
+ MESA_FORMAT_DXT5_SRGBA,
/*@}*/
/**
@@ -135,32 +135,32 @@ typedef enum
/*@{*/
MESA_FORMAT_RGB_FXT1,
MESA_FORMAT_RGBA_FXT1,
- MESA_FORMAT_RGB_DXT1,
- MESA_FORMAT_RGBA_DXT1,
- MESA_FORMAT_RGBA_DXT3,
- MESA_FORMAT_RGBA_DXT5,
+ MESA_FORMAT_DXT1_RGB,
+ MESA_FORMAT_DXT1_RGBA,
+ MESA_FORMAT_DXT3_RGBA,
+ MESA_FORMAT_DXT5_RGBA,
/*@}*/
/**
* \name Floating point texture formats.
*/
/*@{*/
- MESA_FORMAT_RGBA_FLOAT32,
- MESA_FORMAT_RGBA_FLOAT16,
- MESA_FORMAT_RGB_FLOAT32,
- MESA_FORMAT_RGB_FLOAT16,
- MESA_FORMAT_ALPHA_FLOAT32,
- MESA_FORMAT_ALPHA_FLOAT16,
- MESA_FORMAT_LUMINANCE_FLOAT32,
- MESA_FORMAT_LUMINANCE_FLOAT16,
- MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
- MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
- MESA_FORMAT_INTENSITY_FLOAT32,
- MESA_FORMAT_INTENSITY_FLOAT16,
- MESA_FORMAT_R_FLOAT32,
- MESA_FORMAT_R_FLOAT16,
- MESA_FORMAT_RG_FLOAT32,
- MESA_FORMAT_RG_FLOAT16,
+ MESA_FORMAT_R32G32B32A32_FLOAT,
+ MESA_FORMAT_R16G16B16A16_FLOAT,
+ MESA_FORMAT_R32G32B32_FLOAT,
+ MESA_FORMAT_R16G16B16_FLOAT,
+ MESA_FORMAT_A32_FLOAT,
+ MESA_FORMAT_A16_FLOAT,
+ MESA_FORMAT_L32_FLOAT,
+ MESA_FORMAT_L16_FLOAT,
+ MESA_FORMAT_L32A32_FLOAT,
+ MESA_FORMAT_L16A16_FLOAT,
+ MESA_FORMAT_I32_FLOAT,
+ MESA_FORMAT_I16_FLOAT,
+ MESA_FORMAT_R32_FLOAT,
+ MESA_FORMAT_R16_FLOAT,
+ MESA_FORMAT_R32G32_FLOAT,
+ MESA_FORMAT_R16G16_FLOAT,
/*@}*/
/**
@@ -168,62 +168,62 @@ typedef enum
* XXX Note: these are just stand-ins for some better hardware
* formats TBD such as BGRA or ARGB.
*/
- MESA_FORMAT_ALPHA_UINT8,
- MESA_FORMAT_ALPHA_UINT16,
- MESA_FORMAT_ALPHA_UINT32,
- MESA_FORMAT_ALPHA_INT8,
- MESA_FORMAT_ALPHA_INT16,
- MESA_FORMAT_ALPHA_INT32,
-
- MESA_FORMAT_INTENSITY_UINT8,
- MESA_FORMAT_INTENSITY_UINT16,
- MESA_FORMAT_INTENSITY_UINT32,
- MESA_FORMAT_INTENSITY_INT8,
- MESA_FORMAT_INTENSITY_INT16,
- MESA_FORMAT_INTENSITY_INT32,
-
- MESA_FORMAT_LUMINANCE_UINT8,
- MESA_FORMAT_LUMINANCE_UINT16,
- MESA_FORMAT_LUMINANCE_UINT32,
- MESA_FORMAT_LUMINANCE_INT8,
- MESA_FORMAT_LUMINANCE_INT16,
- MESA_FORMAT_LUMINANCE_INT32,
-
- MESA_FORMAT_LUMINANCE_ALPHA_UINT8,
- MESA_FORMAT_LUMINANCE_ALPHA_UINT16,
- MESA_FORMAT_LUMINANCE_ALPHA_UINT32,
- MESA_FORMAT_LUMINANCE_ALPHA_INT8,
- MESA_FORMAT_LUMINANCE_ALPHA_INT16,
- MESA_FORMAT_LUMINANCE_ALPHA_INT32,
-
- MESA_FORMAT_R_INT8,
- MESA_FORMAT_RG_INT8,
- MESA_FORMAT_RGB_INT8,
- MESA_FORMAT_RGBA_INT8,
- MESA_FORMAT_R_INT16,
- MESA_FORMAT_RG_INT16,
- MESA_FORMAT_RGB_INT16,
- MESA_FORMAT_RGBA_INT16,
- MESA_FORMAT_R_INT32,
- MESA_FORMAT_RG_INT32,
- MESA_FORMAT_RGB_INT32,
- MESA_FORMAT_RGBA_INT32,
+ MESA_FORMAT_A8_UINT,
+ MESA_FORMAT_A16_UINT,
+ MESA_FORMAT_A32_UINT,
+ MESA_FORMAT_A8_SINT,
+ MESA_FORMAT_A16_SINT,
+ MESA_FORMAT_A32_SINT,
+
+ MESA_FORMAT_I8_UINT,
+ MESA_FORMAT_I16_UINT,
+ MESA_FORMAT_I32_UINT,
+ MESA_FORMAT_I8_SINT,
+ MESA_FORMAT_I16_SINT,
+ MESA_FORMAT_I32_SINT,
+
+ MESA_FORMAT_L8_UINT,
+ MESA_FORMAT_L16_UINT,
+ MESA_FORMAT_L32_UINT,
+ MESA_FORMAT_L8_SINT,
+ MESA_FORMAT_L16_SINT,
+ MESA_FORMAT_L32_SINT,
+
+ MESA_FORMAT_L8A8_UINT,
+ MESA_FORMAT_L16A16_UINT,
+ MESA_FORMAT_L32A32_UINT,
+ MESA_FORMAT_L8A8_SINT,
+ MESA_FORMAT_L16A16_SINT,
+ MESA_FORMAT_L32A32_SINT,
+
+ MESA_FORMAT_R8_SINT,
+ MESA_FORMAT_R8G8_SINT,
+ MESA_FORMAT_R8G8B8_SINT,
+ MESA_FORMAT_R8G8B8A8_SINT,
+ MESA_FORMAT_R16_SINT,
+ MESA_FORMAT_R16G16_SINT,
+ MESA_FORMAT_R16G16B16_SINT,
+ MESA_FORMAT_R16G16B16A16_SINT,
+ MESA_FORMAT_R32_SINT,
+ MESA_FORMAT_R32G32_SINT,
+ MESA_FORMAT_R32G32B32_SINT,
+ MESA_FORMAT_R32G32B32A32_SINT,
/**
* \name Non-normalized unsigned integer formats.
*/
- MESA_FORMAT_R_UINT8,
- MESA_FORMAT_RG_UINT8,
- MESA_FORMAT_RGB_UINT8,
- MESA_FORMAT_RGBA_UINT8,
- MESA_FORMAT_R_UINT16,
- MESA_FORMAT_RG_UINT16,
- MESA_FORMAT_RGB_UINT16,
- MESA_FORMAT_RGBA_UINT16,
- MESA_FORMAT_R_UINT32,
- MESA_FORMAT_RG_UINT32,
- MESA_FORMAT_RGB_UINT32,
- MESA_FORMAT_RGBA_UINT32,
+ MESA_FORMAT_R8_UINT,
+ MESA_FORMAT_R8G8_UINT,
+ MESA_FORMAT_R8G8B8_UINT,
+ MESA_FORMAT_R8G8B8A8_UINT,
+ MESA_FORMAT_R16_UINT,
+ MESA_FORMAT_R16G16_UINT,
+ MESA_FORMAT_R16G16B16_UINT,
+ MESA_FORMAT_R16G16B16A16_UINT,
+ MESA_FORMAT_R32_UINT,
+ MESA_FORMAT_R32G32_UINT,
+ MESA_FORMAT_R32G32B32_UINT,
+ MESA_FORMAT_R32G32B32A32_UINT,
/* msb <------ TEXEL BITS -----------> lsb */
/* ---- ---- ---- ---- ---- ---- ---- ---- */
@@ -232,30 +232,30 @@ typedef enum
*/
/*@{*/
MESA_FORMAT_DUDV8, /* DUDU DUDU DVDV DVDV */
- MESA_FORMAT_SIGNED_R8, /* RRRR RRRR */
- MESA_FORMAT_SIGNED_RG88_REV, /* GGGG GGGG RRRR RRRR */
- MESA_FORMAT_SIGNED_RGBX8888, /* RRRR RRRR GGGG GGGG BBBB BBBB xxxx xxxx */
- MESA_FORMAT_SIGNED_RGBA8888, /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
- MESA_FORMAT_SIGNED_RGBA8888_REV,/*AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
- MESA_FORMAT_SIGNED_R16, /* RRRR RRRR RRRR RRRR */
- MESA_FORMAT_SIGNED_GR1616, /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
- MESA_FORMAT_SIGNED_RGB_16, /* ushort[0]=R, ushort[1]=G, ushort[2]=B */
- MESA_FORMAT_SIGNED_RGBA_16, /* ... */
- MESA_FORMAT_RGBA_16, /* ... */
+ MESA_FORMAT_R8_SNORM, /* RRRR RRRR */
+ MESA_FORMAT_R8G8_SNORM, /* GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_X8B8G8R8_SNORM, /* RRRR RRRR GGGG GGGG BBBB BBBB xxxx xxxx */
+ MESA_FORMAT_A8B8G8R8_SNORM, /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
+ MESA_FORMAT_R8G8B8A8_SNORM, /* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_R16_SNORM, /* RRRR RRRR RRRR RRRR */
+ MESA_FORMAT_R16G16_SNORM, /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
+ MESA_FORMAT_R16G16B16_SNORM, /* ushort[0]=R, ushort[1]=G, ushort[2]=B */
+ MESA_FORMAT_R16G16B16A16_SNORM,/* ... */
+ MESA_FORMAT_R16G16B16A16_UNORM,/* ... */
/*@}*/
/*@{*/
- MESA_FORMAT_RED_RGTC1,
- MESA_FORMAT_SIGNED_RED_RGTC1,
- MESA_FORMAT_RG_RGTC2,
- MESA_FORMAT_SIGNED_RG_RGTC2,
+ MESA_FORMAT_RGTC1_UNORM,
+ MESA_FORMAT_RGTC1_SNORM,
+ MESA_FORMAT_RGTC2_UNORM,
+ MESA_FORMAT_RGTC2_SNORM,
/*@}*/
/*@{*/
- MESA_FORMAT_L_LATC1,
- MESA_FORMAT_SIGNED_L_LATC1,
- MESA_FORMAT_LA_LATC2,
- MESA_FORMAT_SIGNED_LA_LATC2,
+ MESA_FORMAT_LATC1_UNORM,
+ MESA_FORMAT_LATC1_SNORM,
+ MESA_FORMAT_LATC2_UNORM,
+ MESA_FORMAT_LATC2_SNORM,
/*@}*/
MESA_FORMAT_ETC1_RGB8,
@@ -270,39 +270,39 @@ typedef enum
MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1,
MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1,
- MESA_FORMAT_SIGNED_A8, /* AAAA AAAA */
- MESA_FORMAT_SIGNED_L8, /* LLLL LLLL */
- MESA_FORMAT_SIGNED_AL88, /* AAAA AAAA LLLL LLLL */
- MESA_FORMAT_SIGNED_I8, /* IIII IIII */
- MESA_FORMAT_SIGNED_A16, /* AAAA AAAA AAAA AAAA */
- MESA_FORMAT_SIGNED_L16, /* LLLL LLLL LLLL LLLL */
- MESA_FORMAT_SIGNED_AL1616, /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */
- MESA_FORMAT_SIGNED_I16, /* IIII IIII IIII IIII */
+ MESA_FORMAT_A8_SNORM, /* AAAA AAAA */
+ MESA_FORMAT_L8_SNORM, /* LLLL LLLL */
+ MESA_FORMAT_L8A8_SNORM, /* AAAA AAAA LLLL LLLL */
+ MESA_FORMAT_I8_SNORM, /* IIII IIII */
+ MESA_FORMAT_A16_SNORM, /* AAAA AAAA AAAA AAAA */
+ MESA_FORMAT_L16_SNORM, /* LLLL LLLL LLLL LLLL */
+ MESA_FORMAT_L16A16_SNORM, /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */
+ MESA_FORMAT_I16_SNORM, /* IIII IIII IIII IIII */
- MESA_FORMAT_RGB9_E5_FLOAT,
- MESA_FORMAT_R11_G11_B10_FLOAT,
+ MESA_FORMAT_R9G9B9E5_FLOAT,
+ MESA_FORMAT_R11G11B10_FLOAT,
MESA_FORMAT_Z32_FLOAT,
- MESA_FORMAT_Z32_FLOAT_X24S8,
-
- MESA_FORMAT_ARGB2101010_UINT,
- MESA_FORMAT_ABGR2101010_UINT,
-
- MESA_FORMAT_XRGB4444_UNORM, /* xxxx RRRR GGGG BBBB */
- MESA_FORMAT_XRGB1555_UNORM, /* xRRR RRGG GGGB BBBB */
- MESA_FORMAT_XBGR8888_SNORM, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
- MESA_FORMAT_XBGR8888_SRGB, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
- MESA_FORMAT_XBGR8888_UINT, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
- MESA_FORMAT_XBGR8888_SINT, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
- MESA_FORMAT_XRGB2101010_UNORM, /* xxRR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */
- MESA_FORMAT_XBGR16161616_UNORM,/* ushort[3]=x, [2]=B, [1]=G, [0]=R */
- MESA_FORMAT_XBGR16161616_SNORM,/* ... */
- MESA_FORMAT_XBGR16161616_FLOAT,/* ... */
- MESA_FORMAT_XBGR16161616_UINT, /* ... */
- MESA_FORMAT_XBGR16161616_SINT, /* ... */
- MESA_FORMAT_XBGR32323232_FLOAT,/* float[3]=x, [2]=B, [1]=G, [0]=R */
- MESA_FORMAT_XBGR32323232_UINT, /* ... */
- MESA_FORMAT_XBGR32323232_SINT, /* ... */
+ MESA_FORMAT_Z32_FLOAT_S8X24_UINT,
+
+ MESA_FORMAT_B10G10R10A2_UINT,
+ MESA_FORMAT_R10G10B10A2_UINT,
+
+ MESA_FORMAT_B4G4R4X4_UNORM, /* xxxx RRRR GGGG BBBB */
+ MESA_FORMAT_B5G5R5X1_UNORM, /* xRRR RRGG GGGB BBBB */
+ MESA_FORMAT_R8G8B8X8_SNORM, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_R8G8B8X8_SRGB, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_R8G8B8X8_UINT, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_R8G8B8X8_SINT, /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
+ MESA_FORMAT_B10G10R10X2_UNORM, /* xxRR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */
+ MESA_FORMAT_R16G16B16X16_UNORM,/* ushort[3]=x, [2]=B, [1]=G, [0]=R */
+ MESA_FORMAT_R16G16B16X16_SNORM,/* ... */
+ MESA_FORMAT_R16G16B16X16_FLOAT,/* ... */
+ MESA_FORMAT_R16G16B16X16_UINT, /* ... */
+ MESA_FORMAT_R16G16B16X16_SINT, /* ... */
+ MESA_FORMAT_R32G32B32X32_FLOAT,/* float[3]=x, [2]=B, [1]=G, [0]=R */
+ MESA_FORMAT_R32G32B32X32_UINT, /* ... */
+ MESA_FORMAT_R32G32B32X32_SINT, /* ... */
MESA_FORMAT_COUNT
} gl_format;
--
1.8.3.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
