[Mesa-dev] [PATCH 3/5] mesa: Use assert() instead of ASSERT wrapper.

Matt Turner mattst88 at gmail.com
Sun Feb 22 21:27:02 PST 2015


On Sun, Feb 22, 2015 at 9:13 PM, Matt Turner <mattst88 at gmail.com> wrote:
> ---
>  src/gallium/drivers/softpipe/sp_tex_sample.c  |   2 +-
>  src/gallium/state_trackers/glx/xlib/glx_api.c |   2 +-
>  src/gallium/state_trackers/glx/xlib/xm_api.c  |   4 +-
>  src/mesa/drivers/common/meta.c                |  10 +-
>  src/mesa/drivers/dri/i915/intel_fbo.c         |   4 +-
>  src/mesa/drivers/dri/i915/intel_regions.c     |   2 +-
>  src/mesa/drivers/dri/i965/intel_fbo.c         |   4 +-
>  src/mesa/drivers/dri/r200/r200_state.c        |   2 +-
>  src/mesa/drivers/dri/r200/r200_texstate.c     |   2 +-
>  src/mesa/drivers/dri/radeon/radeon_dma.c      |   6 +-
>  src/mesa/drivers/dri/radeon/radeon_fbo.c      |   8 +-
>  src/mesa/drivers/dri/radeon/radeon_state.c    |   2 +-
>  src/mesa/drivers/dri/radeon/radeon_texstate.c |   2 +-
>  src/mesa/drivers/dri/swrast/swrast.c          |   2 +-
>  src/mesa/drivers/osmesa/osmesa.c              |   2 +-
>  src/mesa/drivers/x11/fakeglx.c                |   2 +-
>  src/mesa/drivers/x11/xm_api.c                 |   8 +-
>  src/mesa/drivers/x11/xm_dd.c                  |  18 +-
>  src/mesa/main/api_arrayelt.c                  |   6 +-
>  src/mesa/main/arbprogram.c                    |  14 +-
>  src/mesa/main/arrayobj.c                      |  12 +-
>  src/mesa/main/atifragshader.c                 |   2 +-
>  src/mesa/main/blend.c                         |   2 +-
>  src/mesa/main/blit.c                          |   2 +-
>  src/mesa/main/bufferobj.c                     |  68 ++--
>  src/mesa/main/buffers.c                       |   4 +-
>  src/mesa/main/clear.c                         |   2 +-
>  src/mesa/main/compiler.h                      |  10 -
>  src/mesa/main/condrender.c                    |   4 +-
>  src/mesa/main/context.c                       |  14 +-
>  src/mesa/main/context.h                       |   4 +-
>  src/mesa/main/dd.h                            |   2 +-
>  src/mesa/main/dlist.c                         | 510 +++++++++++++-------------
>  src/mesa/main/drawpix.c                       |   6 +-
>  src/mesa/main/drawtex.c                       |   2 +-
>  src/mesa/main/enable.c                        |   6 +-
>  src/mesa/main/errors.c                        |   4 +-
>  src/mesa/main/eval.c                          |  10 +-
>  src/mesa/main/fbobject.c                      |  44 +--
>  src/mesa/main/feedback.c                      |   2 +-
>  src/mesa/main/ffvertex_prog.c                 |   6 +-
>  src/mesa/main/format_unpack.py                |   8 +-
>  src/mesa/main/formatquery.c                   |   2 +-
>  src/mesa/main/formats.c                       |   4 +-
>  src/mesa/main/framebuffer.c                   |  20 +-
>  src/mesa/main/get.c                           |   2 +-
>  src/mesa/main/getstring.c                     |   6 +-
>  src/mesa/main/hash.c                          |  10 +-
>  src/mesa/main/image.c                         |  74 ++--
>  src/mesa/main/imports.c                       |   4 +-
>  src/mesa/main/light.c                         |  16 +-
>  src/mesa/main/macros.h                        |   2 +-
>  src/mesa/main/matrix.c                        |   2 +-
>  src/mesa/main/mipmap.c                        |  20 +-
>  src/mesa/main/pack.c                          |  12 +-
>  src/mesa/main/pbo.c                           |   8 +-
>  src/mesa/main/pipelineobj.c                   |   6 +-
>  src/mesa/main/points.c                        |   2 +-
>  src/mesa/main/queryobj.c                      |   2 +-
>  src/mesa/main/readpix.c                       |  12 +-
>  src/mesa/main/remap.c                         |   2 +-
>  src/mesa/main/renderbuffer.c                  |   2 +-
>  src/mesa/main/samplerobj.c                    |   8 +-
>  src/mesa/main/shaderobj.c                     |   4 +-
>  src/mesa/main/shaderobj.h                     |   2 +-
>  src/mesa/main/shared.c                        |   6 +-
>  src/mesa/main/state.c                         |   2 +-
>  src/mesa/main/syncobj.c                       |   6 +-
>  src/mesa/main/texcompress.c                   |   4 +-
>  src/mesa/main/texcompress_bptc.c              |   4 +-
>  src/mesa/main/texcompress_cpal.c              |   4 +-
>  src/mesa/main/texcompress_etc.c               |  22 +-
>  src/mesa/main/texcompress_fxt1.c              |  14 +-
>  src/mesa/main/texcompress_rgtc.c              |   8 +-
>  src/mesa/main/texcompress_s3tc.c              |   8 +-
>  src/mesa/main/texformat.c                     |   8 +-
>  src/mesa/main/teximage.c                      |  34 +-
>  src/mesa/main/texobj.c                        |  18 +-
>  src/mesa/main/texparam.c                      |   6 +-
>  src/mesa/main/texstate.c                      |  10 +-
>  src/mesa/main/texstate.h                      |   2 +-
>  src/mesa/main/texstore.c                      |  58 +--
>  src/mesa/main/transformfeedback.c             |  10 +-
>  src/mesa/main/varray.c                        |  30 +-
>  src/mesa/main/viewport.c                      |   2 +-
>  src/mesa/math/m_debug_xform.c                 |   4 +-
>  src/mesa/math/m_trans_tmp.h                   |   8 +-
>  src/mesa/program/arbprogparse.c               |   4 +-
>  src/mesa/program/prog_execute.c               |  28 +-
>  src/mesa/program/prog_instruction.c           |  12 +-
>  src/mesa/program/prog_optimize.c              |  34 +-
>  src/mesa/program/prog_parameter.c             |   6 +-
>  src/mesa/program/prog_statevars.c             |  14 +-
>  src/mesa/program/program.c                    |  40 +-
>  src/mesa/program/program.h                    |   2 +-
>  src/mesa/program/program_parse.y              |  12 +-
>  src/mesa/program/programopt.c                 |   2 +-
>  src/mesa/state_tracker/st_cb_bufferobjects.c  |  12 +-
>  src/mesa/state_tracker/st_glsl_to_tgsi.cpp    |   2 +-
>  src/mesa/swrast/s_aaline.c                    |   2 +-
>  src/mesa/swrast/s_aatriangle.c                |   8 +-
>  src/mesa/swrast/s_aatritemp.h                 |   2 +-
>  src/mesa/swrast/s_alpha.c                     |   2 +-
>  src/mesa/swrast/s_atifragshader.c             |   2 +-
>  src/mesa/swrast/s_bitmap.c                    |   6 +-
>  src/mesa/swrast/s_blend.c                     |  96 ++---
>  src/mesa/swrast/s_blit.c                      |  22 +-
>  src/mesa/swrast/s_context.c                   |   4 +-
>  src/mesa/swrast/s_copypix.c                   |   4 +-
>  src/mesa/swrast/s_drawpix.c                   |   6 +-
>  src/mesa/swrast/s_fog.c                       |  12 +-
>  src/mesa/swrast/s_fragprog.c                  |   2 +-
>  src/mesa/swrast/s_lines.c                     |  10 +-
>  src/mesa/swrast/s_linetemp.h                  |   4 +-
>  src/mesa/swrast/s_logic.c                     |   4 +-
>  src/mesa/swrast/s_masking.c                   |   4 +-
>  src/mesa/swrast/s_points.c                    |   4 +-
>  src/mesa/swrast/s_renderbuffer.c              |   2 +-
>  src/mesa/swrast/s_span.c                      |  60 +--
>  src/mesa/swrast/s_stencil.c                   |   2 +-
>  src/mesa/swrast/s_texcombine.c                |   6 +-
>  src/mesa/swrast/s_texfetch.c                  |   2 +-
>  src/mesa/swrast/s_texfilter.c                 | 130 +++----
>  src/mesa/swrast/s_texrender.c                 |   2 +-
>  src/mesa/swrast/s_triangle.c                  |  28 +-
>  src/mesa/swrast/s_tritemp.h                   |   4 +-
>  src/mesa/swrast/s_zoom.c                      |  60 +--
>  src/mesa/tnl/t_context.c                      |   2 +-
>  src/mesa/tnl/t_vb_cliptmp.h                   |   8 +-
>  src/mesa/tnl/t_vb_light.c                     |   2 +-
>  src/mesa/tnl/t_vb_program.c                   |   2 +-
>  src/mesa/tnl/t_vb_render.c                    |  26 +-
>  src/mesa/tnl_dd/t_dd_tritmp.h                 |   6 +-
>  src/mesa/vbo/vbo_context.c                    |   2 +-
>  src/mesa/vbo/vbo_context.h                    |   6 +-
>  src/mesa/vbo/vbo_exec_api.c                   |  14 +-
>  src/mesa/vbo/vbo_exec_array.c                 |   2 +-
>  src/mesa/vbo/vbo_exec_draw.c                  |   8 +-
>  src/mesa/vbo/vbo_save_api.c                   |   4 +-
>  139 files changed, 1023 insertions(+), 1033 deletions(-)

This patch is too big for the mailing list, but it's a pretty
mechanical change replacing ASSERT with assert and removing the
definition of ASSERT from compiler.h.

It can be found in

   git://people.freedesktop.org/~mattst88/mesa header-cleanup

or http://cgit.freedesktop.org/~mattst88/mesa/commit/?h=header-cleanup&id=70614b1d1e4cbab30add208bfacd5fe4469dc712


More information about the mesa-dev mailing list