Mesa (master): mesa: Change many Type A MESA_FORMATs to meet naming standard

Marek Olšák mareko at kemper.freedesktop.org
Tue Jan 28 00:19:59 UTC 2014


Module: Mesa
Branch: master
Commit: 50a01d2acafb2a937e62b24258e2e777c0cd1489
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=50a01d2acafb2a937e62b24258e2e777c0cd1489

Author: Mark Mueller <MarkKMueller at gmail.com>
Date:   Mon Jan 20 19:08:54 2014 -0800

mesa: Change many Type A MESA_FORMATs to meet naming standard

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_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_R16\b/MESA_FORMAT_R_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_SRGB8\b/MESA_FORMAT_BGR_SRGB8/g
    s/MESA_FORMAT_RGBA_16\b/MESA_FORMAT_RGBA_UNORM16/g
    s/MESA_FORMAT_SL8\b/MESA_FORMAT_L_SRGB8/g
    s/MESA_FORMAT_Z32_FLOAT\b/MESA_FORMAT_Z_FLOAT32/g
    s/MESA_FORMAT_XBGR16161616_UNORM\b/MESA_FORMAT_RGBX_UNORM16/g
    s/MESA_FORMAT_XBGR16161616_SNORM\b/MESA_FORMAT_RGBX_SNORM16/g
    s/MESA_FORMAT_XBGR16161616_FLOAT\b/MESA_FORMAT_RGBX_FLOAT16/g
    s/MESA_FORMAT_XBGR16161616_UINT\b/MESA_FORMAT_RGBX_UINT16/g
    s/MESA_FORMAT_XBGR16161616_SINT\b/MESA_FORMAT_RGBX_SINT16/g
    s/MESA_FORMAT_XBGR32323232_FLOAT\b/MESA_FORMAT_RGBX_FLOAT32/g
    s/MESA_FORMAT_XBGR32323232_UINT\b/MESA_FORMAT_RGBX_UINT32/g
    s/MESA_FORMAT_XBGR32323232_SINT\b/MESA_FORMAT_RGBX_SINT32/g
    s/MESA_FORMAT_XBGR8888_UINT\b/MESA_FORMAT_RGBX_UINT8/g
    s/MESA_FORMAT_XBGR8888_SINT\b/MESA_FORMAT_RGBX_SINT8/g

---

 src/mesa/drivers/dri/common/dri_util.c          |    4 +-
 src/mesa/drivers/dri/i915/i830_texstate.c       |    6 +-
 src/mesa/drivers/dri/i915/i830_vtbl.c           |    2 +-
 src/mesa/drivers/dri/i915/i915_context.c        |    8 +-
 src/mesa/drivers/dri/i915/i915_texstate.c       |    8 +-
 src/mesa/drivers/dri/i915/i915_vtbl.c           |    2 +-
 src/mesa/drivers/dri/i915/intel_blit.c          |    2 +-
 src/mesa/drivers/dri/i915/intel_screen.c        |    2 +-
 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    |    2 +-
 src/mesa/drivers/dri/i965/brw_clear.c           |    4 +-
 src/mesa/drivers/dri/i965/brw_misc_state.c      |   10 +-
 src/mesa/drivers/dri/i965/brw_surface_formats.c |   72 ++--
 src/mesa/drivers/dri/i965/brw_tex_layout.c      |    6 +-
 src/mesa/drivers/dri/i965/intel_fbo.c           |    4 +-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c   |   22 +-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h   |    2 +-
 src/mesa/drivers/dri/i965/intel_screen.c        |    4 +-
 src/mesa/drivers/dri/i965/intel_tex_subimage.c  |    4 +-
 src/mesa/drivers/dri/nouveau/nouveau_fbo.c      |    4 +-
 src/mesa/drivers/dri/nouveau/nouveau_texture.c  |   12 +-
 src/mesa/drivers/dri/nouveau/nouveau_util.h     |    2 +-
 src/mesa/drivers/dri/nouveau/nv04_context.c     |    4 +-
 src/mesa/drivers/dri/nouveau/nv04_state_frag.c  |    4 +-
 src/mesa/drivers/dri/nouveau/nv04_state_tex.c   |    6 +-
 src/mesa/drivers/dri/nouveau/nv04_surface.c     |   40 +--
 src/mesa/drivers/dri/nouveau/nv10_state_fb.c    |    2 +-
 src/mesa/drivers/dri/nouveau/nv10_state_frag.c  |    4 +-
 src/mesa/drivers/dri/nouveau/nv10_state_tex.c   |   12 +-
 src/mesa/drivers/dri/nouveau/nv20_state_fb.c    |    2 +-
 src/mesa/drivers/dri/nouveau/nv20_state_tex.c   |   12 +-
 src/mesa/drivers/dri/r200/r200_blit.c           |   24 +-
 src/mesa/drivers/dri/r200/r200_texstate.c       |   26 +-
 src/mesa/drivers/dri/radeon/radeon_blit.c       |   18 +-
 src/mesa/drivers/dri/radeon/radeon_fbo.c        |    6 +-
 src/mesa/drivers/dri/radeon/radeon_screen.c     |    2 +-
 src/mesa/drivers/dri/radeon/radeon_tex_copy.c   |    4 +-
 src/mesa/drivers/dri/radeon/radeon_texstate.c   |   18 +-
 src/mesa/drivers/dri/radeon/radeon_texture.c    |   10 +-
 src/mesa/drivers/haiku/swrast/SoftwareRast.cpp  |    2 +-
 src/mesa/drivers/osmesa/osmesa.c                |   14 +-
 src/mesa/main/debug.c                           |   10 +-
 src/mesa/main/fbobject.c                        |    2 +-
 src/mesa/main/format_pack.c                     |  172 +++++-----
 src/mesa/main/format_unpack.c                   |   92 +++---
 src/mesa/main/formats.c                         |  240 +++++++-------
 src/mesa/main/formats.h                         |  397 +++++++++++++++++++++--
 src/mesa/main/shaderimage.c                     |   12 +-
 src/mesa/main/texformat.c                       |   78 ++---
 src/mesa/main/teximage.c                        |   18 +-
 src/mesa/main/texobj.c                          |    2 +-
 src/mesa/main/texstore.c                        |  134 ++++----
 src/mesa/state_tracker/st_format.c              |  100 +++---
 src/mesa/swrast/s_blit.c                        |    2 +-
 src/mesa/swrast/s_depth.c                       |   16 +-
 src/mesa/swrast/s_renderbuffer.c                |    8 +-
 src/mesa/swrast/s_stencil.c                     |    4 +-
 src/mesa/swrast/s_texfetch.c                    |   54 +--
 src/mesa/swrast/s_texfetch_tmp.h                |   28 +-
 src/mesa/swrast/s_texfilter.c                   |    8 +-
 src/mesa/swrast/s_triangle.c                    |   24 +-
 62 files changed, 1070 insertions(+), 737 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=50a01d2acafb2a937e62b24258e2e777c0cd1489



More information about the mesa-commit mailing list