[Mesa-dev] [V3 PATCH 0/8] mesa: Naming MESA_FORMATs to a specification

Mark Mueller markkmueller at gmail.com
Thu Jan 16 22:37:41 PST 2014


This series introduces a specification for 3 types of MESA_FORMAT names -
Type A (array formats), Type C (compressed formats), and Type P (packed
formats), and then performs a series of substitutions grouped by type. Builds
of all default gallium and DRI drivers were verified and no regressions
were observed w/piglit tests on the i965 driver.

The format_unpack functions were used to verify component orders, except
with some _REV formats, which appeared to be incorrect, but not used in
normal testing.

Mark Mueller (8):
 1 's/\bgl_format\b/mesa_format/g'. Use better name for Mesa Formats enum
 
 2 Change all 4 color component unsigned byte formats to meet spec:    
    s/MESA_FORMAT_RGBA8888\b/MESA_FORMAT_ABGR_UNORM8/g    
    s/MESA_FORMAT_RGBA8888_REV\b/MESA_FORMAT_RGBA_UNORM8/g    
    s/MESA_FORMAT_ARGB8888\b/MESA_FORMAT_BGRA_UNORM8/g    
    s/MESA_FORMAT_ARGB8888_REV\b/MESA_FORMAT_ARGB_UNORM8/g    
    s/MESA_FORMAT_RGBX8888\b/MESA_FORMAT_XBGR_UNORM8/g    
    s/MESA_FORMAT_RGBX8888_REV\b/MESA_FORMAT_RGBX_UNORM8/g    
    s/MESA_FORMAT_XRGB8888\b/MESA_FORMAT_BGRX_UNORM8/g    
    s/MESA_FORMAT_XRGB8888_REV\b/MESA_FORMAT_XRGB_UNORM8/g
    
 3 Update comments. Conversion of the following Type A formats:    
    s/MESA_FORMAT_RGB888\b/MESA_FORMAT_BGR_UNORM8/g    
    s/MESA_FORMAT_BGR888\b/MESA_FORMAT_RGB_UNORM8/g    
    s/MESA_FORMAT_AL88\b/MESA_FORMAT_LA_UNORM8/g    
    s/MESA_FORMAT_AL88_REV\b/MESA_FORMAT_AL_UNORM8/g    
    s/MESA_FORMAT_AL1616\b/MESA_FORMAT_LA_UNORM16/g    
    s/MESA_FORMAT_AL1616_REV\b/MESA_FORMAT_AL_UNORM16/g    
    s/MESA_FORMAT_A8\b/MESA_FORMAT_A_UNORM8/g    
    s/MESA_FORMAT_A16\b/MESA_FORMAT_A_UNORM16/g    
    s/MESA_FORMAT_L8\b/MESA_FORMAT_L_UNORM8/g    
    s/MESA_FORMAT_L16\b/MESA_FORMAT_L_UNORM16/g    
    s/MESA_FORMAT_I8\b/MESA_FORMAT_I_UNORM8/g    
    s/MESA_FORMAT_I16\b/MESA_FORMAT_I_UNORM16/g    
    s/MESA_FORMAT_R8\b/MESA_FORMAT_R_UNORM8/g    
    s/MESA_FORMAT_GR88\b/MESA_FORMAT_RG_UNORM8/g    
    s/MESA_FORMAT_RG88\b/MESA_FORMAT_GR_UNORM8/g    
    s/MESA_FORMAT_R16\b/MESA_FORMAT_R_UNORM16/g    
    s/MESA_FORMAT_GR1616\b/MESA_FORMAT_RG_UNORM16/g    
    s/MESA_FORMAT_RG1616\b/MESA_FORMAT_GR_UNORM16/g    
    s/MESA_FORMAT_Z16\b/MESA_FORMAT_Z_UNORM16/g    
    s/MESA_FORMAT_Z32\b/MESA_FORMAT_Z_UNORM32/g    
    s/MESA_FORMAT_S8\b/MESA_FORMAT_S_UINT8/g    
    s/MESA_FORMAT_SRGBA8\b/MESA_FORMAT_SABGR_UNORM8/g    
    s/MESA_FORMAT_SRGB8\b/MESA_FORMAT_SBGR_UNORM8/g    
    s/MESA_FORMAT_SARGB8\b/MESA_FORMAT_SBGRA_UNORM8/g    
    s/MESA_FORMAT_SL8\b/MESA_FORMAT_SL_UNORM8/g    
    s/MESA_FORMAT_SLA8\b/MESA_FORMAT_SLA_UNORM8/g    
    s/MESA_FORMAT_Z32_FLOAT\b/MESA_FORMAT_Z_FLOAT32/g
    
 4 Conversion of Type P formats as follows (w/related comment fixes):    
    s/\bMESA_FORMAT_RGB565\b/MESA_FORMAT_B5G6R5_UNORM/g    
    s/\bMESA_FORMAT_RGB565_REV\b/MESA_FORMAT_R5G6B5_UNORM/g    
    s/\bMESA_FORMAT_ARGB4444\b/MESA_FORMAT_B4G4R4A4_UNORM/g    
    s/\bMESA_FORMAT_ARGB4444_REV\b/MESA_FORMAT_A4R4G4B4_UNORM/g    
    s/\bMESA_FORMAT_RGBA5551\b/MESA_FORMAT_A1B5G5R5_UNORM/g    
    s/\bMESA_FORMAT_ARGB1555\b/MESA_FORMAT_B5G5R5A1_UNORM/g    
    s/\bMESA_FORMAT_ARGB1555_REV\b/MESA_FORMAT_A1R5G5B5_UNORM/g    
    s/\bMESA_FORMAT_AL44\b/MESA_FORMAT_L4A4_UNORM/g    
    s/\bMESA_FORMAT_RGB332\b/MESA_FORMAT_B2G3R3_UNORM/g    
    s/\bMESA_FORMAT_ARGB2101010\b/MESA_FORMAT_B10G10R10A2_UNORM/g    
    s/\bMESA_FORMAT_Z24_S8\b/MESA_FORMAT_S8_UINT_Z24_UNORM/g    
    s/\bMESA_FORMAT_S8_Z24\b/MESA_FORMAT_Z24_UNORM_S8_UINT/g    
    s/\bMESA_FORMAT_X8_Z24\b/MESA_FORMAT_Z24_UNORM_X8_UINT/g    
    s/\bMESA_FORMAT_Z24_X8\b/MESA_FORMAT_X8Z24_UNORM/g    
    s/\bMESA_FORMAT_RGB9_E5_FLOAT\b/MESA_FORMAT_R9G9B9E5_FLOAT/g    
    s/\bMESA_FORMAT_R11_G11_B10_FLOAT\b/MESA_FORMAT_R11G11B10_FLOAT/g   
    
    s/\bMESA_FORMAT_Z32_FLOAT_X24S8\b/MESA_FORMAT_Z32_FLOAT_S8X24_UINT/g
       
    s/\bMESA_FORMAT_ABGR2101010_UINT\b/MESA_FORMAT_R10G10B10A2_UINT/g   
     s/\bMESA_FORMAT_XRGB4444_UNORM\b/MESA_FORMAT_B4G4R4X4_UNORM/g    
    s/\bMESA_FORMAT_XRGB1555_UNORM\b/MESA_FORMAT_B5G5R5X1_UNORM/g    
    s/\bMESA_FORMAT_XRGB2101010_UNORM\b/MESA_FORMAT_B10G10R10X2_UNORM/g
    
 5 Compressed spelled out color components ALPHA, INTENSITY, and
    LUMINANCE to A, I, and L:    
    s/\bMESA_FORMAT_ALPHA_UINT8\b/MESA_FORMAT_A_UINT8/g    
    s/\bMESA_FORMAT_ALPHA_UINT16\b/MESA_FORMAT_A_UINT16/g    
    s/\bMESA_FORMAT_ALPHA_UINT32\b/MESA_FORMAT_A_UINT32/g    
    s/\bMESA_FORMAT_ALPHA_INT32\b/MESA_FORMAT_A_INT32/g    
    s/\bMESA_FORMAT_ALPHA_INT16\b/MESA_FORMAT_A_INT16/g    
    s/\bMESA_FORMAT_ALPHA_INT8\b/MESA_FORMAT_A_INT8/g    
    s/\bMESA_FORMAT_INTESITY_UINT8\b/MESA_FORMAT_I_UINT8/g    
    s/\bMESA_FORMAT_INTESITY_UINT16\b/MESA_FORMAT_I_UINT16/g    
    s/\bMESA_FORMAT_INTESITY_UINT32\b/MESA_FORMAT_I_UINT32/g    
    s/\bMESA_FORMAT_INTESITY_INT32\b/MESA_FORMAT_I_INT32/g    
    s/\bMESA_FORMAT_INTESITY_INT16\b/MESA_FORMAT_I_INT16/g    
    s/\bMESA_FORMAT_INTESITY_INT8\b/MESA_FORMAT_I_INT8/g    
    s/\bMESA_FORMAT_INTENSITY_UINT8\b/MESA_FORMAT_I_UINT8/g    
    s/\bMESA_FORMAT_INTENSITY_UINT16\b/MESA_FORMAT_I_UINT16/g    
    s/\bMESA_FORMAT_INTENSITY_UINT32\b/MESA_FORMAT_I_UINT32/g    
    s/\bMESA_FORMAT_INTENSITY_INT32\b/MESA_FORMAT_I_INT32/g    
    s/\bMESA_FORMAT_INTENSITY_INT16\b/MESA_FORMAT_I_INT16/g    
    s/\bMESA_FORMAT_INTENSITY_INT8\b/MESA_FORMAT_I_INT8/g    
    s/\bMESA_FORMAT_LUMINANCE_UINT8\b/MESA_FORMAT_L_UINT8/g    
    s/\bMESA_FORMAT_LUMINANCE_UINT16\b/MESA_FORMAT_L_UINT16/g    
    s/\bMESA_FORMAT_LUMINANCE_UINT32\b/MESA_FORMAT_L_UINT32/g    
    s/\bMESA_FORMAT_LUMINANCE_INT32\b/MESA_FORMAT_L_INT32/g    
    s/\bMESA_FORMAT_LUMINANCE_INT16\b/MESA_FORMAT_L_INT16/g    
    s/\bMESA_FORMAT_LUMINANCE_INT8\b/MESA_FORMAT_L_INT8/g    
    s/\bMESA_FORMAT_LUMINANCE_ALPHA_UINT8\b/MESA_FORMAT_LA_UINT8/g    
    s/\bMESA_FORMAT_LUMINANCE_ALPHA_UINT16\b/MESA_FORMAT_LA_UINT16/g    
    s/\bMESA_FORMAT_LUMINANCE_ALPHA_UINT32\b/MESA_FORMAT_LA_UINT32/g    
    s/\bMESA_FORMAT_LUMINANCE_ALPHA_INT32\b/MESA_FORMAT_LA_INT32/g    
    s/\bMESA_FORMAT_LUMINANCE_ALPHA_INT16\b/MESA_FORMAT_LA_INT16/g    
    s/\bMESA_FORMAT_LUMINANCE_ALPHA_INT8\b/MESA_FORMAT_LA_INT8/g    
    s/\bMESA_FORMAT_ALPHA_FLOAT16\b/MESA_FORMAT_A_FLOAT16/g    
    s/\bMESA_FORMAT_ALPHA_FLOAT32\b/MESA_FORMAT_A_FLOAT32/g    
    s/\bMESA_FORMAT_INTESITY_FLOAT16\b/MESA_FORMAT_I_FLOAT16/g    
    s/\bMESA_FORMAT_INTESITY_FLOAT32\b/MESA_FORMAT_I_FLOAT32/g    
    s/\bMESA_FORMAT_INTENSITY_FLOAT16\b/MESA_FORMAT_I_FLOAT16/g    
    s/\bMESA_FORMAT_INTENSITY_FLOAT32\b/MESA_FORMAT_I_FLOAT32/g    
    s/\bMESA_FORMAT_LUMINANCE_FLOAT16\b/MESA_FORMAT_L_FLOAT16/g    
    s/\bMESA_FORMAT_LUMINANCE_FLOAT32\b/MESA_FORMAT_L_FLOAT32/g    
    s/\bMESA_FORMAT_LUMINANCE_ALPHA_FLOAT16\b/MESA_FORMAT_LA_FLOAT16/g  
      s/\bMESA_FORMAT_LUMINANCE_ALPHA_FLOAT32\b/MESA_FORMAT_LA_FLOAT32/g
 
 6 Update comments. Replace Type A format names containing SIGNED with   
     SNORM appended per the format name spec, and one RGBA_16, which is 
       grouped with the others:
 
 7 Remove/update related comments and rename MESA_FORMAT_XBGR A Type
    formats to     match naming spec as follows:    
    s/\bMESA_FORMAT_XBGR8888_SNORM\b/MESA_FORMAT_RGBX_SNORM8/g    
    s/\bMESA_FORMAT_XBGR8888_SRGB\b/MESA_FORMAT_SRGBX_UNORM8/g    
    s/\bMESA_FORMAT_XBGR8888_UINT\b/MESA_FORMAT_RGBX_UINT8/g    
    s/\bMESA_FORMAT_XBGR8888_SINT\b/MESA_FORMAT_RGBX_SINT8/g    
    s/\bMESA_FORMAT_XBGR16161616_UNORM\b/MESA_FORMAT_RGBX_UNORM16/g    
    s/\bMESA_FORMAT_XBGR16161616_SNORM\b/MESA_FORMAT_RGBX_SNORM16/g    
    s/\bMESA_FORMAT_XBGR16161616_FLOAT\b/MESA_FORMAT_RGBX_FLOAT16/g    
    s/\bMESA_FORMAT_XBGR16161616_UINT\b/MESA_FORMAT_RGBX_UINT16/g    
    s/\bMESA_FORMAT_XBGR16161616_SINT\b/MESA_FORMAT_RGBX_SINT16/g    
    s/\bMESA_FORMAT_XBGR32323232_UNORM\b/MESA_FORMAT_RGBX_UNORM32/g    
    s/\bMESA_FORMAT_XBGR32323232_SNORM\b/MESA_FORMAT_RGBX_SNORM32/g    
    s/\bMESA_FORMAT_XBGR32323232_FLOAT\b/MESA_FORMAT_RGBX_FLOAT32/g    
    s/\bMESA_FORMAT_XBGR32323232_UINT\b/MESA_FORMAT_RGBX_UINT32/g    
    s/\bMESA_FORMAT_XBGR32323232_SINT\b/MESA_FORMAT_RGBX_SINT32/g
    
