[Mesa-dev] [PATCH] gallium: replace INLINE with inline
Marek Olšák
maraeo at gmail.com
Tue Jul 21 08:22:57 PDT 2015
Acked-by: Marek Olšák <marek.olsak at amd.com>
What's next? boolean -> bool? :)
Marek
On Tue, Jul 21, 2015 at 2:20 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> Generated by running:
> git grep -l INLINE src/gallium/ | xargs sed -i 's/\bINLINE\b/inline/g'
> git grep -l INLINE src/mesa/state_tracker/ | xargs sed -i 's/\bINLINE\b/inline/g'
> git checkout src/gallium/state_trackers/clover/Doxyfile
>
> and manual edits to
> src/gallium/include/pipe/p_compiler.h
> src/gallium/README.portability
>
> to remove mentions of the inline define.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>
> Most of the diff trimmed out, just left the files that I edited manually.
>
> Full patch available at
>
> https://github.com/imirkin/mesa/commit/8f6ff119779c9bac6a63b32494e9508ae9f34753.patch
>
> src/gallium/README.portability | 2 -
> src/gallium/auxiliary/cso_cache/cso_cache.c | 8 +-
> src/gallium/auxiliary/cso_cache/cso_context.c | 8 +-
> src/gallium/auxiliary/draw/draw_gs.c | 4 +-
> src/gallium/auxiliary/draw/draw_llvm.c | 2 +-
> src/gallium/auxiliary/draw/draw_llvm.h | 10 +-
> src/gallium/auxiliary/draw/draw_pipe.h | 2 +-
> src/gallium/auxiliary/draw/draw_pipe_aaline.c | 2 +-
> src/gallium/auxiliary/draw/draw_pipe_aapoint.c | 2 +-
> src/gallium/auxiliary/draw/draw_pipe_clip.c | 10 +-
> src/gallium/auxiliary/draw/draw_pipe_cull.c | 4 +-
> src/gallium/auxiliary/draw/draw_pipe_flatshade.c | 6 +-
> src/gallium/auxiliary/draw/draw_pipe_offset.c | 2 +-
> src/gallium/auxiliary/draw/draw_pipe_pstipple.c | 2 +-
> src/gallium/auxiliary/draw/draw_pipe_stipple.c | 4 +-
> src/gallium/auxiliary/draw/draw_pipe_twoside.c | 4 +-
> src/gallium/auxiliary/draw/draw_pipe_unfilled.c | 2 +-
> src/gallium/auxiliary/draw/draw_pipe_vbuf.c | 8 +-
> src/gallium/auxiliary/draw/draw_pipe_wide_line.c | 2 +-
> src/gallium/auxiliary/draw/draw_pipe_wide_point.c | 2 +-
> src/gallium/auxiliary/draw/draw_private.h | 4 +-
> .../auxiliary/draw/draw_pt_fetch_shade_pipeline.c | 2 +-
> .../draw/draw_pt_fetch_shade_pipeline_llvm.c | 2 +-
> src/gallium/auxiliary/draw/draw_pt_post_vs.c | 4 +-
> src/gallium/auxiliary/draw/draw_pt_so_emit.c | 2 +-
> src/gallium/auxiliary/draw/draw_pt_vsplit.c | 12 +--
> src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h | 2 +-
> src/gallium/auxiliary/draw/draw_vertex.h | 12 +--
> src/gallium/auxiliary/draw/draw_vs.h | 4 +-
> src/gallium/auxiliary/gallivm/lp_bld_arit.c | 14 +--
> src/gallium/auxiliary/gallivm/lp_bld_const.h | 6 +-
> src/gallium/auxiliary/gallivm/lp_bld_debug.h | 2 +-
> src/gallium/auxiliary/gallivm/lp_bld_format_aos.c | 4 +-
> src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c | 2 +-
> src/gallium/auxiliary/gallivm/lp_bld_limits.h | 2 +-
> src/gallium/auxiliary/gallivm/lp_bld_sample.h | 8 +-
> src/gallium/auxiliary/gallivm/lp_bld_tgsi.h | 4 +-
> src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c | 2 +-
> src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 8 +-
> src/gallium/auxiliary/gallivm/lp_bld_type.h | 30 +++---
> src/gallium/auxiliary/os/os_memory_aligned.h | 4 +-
> src/gallium/auxiliary/os/os_memory_stdc.h | 2 +-
> src/gallium/auxiliary/os/os_mman.h | 4 +-
> src/gallium/auxiliary/os/os_thread.h | 34 +++---
> src/gallium/auxiliary/os/os_time.h | 4 +-
> src/gallium/auxiliary/pipebuffer/pb_buffer.h | 18 ++--
> .../auxiliary/pipebuffer/pb_buffer_fenced.c | 14 +--
> .../auxiliary/pipebuffer/pb_buffer_malloc.c | 2 +-
> src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c | 2 +-
> src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c | 8 +-
> src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c | 8 +-
> src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c | 4 +-
> .../auxiliary/pipebuffer/pb_bufmgr_ondemand.c | 4 +-
> src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c | 4 +-
> src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c | 6 +-
> src/gallium/auxiliary/rtasm/rtasm_x86sse.c | 4 +-
> src/gallium/auxiliary/rtasm/rtasm_x86sse.h | 4 +-
> .../auxiliary/target-helpers/inline_debug_helper.h | 2 +-
> .../auxiliary/target-helpers/inline_sw_helper.h | 8 +-
> .../target-helpers/inline_wrapper_sw_helper.h | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_exec.c | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_exec.h | 6 +-
> src/gallium/auxiliary/tgsi/tgsi_info.c | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_parse.c | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_parse.h | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_sanity.c | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_strings.c | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_transform.h | 24 ++---
> src/gallium/auxiliary/tgsi/tgsi_ureg.c | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_ureg.h | 116 ++++++++++-----------
> src/gallium/auxiliary/translate/translate.h | 6 +-
> src/gallium/auxiliary/translate/translate_cache.c | 6 +-
> src/gallium/auxiliary/util/u_bitmask.c | 6 +-
> src/gallium/auxiliary/util/u_blend.h | 2 +-
> src/gallium/auxiliary/util/u_blit.c | 4 +-
> src/gallium/auxiliary/util/u_blitter.c | 6 +-
> src/gallium/auxiliary/util/u_blitter.h | 40 +++----
> src/gallium/auxiliary/util/u_box.h | 22 ++--
> src/gallium/auxiliary/util/u_cache.c | 2 +-
> src/gallium/auxiliary/util/u_clear.h | 2 +-
> src/gallium/auxiliary/util/u_cpu_detect.c | 8 +-
> src/gallium/auxiliary/util/u_debug.h | 6 +-
> src/gallium/auxiliary/util/u_debug_memory.c | 6 +-
> src/gallium/auxiliary/util/u_debug_refcnt.h | 4 +-
> src/gallium/auxiliary/util/u_debug_symbol.c | 4 +-
> src/gallium/auxiliary/util/u_dirty_surfaces.h | 16 +--
> src/gallium/auxiliary/util/u_draw.h | 12 +--
> src/gallium/auxiliary/util/u_dual_blend.h | 4 +-
> src/gallium/auxiliary/util/u_dump_state.c | 2 +-
> src/gallium/auxiliary/util/u_dynarray.h | 10 +-
> src/gallium/auxiliary/util/u_fifo.h | 8 +-
> src/gallium/auxiliary/util/u_format.h | 64 ++++++------
> src/gallium/auxiliary/util/u_format_pack.py | 6 +-
> src/gallium/auxiliary/util/u_format_r11g11b10f.h | 12 +--
> src/gallium/auxiliary/util/u_format_rgb9e5.h | 8 +-
> src/gallium/auxiliary/util/u_format_s3tc.c | 8 +-
> src/gallium/auxiliary/util/u_format_yuv.h | 8 +-
> src/gallium/auxiliary/util/u_format_zs.c | 20 ++--
> src/gallium/auxiliary/util/u_half.h | 4 +-
> src/gallium/auxiliary/util/u_handle_table.c | 4 +-
> src/gallium/auxiliary/util/u_hash_table.c | 6 +-
> src/gallium/auxiliary/util/u_inlines.h | 66 ++++++------
> src/gallium/auxiliary/util/u_keymap.c | 6 +-
> src/gallium/auxiliary/util/u_linear.h | 2 +-
> src/gallium/auxiliary/util/u_math.h | 90 ++++++++--------
> src/gallium/auxiliary/util/u_memory.h | 2 +-
> src/gallium/auxiliary/util/u_mm.c | 2 +-
> src/gallium/auxiliary/util/u_pack_color.h | 26 ++---
> src/gallium/auxiliary/util/u_pointer.h | 16 +--
> src/gallium/auxiliary/util/u_prim.h | 20 ++--
> src/gallium/auxiliary/util/u_range.h | 10 +-
> src/gallium/auxiliary/util/u_rect.h | 10 +-
> src/gallium/auxiliary/util/u_resource.h | 2 +-
> src/gallium/auxiliary/util/u_ringbuffer.c | 4 +-
> src/gallium/auxiliary/util/u_split_prim.h | 4 +-
> src/gallium/auxiliary/util/u_sse.h | 12 +--
> src/gallium/auxiliary/util/u_string.h | 22 ++--
> src/gallium/auxiliary/util/u_surfaces.h | 6 +-
> src/gallium/auxiliary/util/u_tile.h | 2 +-
> src/gallium/auxiliary/util/u_time.h | 14 +--
> src/gallium/auxiliary/util/u_transfer.c | 2 +-
> src/gallium/auxiliary/util/u_video.h | 10 +-
> src/gallium/auxiliary/vl/vl_compositor.c | 10 +-
> src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c | 22 ++--
> src/gallium/auxiliary/vl/vl_mpeg12_decoder.c | 6 +-
> src/gallium/auxiliary/vl/vl_rbsp.h | 12 +--
> src/gallium/auxiliary/vl/vl_vlc.h | 30 +++---
> src/gallium/drivers/freedreno/a2xx/fd2_blend.h | 2 +-
> src/gallium/drivers/freedreno/a2xx/fd2_context.h | 2 +-
> .../drivers/freedreno/a2xx/fd2_rasterizer.h | 2 +-
> src/gallium/drivers/freedreno/a2xx/fd2_texture.h | 4 +-
> src/gallium/drivers/freedreno/a2xx/fd2_zsa.h | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_blend.h | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_context.h | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_format.h | 2 +-
> .../drivers/freedreno/a3xx/fd3_rasterizer.h | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_texture.h | 4 +-
> src/gallium/drivers/freedreno/a3xx/fd3_zsa.h | 2 +-
> src/gallium/drivers/freedreno/a4xx/fd4_blend.h | 2 +-
> src/gallium/drivers/freedreno/a4xx/fd4_context.h | 2 +-
> .../drivers/freedreno/a4xx/fd4_rasterizer.h | 2 +-
> src/gallium/drivers/freedreno/a4xx/fd4_texture.h | 4 +-
> src/gallium/drivers/freedreno/a4xx/fd4_zsa.h | 2 +-
> src/gallium/drivers/freedreno/freedreno_context.h | 8 +-
> src/gallium/drivers/freedreno/freedreno_resource.h | 8 +-
> src/gallium/drivers/freedreno/freedreno_screen.h | 2 +-
> src/gallium/drivers/freedreno/freedreno_surface.h | 2 +-
> src/gallium/drivers/i915/i915_batchbuffer.h | 16 +--
> src/gallium/drivers/i915/i915_context.h | 4 +-
> src/gallium/drivers/i915/i915_debug.h | 6 +-
> src/gallium/drivers/i915/i915_fpc.h | 2 +-
> src/gallium/drivers/i915/i915_fpc_translate.c | 2 +-
> src/gallium/drivers/i915/i915_prim_emit.c | 6 +-
> src/gallium/drivers/i915/i915_prim_vbuf.c | 2 +-
> src/gallium/drivers/i915/i915_resource.h | 4 +-
> src/gallium/drivers/i915/i915_resource_texture.c | 8 +-
> src/gallium/drivers/i915/i915_screen.h | 2 +-
> src/gallium/drivers/i915/i915_state_dynamic.c | 4 +-
> src/gallium/drivers/i915/i915_state_immediate.c | 2 +-
> src/gallium/drivers/i915/i915_state_inlines.h | 14 +--
> src/gallium/drivers/llvmpipe/lp_bld_blend.c | 2 +-
> src/gallium/drivers/llvmpipe/lp_context.h | 2 +-
> src/gallium/drivers/llvmpipe/lp_debug.h | 2 +-
> src/gallium/drivers/llvmpipe/lp_fence.h | 4 +-
> src/gallium/drivers/llvmpipe/lp_rast.h | 18 ++--
> src/gallium/drivers/llvmpipe/lp_rast_priv.h | 6 +-
> src/gallium/drivers/llvmpipe/lp_rast_tri.c | 10 +-
> src/gallium/drivers/llvmpipe/lp_scene.h | 16 +--
> src/gallium/drivers/llvmpipe/lp_screen.h | 2 +-
> src/gallium/drivers/llvmpipe/lp_setup.h | 2 +-
> src/gallium/drivers/llvmpipe/lp_setup_line.c | 6 +-
> src/gallium/drivers/llvmpipe/lp_setup_point.c | 2 +-
> src/gallium/drivers/llvmpipe/lp_setup_tri.c | 12 +--
> src/gallium/drivers/llvmpipe/lp_setup_vbuf.c | 2 +-
> src/gallium/drivers/llvmpipe/lp_state_fs.c | 14 +--
> src/gallium/drivers/llvmpipe/lp_test.h | 2 +-
> src/gallium/drivers/llvmpipe/lp_texture.h | 14 +--
> src/gallium/drivers/nouveau/nouveau_buffer.c | 30 +++---
> src/gallium/drivers/nouveau/nouveau_buffer.h | 6 +-
> src/gallium/drivers/nouveau/nouveau_context.h | 8 +-
> src/gallium/drivers/nouveau/nouveau_fence.h | 4 +-
> src/gallium/drivers/nouveau/nouveau_gldefs.h | 14 +--
> src/gallium/drivers/nouveau/nouveau_mm.c | 8 +-
> src/gallium/drivers/nouveau/nouveau_screen.h | 2 +-
> src/gallium/drivers/nouveau/nouveau_statebuf.h | 2 +-
> src/gallium/drivers/nouveau/nouveau_video.c | 10 +-
> src/gallium/drivers/nouveau/nouveau_video.h | 12 +--
> src/gallium/drivers/nouveau/nouveau_vp3_video.h | 12 +--
> src/gallium/drivers/nouveau/nouveau_winsys.h | 14 +--
> src/gallium/drivers/nouveau/nv30/nv30_clear.c | 4 +-
> src/gallium/drivers/nouveau/nv30/nv30_context.h | 4 +-
> src/gallium/drivers/nouveau/nv30/nv30_draw.c | 2 +-
> src/gallium/drivers/nouveau/nv30/nv30_format.h | 8 +-
> src/gallium/drivers/nouveau/nv30/nv30_miptree.c | 6 +-
> src/gallium/drivers/nouveau/nv30/nv30_push.c | 6 +-
> src/gallium/drivers/nouveau/nv30/nv30_query.c | 2 +-
> src/gallium/drivers/nouveau/nv30/nv30_resource.h | 4 +-
> src/gallium/drivers/nouveau/nv30/nv30_screen.h | 2 +-
> src/gallium/drivers/nouveau/nv30/nv30_texture.c | 8 +-
> src/gallium/drivers/nouveau/nv30/nv30_transfer.c | 12 +--
> src/gallium/drivers/nouveau/nv30/nv30_vbo.c | 4 +-
> src/gallium/drivers/nouveau/nv30/nv30_winsys.h | 22 ++--
> src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c | 10 +-
> src/gallium/drivers/nouveau/nv30/nvfx_shader.h | 12 +--
> src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c | 2 +-
> src/gallium/drivers/nouveau/nv50/nv50_blit.h | 22 ++--
> src/gallium/drivers/nouveau/nv50/nv50_context.h | 4 +-
> src/gallium/drivers/nouveau/nv50/nv50_miptree.c | 4 +-
> src/gallium/drivers/nouveau/nv50/nv50_program.c | 2 +-
> src/gallium/drivers/nouveau/nv50/nv50_push.c | 8 +-
> src/gallium/drivers/nouveau/nv50/nv50_query.c | 4 +-
> src/gallium/drivers/nouveau/nv50/nv50_resource.h | 6 +-
> src/gallium/drivers/nouveau/nv50/nv50_screen.h | 14 +--
> .../drivers/nouveau/nv50/nv50_shader_state.c | 2 +-
> src/gallium/drivers/nouveau/nv50/nv50_state.c | 10 +-
> .../drivers/nouveau/nv50/nv50_state_validate.c | 4 +-
> src/gallium/drivers/nouveau/nv50/nv50_stateobj.h | 2 +-
> .../drivers/nouveau/nv50/nv50_stateobj_tex.h | 4 +-
> src/gallium/drivers/nouveau/nv50/nv50_surface.c | 2 +-
> src/gallium/drivers/nouveau/nv50/nv50_tex.c | 2 +-
> src/gallium/drivers/nouveau/nv50/nv50_vbo.c | 6 +-
> src/gallium/drivers/nouveau/nv50/nv50_winsys.h | 22 ++--
> src/gallium/drivers/nouveau/nv50/nv84_video.h | 4 +-
> src/gallium/drivers/nouveau/nv50/nv84_video_vp.c | 2 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 4 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c | 4 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 2 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 8 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 14 +--
> .../drivers/nouveau/nvc0/nvc0_shader_state.c | 4 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 10 +-
> .../drivers/nouveau/nvc0/nvc0_state_validate.c | 6 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_stateobj.h | 2 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_surface.c | 2 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 6 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c | 4 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c | 8 +-
> .../drivers/nouveau/nvc0/nvc0_vbo_translate.c | 34 +++---
> src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h | 26 ++---
> src/gallium/drivers/nouveau/nvc0/nve4_compute.c | 4 +-
> src/gallium/drivers/nouveau/nvc0/nve4_compute.h | 6 +-
> src/gallium/drivers/r300/r300_context.h | 18 ++--
> src/gallium/drivers/r300/r300_fs.h | 4 +-
> src/gallium/drivers/r300/r300_render.c | 2 +-
> src/gallium/drivers/r300/r300_screen.c | 2 +-
> src/gallium/drivers/r300/r300_screen.h | 8 +-
> src/gallium/drivers/r300/r300_screen_buffer.h | 2 +-
> src/gallium/drivers/r300/r300_shader_semantics.h | 2 +-
> src/gallium/drivers/r300/r300_state_inlines.h | 28 ++---
> src/gallium/drivers/r300/r300_transfer.c | 2 +-
> src/gallium/drivers/r600/evergreen_state.c | 2 +-
> src/gallium/drivers/r600/r600_formats.h | 4 +-
> src/gallium/drivers/r600/r600_pipe.h | 50 ++++-----
> src/gallium/drivers/r600/r600_state.c | 2 +-
> src/gallium/drivers/r600/r600_state_common.c | 2 +-
> src/gallium/drivers/radeon/r600_cs.h | 20 ++--
> src/gallium/drivers/radeon/r600_pipe_common.h | 4 +-
> src/gallium/drivers/radeon/radeon_winsys.h | 4 +-
> src/gallium/drivers/radeonsi/si_pipe.h | 4 +-
> src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +-
> src/gallium/drivers/rbug/rbug_context.h | 2 +-
> src/gallium/drivers/rbug/rbug_objects.h | 20 ++--
> src/gallium/drivers/rbug/rbug_screen.h | 2 +-
> src/gallium/drivers/softpipe/sp_context.h | 2 +-
> src/gallium/drivers/softpipe/sp_fs_exec.c | 2 +-
> src/gallium/drivers/softpipe/sp_prim_vbuf.c | 2 +-
> src/gallium/drivers/softpipe/sp_quad_blend.c | 2 +-
> src/gallium/drivers/softpipe/sp_quad_fs.c | 4 +-
> src/gallium/drivers/softpipe/sp_screen.h | 2 +-
> src/gallium/drivers/softpipe/sp_setup.c | 10 +-
> src/gallium/drivers/softpipe/sp_tex_sample.c | 56 +++++-----
> src/gallium/drivers/softpipe/sp_tex_tile_cache.c | 2 +-
> src/gallium/drivers/softpipe/sp_tex_tile_cache.h | 4 +-
> src/gallium/drivers/softpipe/sp_texture.h | 6 +-
> src/gallium/drivers/softpipe/sp_tile_cache.c | 6 +-
> src/gallium/drivers/softpipe/sp_tile_cache.h | 4 +-
> .../drivers/svga/include/svga3d_shaderdefs.h | 2 +-
> src/gallium/drivers/svga/include/svga_overlay.h | 2 +-
> src/gallium/drivers/svga/svga_cmd.c | 2 +-
> src/gallium/drivers/svga/svga_context.h | 6 +-
> src/gallium/drivers/svga/svga_debug.h | 2 +-
> src/gallium/drivers/svga/svga_draw_private.h | 2 +-
> src/gallium/drivers/svga/svga_pipe_blend.c | 4 +-
> src/gallium/drivers/svga/svga_pipe_depthstencil.c | 4 +-
> src/gallium/drivers/svga/svga_pipe_query.c | 2 +-
> src/gallium/drivers/svga/svga_pipe_sampler.c | 6 +-
> src/gallium/drivers/svga/svga_resource_buffer.c | 2 +-
> src/gallium/drivers/svga/svga_resource_buffer.h | 12 +--
> src/gallium/drivers/svga/svga_resource_texture.h | 16 +--
> src/gallium/drivers/svga/svga_sampler_view.h | 2 +-
> src/gallium/drivers/svga/svga_screen.h | 2 +-
> src/gallium/drivers/svga/svga_screen_cache.c | 2 +-
> src/gallium/drivers/svga/svga_shader.h | 2 +-
> src/gallium/drivers/svga/svga_state_fs.c | 2 +-
> src/gallium/drivers/svga/svga_state_rss.c | 2 +-
> src/gallium/drivers/svga/svga_state_tss.c | 2 +-
> src/gallium/drivers/svga/svga_state_vs.c | 2 +-
> src/gallium/drivers/svga/svga_surface.h | 4 +-
> src/gallium/drivers/svga/svga_swtnl_private.h | 2 +-
> src/gallium/drivers/svga/svga_tgsi.c | 2 +-
> src/gallium/drivers/svga/svga_tgsi.h | 6 +-
> src/gallium/drivers/svga/svga_tgsi_emit.h | 20 ++--
> src/gallium/drivers/svga/svgadump/svga_shader.h | 6 +-
> src/gallium/drivers/trace/tr_context.c | 100 +++++++++---------
> src/gallium/drivers/trace/tr_context.h | 2 +-
> src/gallium/drivers/trace/tr_dump.c | 24 ++---
> src/gallium/drivers/trace/tr_dump_defines.h | 4 +-
> src/gallium/drivers/trace/tr_texture.h | 8 +-
> src/gallium/drivers/vc4/vc4_resource.h | 6 +-
> src/gallium/include/pipe/p_compiler.h | 7 +-
> src/gallium/include/state_tracker/st_api.h | 2 +-
> src/gallium/state_trackers/dri/dri2_buffer.h | 2 +-
> src/gallium/state_trackers/dri/dri_context.h | 2 +-
> src/gallium/state_trackers/dri/dri_drawable.h | 2 +-
> src/gallium/state_trackers/dri/dri_screen.h | 6 +-
> src/gallium/state_trackers/dri/drisw.c | 14 +--
> src/gallium/state_trackers/glx/xlib/xm_api.h | 4 +-
> src/gallium/state_trackers/glx/xlib/xm_st.c | 2 +-
> src/gallium/state_trackers/hgl/hgl.c | 4 +-
> src/gallium/state_trackers/nine/adapter9.c | 4 +-
> src/gallium/state_trackers/nine/adapter9.h | 2 +-
> .../state_trackers/nine/authenticatedchannel9.h | 2 +-
> src/gallium/state_trackers/nine/basetexture9.h | 8 +-
> src/gallium/state_trackers/nine/cryptosession9.h | 2 +-
> src/gallium/state_trackers/nine/cubetexture9.h | 2 +-
> src/gallium/state_trackers/nine/device9.c | 6 +-
> src/gallium/state_trackers/nine/device9.h | 2 +-
> src/gallium/state_trackers/nine/device9ex.h | 2 +-
> src/gallium/state_trackers/nine/device9video.h | 2 +-
> src/gallium/state_trackers/nine/indexbuffer9.h | 2 +-
> src/gallium/state_trackers/nine/iunknown.h | 12 +--
> src/gallium/state_trackers/nine/nine_dump.h | 10 +-
> src/gallium/state_trackers/nine/nine_ff.c | 14 +--
> src/gallium/state_trackers/nine/nine_helpers.c | 4 +-
> src/gallium/state_trackers/nine/nine_helpers.h | 6 +-
> src/gallium/state_trackers/nine/nine_pipe.c | 2 +-
> src/gallium/state_trackers/nine/nine_pipe.h | 64 ++++++------
> src/gallium/state_trackers/nine/nine_shader.c | 56 +++++-----
> src/gallium/state_trackers/nine/nine_shader.h | 12 +--
> src/gallium/state_trackers/nine/nine_state.c | 18 ++--
> .../state_trackers/nine/nineexoverlayextension.h | 2 +-
> src/gallium/state_trackers/nine/pixelshader9.h | 2 +-
> src/gallium/state_trackers/nine/query9.c | 2 +-
> src/gallium/state_trackers/nine/query9.h | 2 +-
> src/gallium/state_trackers/nine/resource9.h | 2 +-
> src/gallium/state_trackers/nine/stateblock9.h | 2 +-
> src/gallium/state_trackers/nine/surface9.c | 4 +-
> src/gallium/state_trackers/nine/surface9.h | 12 +--
> src/gallium/state_trackers/nine/swapchain9.c | 2 +-
> src/gallium/state_trackers/nine/swapchain9.h | 2 +-
> src/gallium/state_trackers/nine/swapchain9ex.h | 2 +-
> src/gallium/state_trackers/nine/texture9.h | 2 +-
> src/gallium/state_trackers/nine/vertexbuffer9.h | 2 +-
> .../state_trackers/nine/vertexdeclaration9.c | 8 +-
> .../state_trackers/nine/vertexdeclaration9.h | 2 +-
> src/gallium/state_trackers/nine/vertexshader9.h | 2 +-
> src/gallium/state_trackers/nine/volume9.c | 8 +-
> src/gallium/state_trackers/nine/volume9.h | 6 +-
> src/gallium/state_trackers/nine/volumetexture9.h | 2 +-
> src/gallium/state_trackers/osmesa/osmesa.c | 4 +-
> src/gallium/state_trackers/wgl/stw_device.h | 2 +-
> src/gallium/state_trackers/wgl/stw_framebuffer.c | 4 +-
> src/gallium/state_trackers/wgl/stw_st.c | 2 +-
> src/gallium/state_trackers/wgl/stw_tls.c | 4 +-
> src/gallium/state_trackers/xa/xa_composite.c | 4 +-
> src/gallium/state_trackers/xa/xa_priv.h | 10 +-
> src/gallium/state_trackers/xa/xa_renderer.c | 14 +--
> src/gallium/state_trackers/xa/xa_tgsi.c | 6 +-
> src/gallium/state_trackers/xvmc/xvmc_private.h | 2 +-
> src/gallium/targets/d3dadapter9/drm.c | 8 +-
> src/gallium/tests/graw/graw_util.h | 14 +--
> src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c | 2 +-
> src/gallium/winsys/i915/drm/i915_drm_winsys.h | 6 +-
> src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 4 +-
> src/gallium/winsys/radeon/drm/radeon_drm_bo.h | 2 +-
> src/gallium/winsys/radeon/drm/radeon_drm_cs.c | 2 +-
> src/gallium/winsys/radeon/drm/radeon_drm_cs.h | 8 +-
> src/gallium/winsys/radeon/drm/radeon_drm_winsys.h | 2 +-
> .../winsys/svga/drm/pb_buffer_simple_fenced.c | 14 +--
> src/gallium/winsys/svga/drm/vmw_buffer.c | 4 +-
> src/gallium/winsys/svga/drm/vmw_buffer.h | 4 +-
> src/gallium/winsys/svga/drm/vmw_context.c | 4 +-
> src/gallium/winsys/svga/drm/vmw_fence.c | 6 +-
> src/gallium/winsys/svga/drm/vmw_screen.h | 2 +-
> src/gallium/winsys/svga/drm/vmw_screen_dri.c | 2 +-
> src/gallium/winsys/svga/drm/vmw_screen_ioctl.c | 2 +-
> src/gallium/winsys/svga/drm/vmw_shader.h | 4 +-
> src/gallium/winsys/svga/drm/vmw_surface.h | 4 +-
> src/gallium/winsys/sw/dri/dri_sw_winsys.c | 4 +-
> src/gallium/winsys/sw/gdi/gdi_sw_winsys.c | 2 +-
> src/gallium/winsys/sw/hgl/hgl_sw_winsys.c | 2 +-
> src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c | 4 +-
> src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c | 4 +-
> src/gallium/winsys/sw/xlib/xlib_sw_winsys.c | 2 +-
> src/mesa/state_tracker/st_cb_perfmon.h | 2 +-
> 395 files changed, 1515 insertions(+), 1522 deletions(-)
>
> diff --git a/src/gallium/README.portability b/src/gallium/README.portability
> index adecf4b..cf6cc36 100644
> --- a/src/gallium/README.portability
> +++ b/src/gallium/README.portability
> @@ -13,8 +13,6 @@ headers in general, should strictly follow these guidelines to ensure
>
> * Include the p_compiler.h.
>
> -* Don't use the 'inline' keyword, use the INLINE macro in p_compiler.h instead.
> -
> * Cast explicitly when converting to integer types of smaller sizes.
>
> * Cast explicitly when converting between float, double and integral types.
> diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
> index 0e95369..7eed570 100644
> --- a/src/gallium/include/pipe/p_compiler.h
> +++ b/src/gallium/include/pipe/p_compiler.h
> @@ -94,11 +94,6 @@ typedef unsigned char boolean;
> #endif
> #endif
>
> -/* XXX: Use standard `inline` keyword instead */
> -#ifndef INLINE
> -# define INLINE inline
> -#endif
> -
> /* Forced function inlining */
> #ifndef ALWAYS_INLINE
> # ifdef __GNUC__
> @@ -106,8 +101,7 @@ typedef unsigned char boolean;
> # elif defined(_MSC_VER)
> # define ALWAYS_INLINE __forceinline
> # else
> -# define ALWAYS_INLINE INLINE
> +# define ALWAYS_INLINE inline
> # endif
> #endif
>
> --
> 2.3.6
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
More information about the mesa-dev
mailing list