Mesa (master): intel: Convert from GLboolean to 'bool' from stdbool.h.

Kenneth Graunke kwg at kemper.freedesktop.org
Tue Oct 18 11:37:58 PDT 2011


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Oct  7 12:26:50 2011 -0700

intel: Convert from GLboolean to 'bool' from stdbool.h.

I initially produced the patch using this bash command:
for file in {intel,i915,i965}/*.{c,cpp,h}; do [ ! -h $file ] && sed -i
's/GLboolean/bool/g' $file && sed -i 's/GL_TRUE/true/g' $file && sed -i
's/GL_FALSE/false/g' $file; done

Then I manually added #include <stdbool.h> to fix compilation errors,
and converted a few functions back to GLboolean that were used in core
Mesa's function pointer table to avoid "incompatible pointer" warnings.

Finally, I cleaned up some whitespace issues introduced by the change.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Chad Versace <chad at chad-versace.us>
Acked-by: Paul Berry <stereotype441 at gmail.com>

---

 src/mesa/drivers/dri/i915/i830_context.c           |    8 +-
 src/mesa/drivers/dri/i915/i830_context.h           |    2 +-
 src/mesa/drivers/dri/i915/i830_state.c             |    2 +-
 src/mesa/drivers/dri/i915/i830_texblend.c          |   12 +-
 src/mesa/drivers/dri/i915/i830_texstate.c          |   20 ++--
 src/mesa/drivers/dri/i915/i830_vtbl.c              |   22 ++--
 src/mesa/drivers/dri/i915/i915_context.c           |   26 ++--
 src/mesa/drivers/dri/i915/i915_context.h           |   18 ++--
 src/mesa/drivers/dri/i915/i915_debug.c             |  102 +++++++--------
 src/mesa/drivers/dri/i915/i915_fragprog.c          |    4 +-
 src/mesa/drivers/dri/i915/i915_texstate.c          |   24 ++--
 src/mesa/drivers/dri/i915/i915_vtbl.c              |   16 ++--
 src/mesa/drivers/dri/i915/intel_render.c           |   10 +-
 src/mesa/drivers/dri/i915/intel_tris.c             |   14 +-
 src/mesa/drivers/dri/i965/brw_clip.h               |    8 +-
 src/mesa/drivers/dri/i965/brw_clip_line.c          |    4 +-
 src/mesa/drivers/dri/i965/brw_clip_tri.c           |    4 +-
 src/mesa/drivers/dri/i965/brw_clip_unfilled.c      |    6 +-
 src/mesa/drivers/dri/i965/brw_clip_util.c          |    6 +-
 src/mesa/drivers/dri/i965/brw_context.c            |   45 ++++----
 src/mesa/drivers/dri/i965/brw_context.h            |   36 +++---
 .../drivers/dri/i965/brw_cubemap_normalize.cpp     |    2 +-
 src/mesa/drivers/dri/i965/brw_draw.c               |   20 ++--
 src/mesa/drivers/dri/i965/brw_draw_upload.c        |    6 +-
 src/mesa/drivers/dri/i965/brw_eu.h                 |   24 ++--
 src/mesa/drivers/dri/i965/brw_eu_emit.c            |   46 ++++----
 src/mesa/drivers/dri/i965/brw_fallback.c           |   12 +-
 src/mesa/drivers/dri/i965/brw_fs.cpp               |    2 +-
 src/mesa/drivers/dri/i965/brw_fs.h                 |    4 +-
 .../dri/i965/brw_fs_channel_expressions.cpp        |    2 +-
 src/mesa/drivers/dri/i965/brw_fs_emit.cpp          |    2 +-
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp       |    2 +-
 src/mesa/drivers/dri/i965/brw_gs.c                 |    2 +-
 src/mesa/drivers/dri/i965/brw_gs_emit.c            |    4 +-
 src/mesa/drivers/dri/i965/brw_optimize.c           |  119 +++++++++---------
 src/mesa/drivers/dri/i965/brw_program.c            |   32 +++---
 src/mesa/drivers/dri/i965/brw_queryobj.c           |   16 ++--
 src/mesa/drivers/dri/i965/brw_sf.c                 |    8 +-
 src/mesa/drivers/dri/i965/brw_sf.h                 |    8 +-
 src/mesa/drivers/dri/i965/brw_sf_emit.c            |   41 +++---
 src/mesa/drivers/dri/i965/brw_sf_state.c           |    2 +-
 src/mesa/drivers/dri/i965/brw_shader.cpp           |    6 +-
 src/mesa/drivers/dri/i965/brw_state_upload.c       |    2 +-
 src/mesa/drivers/dri/i965/brw_urb.c                |    2 +-
 src/mesa/drivers/dri/i965/brw_vec4.h               |    2 +-
 src/mesa/drivers/dri/i965/brw_vec4_emit.cpp        |    2 +-
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp     |    2 +-
 src/mesa/drivers/dri/i965/brw_vs.c                 |    2 +-
 src/mesa/drivers/dri/i965/brw_vs.h                 |    4 +-
 src/mesa/drivers/dri/i965/brw_vs_constval.c        |    2 +-
 src/mesa/drivers/dri/i965/brw_vs_emit.c            |   50 ++++----
 src/mesa/drivers/dri/i965/brw_wm.c                 |    4 +-
 src/mesa/drivers/dri/i965/brw_wm.h                 |   12 +-
 src/mesa/drivers/dri/i965/brw_wm_emit.c            |   28 ++--
 src/mesa/drivers/dri/i965/brw_wm_fp.c              |   20 ++--
 src/mesa/drivers/dri/i965/brw_wm_iz.c              |    4 +-
 src/mesa/drivers/dri/i965/gen6_scissor_state.c     |    2 +-
 src/mesa/drivers/dri/i965/gen6_sf_state.c          |    2 +-
 src/mesa/drivers/dri/i965/gen6_viewport_state.c    |    2 +-
 src/mesa/drivers/dri/i965/gen7_clip_state.c        |    2 +-
 src/mesa/drivers/dri/i965/gen7_viewport_state.c    |    2 +-
 src/mesa/drivers/dri/intel/intel_batchbuffer.c     |   10 +-
 src/mesa/drivers/dri/intel/intel_batchbuffer.h     |    4 +-
 src/mesa/drivers/dri/intel/intel_blit.c            |   32 +++---
 src/mesa/drivers/dri/intel/intel_blit.h            |    4 +-
 src/mesa/drivers/dri/intel/intel_buffer_objects.c  |   18 ++--
 src/mesa/drivers/dri/intel/intel_buffer_objects.h  |    4 +-
 src/mesa/drivers/dri/intel/intel_buffers.c         |    6 +-
 src/mesa/drivers/dri/intel/intel_clear.c           |    2 +-
 src/mesa/drivers/dri/intel/intel_context.c         |  132 ++++++++++----------
 src/mesa/drivers/dri/intel/intel_context.h         |   46 ++++----
 src/mesa/drivers/dri/intel/intel_fbo.c             |   30 +++---
 src/mesa/drivers/dri/intel/intel_mipmap_tree.c     |   12 +-
 src/mesa/drivers/dri/intel/intel_mipmap_tree.h     |    6 +-
 src/mesa/drivers/dri/intel/intel_pixel.c           |   36 +++---
 src/mesa/drivers/dri/intel/intel_pixel.h           |    6 +-
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c    |   20 ++--
 src/mesa/drivers/dri/intel/intel_pixel_copy.c      |   26 ++--
 src/mesa/drivers/dri/intel/intel_pixel_read.c      |   24 ++--
 src/mesa/drivers/dri/intel/intel_regions.c         |   16 ++--
 src/mesa/drivers/dri/intel/intel_regions.h         |    9 +-
 src/mesa/drivers/dri/intel/intel_screen.c          |   85 +++++++------
 src/mesa/drivers/dri/intel/intel_screen.h          |   13 +-
 src/mesa/drivers/dri/intel/intel_tex.h             |    4 +-
 src/mesa/drivers/dri/intel/intel_tex_copy.c        |   12 +-
 src/mesa/drivers/dri/intel/intel_tex_image.c       |    4 +-
 src/mesa/drivers/dri/intel/intel_tex_obj.h         |    2 +-
 src/mesa/drivers/dri/intel/intel_tex_subimage.c    |    4 +-
 src/mesa/drivers/dri/intel/intel_tex_validate.c    |    8 +-
 89 files changed, 738 insertions(+), 732 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=2e5a1a254ed81b1d3efa6064f48183eefac784d0


More information about the mesa-commit mailing list