8  Replace Type A _INT formats names with _SINT to match naming spec:    
    s/\bMESA_FORMAT_A_INT8\b/MESA_FORMAT_A_SINT8/g    
    s/\bMESA_FORMAT_A_INT16\b/MESA_FORMAT_A_SINT16/g    
    s/\bMESA_FORMAT_A_INT32\b/MESA_FORMAT_A_SINT32/g    
    s/\bMESA_FORMAT_I_INT8\b/MESA_FORMAT_I_SINT8/g    
    s/\bMESA_FORMAT_I_INT16\b/MESA_FORMAT_I_SINT16/g    
    s/\bMESA_FORMAT_I_INT32\b/MESA_FORMAT_I_SINT32/g    
    s/\bMESA_FORMAT_L_INT8\b/MESA_FORMAT_L_SINT8/g    
    s/\bMESA_FORMAT_L_INT16\b/MESA_FORMAT_L_SINT16/g    
    s/\bMESA_FORMAT_L_INT32\b/MESA_FORMAT_L_SINT32/g    
    s/\bMESA_FORMAT_LA_INT8\b/MESA_FORMAT_LA_SINT8/g    
    s/\bMESA_FORMAT_LA_INT16\b/MESA_FORMAT_LA_SINT16/g    
    s/\bMESA_FORMAT_LA_INT32\b/MESA_FORMAT_LA_SINT32/g    
    s/\bMESA_FORMAT_R_INT8\b/MESA_FORMAT_R_SINT8/g    
    s/\bMESA_FORMAT_R_INT16\b/MESA_FORMAT_R_SINT16/g    
    s/\bMESA_FORMAT_R_INT32\b/MESA_FORMAT_R_SINT32/g    
    s/\bMESA_FORMAT_RG_INT8\b/MESA_FORMAT_RG_SINT8/g    
    s/\bMESA_FORMAT_RG_INT16\b/MESA_FORMAT_RG_SINT16/g    
    s/\bMESA_FORMAT_RG_INT32\b/MESA_FORMAT_RG_SINT32/g    
    s/\bMESA_FORMAT_RGB_INT8\b/MESA_FORMAT_RGB_SINT8/g    
    s/\bMESA_FORMAT_RGB_INT16\b/MESA_FORMAT_RGB_SINT16/g    
    s/\bMESA_FORMAT_RGB_INT32\b/MESA_FORMAT_RGB_SINT32/g    
    s/\bMESA_FORMAT_RGBA_INT8\b/MESA_FORMAT_RGBA_SINT8/g    
    s/\bMESA_FORMAT_RGBA_INT16\b/MESA_FORMAT_RGBA_SINT16/g    
    s/\bMESA_FORMAT_RGBA_INT32\b/MESA_FORMAT_RGBA_SINT32/g

 src/gallium/state_trackers/dri/common/dri_screen.c |   10 +-
 src/mesa/drivers/common/meta.c                     |    2 +-
 src/mesa/drivers/dri/common/dri_util.c             |   44 +-
 src/mesa/drivers/dri/common/dri_util.h             |    4 +-
 src/mesa/drivers/dri/common/utils.c                |   26 +-
 src/mesa/drivers/dri/common/utils.h                |    2 +-
 src/mesa/drivers/dri/i915/i830_texstate.c          |   18 +-
 src/mesa/drivers/dri/i915/i830_vtbl.c              |   22 +-
 src/mesa/drivers/dri/i915/i915_context.c           |   26 +-
 src/mesa/drivers/dri/i915/i915_texstate.c          |   30 +-
 src/mesa/drivers/dri/i915/i915_vtbl.c              |   22 +-
 src/mesa/drivers/dri/i915/intel_blit.c             |   28 +-
 src/mesa/drivers/dri/i915/intel_fbo.c              |   12 +-
 src/mesa/drivers/dri/i915/intel_fbo.h              |    8 +-
 src/mesa/drivers/dri/i915/intel_mipmap_tree.c      |   18 +-
 src/mesa/drivers/dri/i915/intel_mipmap_tree.h      |   14 +-
 src/mesa/drivers/dri/i915/intel_pixel_bitmap.c     |    6 +-
 src/mesa/drivers/dri/i915/intel_screen.c           |   28 +-
 src/mesa/drivers/dri/i915/intel_tex_image.c        |   10 +-
 src/mesa/drivers/dri/i915/intel_tex_layout.c       |    6 +-
 src/mesa/drivers/dri/i915/intel_tex_layout.h       |    2 +-
 src/mesa/drivers/dri/i965/brw_blorp.cpp            |   16 +-
 src/mesa/drivers/dri/i965/brw_blorp.h              |    4 +-
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp       |   26 +-
 src/mesa/drivers/dri/i965/brw_blorp_clear.cpp      |    4 +-
 src/mesa/drivers/dri/i965/brw_clear.c              |    8 +-
 src/mesa/drivers/dri/i965/brw_context.c            |    4 +-
 src/mesa/drivers/dri/i965/brw_context.h            |    2 +-
 src/mesa/drivers/dri/i965/brw_misc_state.c         |   20 +-
 src/mesa/drivers/dri/i965/brw_state.h              |    4 +-
 src/mesa/drivers/dri/i965/brw_surface_formats.c    |  352 +++---
 src/mesa/drivers/dri/i965/brw_tex_layout.c         |   10 +-
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c   |    4 +-
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c  |    2 +-
 src/mesa/drivers/dri/i965/intel_blit.c             |   16 +-
 src/mesa/drivers/dri/i965/intel_fbo.c              |   16 +-
 src/mesa/drivers/dri/i965/intel_fbo.h              |    8 +-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c      |   78 +-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h      |   22 +-
 src/mesa/drivers/dri/i965/intel_pixel_bitmap.c     |    6 +-
 src/mesa/drivers/dri/i965/intel_screen.c           |   34 +-
 src/mesa/drivers/dri/i965/intel_tex_image.c        |   10 +-
 src/mesa/drivers/dri/i965/intel_tex_subimage.c     |   10 +-
 src/mesa/drivers/dri/nouveau/nouveau_fbo.c         |   22 +-
 src/mesa/drivers/dri/nouveau/nouveau_screen.c      |    8 +-
 src/mesa/drivers/dri/nouveau/nouveau_surface.h     |    2 +-
 src/mesa/drivers/dri/nouveau/nouveau_texture.c     |   30 +-
 src/mesa/drivers/dri/nouveau/nouveau_util.h        |   34 +-
 src/mesa/drivers/dri/nouveau/nv04_context.c        |    6 +-
 src/mesa/drivers/dri/nouveau/nv04_state_fb.c       |    8 +-
 src/mesa/drivers/dri/nouveau/nv04_state_frag.c     |    8 +-
 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        |  184 +--
 src/mesa/drivers/dri/nouveau/nv10_state_fb.c       |   12 +-
 src/mesa/drivers/dri/nouveau/nv10_state_frag.c     |   10 +-
 src/mesa/drivers/dri/nouveau/nv10_state_tex.c      |   30 +-
 src/mesa/drivers/dri/nouveau/nv10_state_tnl.c      |    2 +-
 src/mesa/drivers/dri/nouveau/nv20_state_fb.c       |   14 +-
 src/mesa/drivers/dri/nouveau/nv20_state_tex.c      |   32 +-
 src/mesa/drivers/dri/nouveau/nv20_state_tnl.c      |    2 +-
 src/mesa/drivers/dri/r200/r200_blit.c              |   94 +-
 src/mesa/drivers/dri/r200/r200_blit.h              |    6 +-
 src/mesa/drivers/dri/r200/r200_state_init.c        |    6 +-
 src/mesa/drivers/dri/r200/r200_texstate.c          |   88 +-
 src/mesa/drivers/dri/radeon/radeon_blit.c          |   62 +-
 src/mesa/drivers/dri/radeon/radeon_blit.h          |    6 +-
 src/mesa/drivers/dri/radeon/radeon_common.h        |    2 +-
 .../drivers/dri/radeon/radeon_common_context.h     |    8 +-
 src/mesa/drivers/dri/radeon/radeon_fbo.c           |   20 +-
 src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c   |    8 +-
 src/mesa/drivers/dri/radeon/radeon_mipmap_tree.h   |    6 +-
 src/mesa/drivers/dri/radeon/radeon_pixel_read.c    |   26 +-
 src/mesa/drivers/dri/radeon/radeon_screen.c        |   34 +-
 src/mesa/drivers/dri/radeon/radeon_state_init.c    |    6 +-
 src/mesa/drivers/dri/radeon/radeon_tex_copy.c      |   16 +-
 src/mesa/drivers/dri/radeon/radeon_texstate.c      |   56 +-
 src/mesa/drivers/dri/radeon/radeon_texture.c       |   82 +-
 src/mesa/drivers/dri/radeon/radeon_texture.h       |   18 +-
 src/mesa/drivers/dri/radeon/radeon_tile.c          |    6 +-
 src/mesa/drivers/dri/radeon/radeon_tile.h          |    6 +-
 src/mesa/drivers/dri/swrast/swrast.c               |   26 +-
 src/mesa/drivers/haiku/swrast/SoftwareRast.cpp     |   10 +-
 src/mesa/drivers/osmesa/osmesa.c                   |   28 +-
 src/mesa/drivers/x11/xm_buffer.c                   |   10 +-
 src/mesa/main/accum.c                              |    8 +-
 src/mesa/main/blend.c                              |    6 +-
 src/mesa/main/blend.h                              |    4 +-
 src/mesa/main/bufferobj.c                          |   12 +-
 src/mesa/main/dd.h                                 |    4 +-
 src/mesa/main/debug.c                              |   18 +-
 src/mesa/main/fbobject.c                           |   18 +-
 src/mesa/main/format_pack.c                        |  718 +++++------
 src/mesa/main/format_pack.h                        |   26 +-
 src/mesa/main/format_unpack.c                      |  512 ++++----
 src/mesa/main/format_unpack.h                      |   16 +-
 src/mesa/main/formats.c                            | 1278 ++++++++++----------
 src/mesa/main/formats.h                            |  505 +++++---
 src/mesa/main/framebuffer.c                        |   16 +-
 src/mesa/main/mipmap.c                             |    4 +-
 src/mesa/main/mipmap.h                             |    2 +-
 src/mesa/main/mtypes.h                             |    8 +-
 src/mesa/main/readpix.c                            |   14 +-
 src/mesa/main/shaderimage.c                        |   96 +-
 src/mesa/main/texcompress.c                        |   58 +-
 src/mesa/main/texcompress.h                        |   10 +-
 src/mesa/main/texcompress_etc.c                    |   10 +-
 src/mesa/main/texcompress_etc.h                    |    4 +-
 src/mesa/main/texcompress_fxt1.c                   |    2 +-
 src/mesa/main/texcompress_fxt1.h                   |    2 +-
 src/mesa/main/texcompress_rgtc.c                   |   34 +-
 src/mesa/main/texcompress_rgtc.h                   |    2 +-
 src/mesa/main/texcompress_s3tc.c                   |    2 +-
 src/mesa/main/texcompress_s3tc.h                   |    2 +-
 src/mesa/main/texformat.c                          |  450 +++----
 src/mesa/main/texformat.h                          |    2 +-
 src/mesa/main/texgetimage.c                        |    4 +-
 src/mesa/main/teximage.c                           |  138 +--
 src/mesa/main/teximage.h                           |    8 +-
 src/mesa/main/texobj.c                             |    4 +-
 src/mesa/main/texparam.c                           |    6 +-
 src/mesa/main/texstorage.c                         |    4 +-
 src/mesa/main/texstore.c                           |  680 +++++------
 src/mesa/main/texstore.h                           |    6 +-
 src/mesa/main/textureview.c                        |    4 +-
 src/mesa/state_tracker/st_cb_drawpixels.c          |    4 +-
 src/mesa/state_tracker/st_cb_eglimage.c            |    2 +-
 src/mesa/state_tracker/st_cb_fbo.c                 |    4 +-
 src/mesa/state_tracker/st_cb_texture.c             |    8 +-
 src/mesa/state_tracker/st_format.c                 |  508 ++++----
 src/mesa/state_tracker/st_format.h                 |    6 +-
 src/mesa/state_tracker/st_manager.c                |    2 +-
 src/mesa/state_tracker/st_vdpau.c                  |    2 +-
 src/mesa/swrast/s_blit.c                           |    8 +-
 src/mesa/swrast/s_depth.c                          |   46 +-
 src/mesa/swrast/s_drawpix.c                        |   14 +-
 src/mesa/swrast/s_renderbuffer.c                   |   18 +-
 src/mesa/swrast/s_stencil.c                        |   10 +-
 src/mesa/swrast/s_texfetch.c                       |  288 ++---
 src/mesa/swrast/s_texfetch_tmp.h                   |  126 +-
 src/mesa/swrast/s_texfilter.c                      |   16 +-
 src/mesa/swrast/s_texrender.c                      |    2 +-
 src/mesa/swrast/s_triangle.c                       |   40 +-
 143 files changed, 3991 insertions(+), 3856 deletions(-)

-- 
1.8.3.1



More information about the mesa-dev mailing list