[Mesa-dev] [PATCH] Treewide: Remove Elements() macro

Brian Paul brianp at vmware.com
Tue May 17 20:13:11 UTC 2016


On 05/17/2016 01:36 PM, Jan Vesely wrote:
> On Tue, 2016-05-17 at 08:02 -0600, Brian Paul wrote:
>> On 05/17/2016 07:25 AM, Jan Vesely wrote:
>>>
>>> Signed-off-by: Jan Vesely <jano.vesely at gmail.com>
>>> ---
>>>
>>> grep '[^a-z]Elements(' -r * returns only one hit:
>>> src/mesa/vbo/vbo_minmax_index.c: * glDraw[Range]Elements() calls.
>>>
>>>    src/gallium/auxiliary/pipe-loader/pipe_loader.c    |  2 +-
>>>    src/gallium/auxiliary/util/u_memory.h              |  8 ---
>>>    src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c     | 24 ++++----
>>>    .../drivers/nouveau/codegen/nv50_ir_peephole.cpp   |  2 +-
>>>    .../drivers/nouveau/codegen/nv50_ir_print.cpp      |  6 +-
>>>    .../drivers/nouveau/codegen/nv50_ir_target.cpp     |  4 +-
>>>    src/gallium/drivers/nouveau/nouveau_compiler.c     |  2 +-
>>>    src/gallium/drivers/nouveau/nv50/nv50_tex.c        |  4 +-
>>>    src/gallium/drivers/r300/r300_chipset.c            |  2 +-
>>>    src/gallium/drivers/r300/r300_vs_draw.c            |  8 +--
>>>    src/gallium/drivers/r600/evergreen_state.c         | 12 ++--
>>>    src/gallium/drivers/r600/r600_shader.c             | 10 ++--
>>>    src/gallium/drivers/r600/r600_state_common.c       |  6 +-
>>>    src/gallium/drivers/r600/sb/sb_bc_parser.cpp       |  2 +-
>>>    src/gallium/drivers/radeon/r600_query.c            |  6 +-
>>>    src/gallium/drivers/radeon/r600_texture.c          |  2 +-
>>>    .../drivers/radeon/radeon_setup_tgsi_llvm.c        |  4 +-
>>>    src/gallium/drivers/radeon/radeon_video.c          |  2 +-
>>>    src/gallium/drivers/radeonsi/si_descriptors.c      |  8 +--
>>>    src/gallium/drivers/radeonsi/si_pipe.c             |  2 +-
>>>    src/gallium/drivers/radeonsi/si_shader.c           |  6 +-
>>>    src/gallium/drivers/radeonsi/si_state.c            |  2 +-
>>>    src/gallium/drivers/radeonsi/si_state_draw.c       |  4 +-
>>>    .../state_trackers/clover/tgsi/compiler.cpp        |  2 +-
>>>    src/gallium/state_trackers/nine/device9.c          | 10 ++--
>>>    src/gallium/state_trackers/nine/nine_ff.c          |  6 +-
>>>    src/gallium/state_trackers/nine/nine_shader.c      | 64
>>> +++++++++++-----------
>>>    src/gallium/state_trackers/nine/nine_state.c       |  8 +--
>>>    src/gallium/state_trackers/nine/stateblock9.c      |  6 +-
>>>    src/gallium/state_trackers/nine/vertexshader9.c    |  2 +-
>>>    src/gallium/state_trackers/omx/vid_dec_h264.c      |  4 +-
>>>    src/gallium/state_trackers/osmesa/osmesa.c         |  4 +-
>>>    src/gallium/state_trackers/va/surface.c            |  4 +-
>>>    src/gallium/state_trackers/vdpau/ftab.c            |  6 +-
>>>    src/gallium/state_trackers/wgl/stw_pixelformat.c   | 10 ++--
>>>    src/gallium/targets/d3dadapter9/getproc.c          |  2 +-
>>>    src/gallium/targets/graw-null/graw_util.c          |  6 +-
>>>    src/gallium/tests/graw/vs-test.c                   |  2 +-
>>>    src/gallium/tests/trivial/compute.c                |  6 +-
>>>    src/gallium/tests/unit/translate_test.c            |  4 +-
>>>    src/gallium/winsys/amdgpu/drm/amdgpu_cs.c          |  8 +--
>>>    src/gallium/winsys/radeon/drm/radeon_drm_cs.c      |  8 +--
>>>    42 files changed, 141 insertions(+), 149 deletions(-)
>> LGTM.  Assuming you compile-tested everything (to make sure
>> util/macros.h is included as needed),
>>
>> Reviewed-by: Brian Paul <brianp at vmware.com>
>
> thanks. radeon needed some extra fixes.
> Would it make sense to just add -iutil/macros.h to the commandline
> instead of including everywhere?

Is that a gcc feature?  We also need to compile with MS Visual Studio.

Since util/macros.h is included from 
src/gallium/include/pipe/p_compiler.h it should get indirectly included 
almost everywhere in gallium.

-Brian




More information about the mesa-dev mailing list