[Mesa-dev] [PATCH 1/1] mesa: Add some convention to MESA_FORMATs with attention to PIPE_FORMATs

Marek Olšák maraeo at gmail.com
Fri Dec 20 12:45:38 PST 2013


Not all "_INT" occurences are changed to "_SINT". It's kinda obvious
if you just read formats.h of the patch. Also, radeon and r200 will
fail to compile with this. Therefore, NAK. The format-translation
macros in the radeon drivers could be inlined to make find-and-replace
operations possible there.

Marek

On Thu, Dec 19, 2013 at 5:44 AM, Mark Mueller <markkmueller at gmail.com> wrote:
> Though a large patch, this is simply a series of global search
> and replace operations. Please refer to formats.h for the core
> deltas. In summary this change adds UNORM, and UINT to formats
> where no type is given, as necessary; replaces the SIGNED designation
> inside the named format with an appened SNORM qualifier; and replaces
> *_INT with *_SINT, thus making MESA_FORMATs more consistent
> with PIPE_FORMATs. This is the first and most intrusive change
> in a crusade to clean up and conventionalize MESA_FORMATs to
> meet needs of contemporary drivers.
>
> No regressions were observed with piglit testing on i965.
> There were no build regressions on gallium ilo, nouveau, r300,
> or r600 after the change.
>
> Signed-off-by: Mark Mueller <MarkKMueller at gmail.com>
> ---
>  src/gallium/state_trackers/dri/common/dri_screen.c |   6 +-
>  src/mesa/drivers/dri/common/dri_util.c             |  32 +-
>  src/mesa/drivers/dri/common/utils.c                |  16 +-
>  src/mesa/drivers/dri/i915/i830_texstate.c          |  18 +-
>  src/mesa/drivers/dri/i915/i830_vtbl.c              |  20 +-
>  src/mesa/drivers/dri/i915/i915_context.c           |  24 +-
>  src/mesa/drivers/dri/i915/i915_texstate.c          |  26 +-
>  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           |  22 +-
>  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              |   4 +-
>  src/mesa/drivers/dri/i965/brw_context.c            |   2 +-
>  src/mesa/drivers/dri/i965/brw_misc_state.c         |  14 +-
>  src/mesa/drivers/dri/i965/brw_surface_formats.c    | 188 +++---
>  src/mesa/drivers/dri/i965/brw_tex_layout.c         |   6 +-
>  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      |  36 +-
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.h      |   4 +-
>  src/mesa/drivers/dri/i965/intel_pixel_bitmap.c     |   6 +-
>  src/mesa/drivers/dri/i965/intel_screen.c           |  26 +-
>  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     |  26 +-
>  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        | 176 +++---
>  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      |  30 +-
>  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      |  32 +-
>  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          |  16 +-
>  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    |  22 +-
>  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      |  12 +-
>  src/mesa/drivers/dri/radeon/radeon_texture.c       |  40 +-
>  src/mesa/drivers/dri/swrast/swrast.c               |  20 +-
>  src/mesa/drivers/haiku/swrast/SoftwareRast.cpp     |   8 +-
>  src/mesa/drivers/osmesa/osmesa.c                   |  24 +-
>  src/mesa/drivers/x11/xm_buffer.c                   |  10 +-
>  src/mesa/main/accum.c                              |   8 +-
>  src/mesa/main/debug.c                              |  14 +-
>  src/mesa/main/fbobject.c                           |   4 +-
>  src/mesa/main/format_pack.c                        | 454 +++++++-------
>  src/mesa/main/format_unpack.c                      | 294 ++++-----
>  src/mesa/main/formats.c                            | 680 ++++++++++-----------
>  src/mesa/main/formats.h                            | 170 +++---
>  src/mesa/main/framebuffer.c                        |   6 +-
>  src/mesa/main/readpix.c                            |   8 +-
>  src/mesa/main/texformat.c                          | 284 ++++-----
>  src/mesa/main/teximage.c                           |  66 +-
>  src/mesa/main/texobj.c                             |   2 +-
>  src/mesa/main/texstore.c                           | 390 ++++++------
>  src/mesa/state_tracker/st_format.c                 | 276 ++++-----
>  src/mesa/swrast/s_depth.c                          |  40 +-
>  src/mesa/swrast/s_drawpix.c                        |  14 +-
>  src/mesa/swrast/s_renderbuffer.c                   |  16 +-
>  src/mesa/swrast/s_stencil.c                        |   8 +-
>  src/mesa/swrast/s_texfetch.c                       | 160 ++---
>  src/mesa/swrast/s_texfetch_tmp.h                   | 114 ++--
>  src/mesa/swrast/s_texfilter.c                      |   8 +-
>  src/mesa/swrast/s_triangle.c                       |  20 +-
>  83 files changed, 2167 insertions(+), 2167 deletions(-)
>


More information about the mesa-dev mailing list