Mesa (master): remove final imports.h and imports.c bits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Apr 21 20:52:40 UTC 2020
Module: Mesa
Branch: master
Commit: 8e3696137f2cb7b4f5a3824f26186ecbb06f9282
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e3696137f2cb7b4f5a3824f26186ecbb06f9282
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Fri Sep 14 12:57:32 2018 -0700
remove final imports.h and imports.c bits
This moves the fi_types to a new mesa_private.h and removes the
imports.c file. The vast majority of this patch is just removing
pound includes of imports.h and fixing up the recursive includes.
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>
---
src/compiler/glsl/glsl_to_nir.cpp | 3 +-
src/compiler/glsl/linker.cpp | 2 +-
src/compiler/nir/nir_opt_copy_propagate.c | 1 -
src/gallium/state_trackers/glx/xlib/glx_api.c | 19 ++--
src/gallium/state_trackers/glx/xlib/xm_api.c | 11 +-
src/intel/compiler/brw_eu_defines.h | 1 +
src/intel/compiler/brw_eu_validate.c | 1 +
src/mapi/glapi/gen/gl_enums.py | 3 +-
src/mapi/glapi/gen/gl_genexec.py | 1 -
src/mapi/glapi/gen/gl_table.py | 1 +
src/mesa/Android.libmesa_glsl_utils.mk | 1 -
src/mesa/Makefile.sources | 1 +
src/mesa/drivers/common/driverfuncs.c | 1 -
src/mesa/drivers/common/meta.c | 5 +-
src/mesa/drivers/common/meta_blit.c | 1 -
src/mesa/drivers/dri/i915/i830_context.c | 11 +-
src/mesa/drivers/dri/i915/i915_context.c | 11 +-
src/mesa/drivers/dri/i915/i915_debug_fp.c | 14 ++-
src/mesa/drivers/dri/i915/i915_vtbl.c | 19 ++--
src/mesa/drivers/dri/i915/intel_context.c | 15 ++-
src/mesa/drivers/dri/i915/intel_fbo.c | 11 +-
src/mesa/drivers/dri/i915/intel_render.c | 13 +--
src/mesa/drivers/dri/i915/intel_syncobj.c | 2 -
src/mesa/drivers/dri/i965/brw_conditional_render.c | 1 -
src/mesa/drivers/dri/i965/brw_context.c | 1 -
src/mesa/drivers/dri/i965/brw_object_purgeable.c | 1 -
src/mesa/drivers/dri/i965/brw_primitive_restart.c | 1 -
src/mesa/drivers/dri/i965/brw_program.c | 1 -
src/mesa/drivers/dri/i965/brw_program_cache.c | 1 -
src/mesa/drivers/dri/i965/brw_queryobj.c | 1 -
src/mesa/drivers/dri/i965/brw_sync.c | 2 -
src/mesa/drivers/dri/i965/gen6_queryobj.c | 2 -
src/mesa/drivers/dri/i965/hsw_queryobj.c | 2 -
src/mesa/drivers/dri/i965/intel_buffer_objects.c | 1 -
src/mesa/drivers/dri/i965/intel_fbo.c | 1 -
src/mesa/drivers/dri/i965/intel_upload.c | 1 -
src/mesa/drivers/dri/nouveau/nouveau_driver.h | 2 +-
src/mesa/drivers/dri/r200/r200_cmdbuf.c | 22 ++--
src/mesa/drivers/dri/r200/r200_context.c | 12 +-
src/mesa/drivers/dri/r200/r200_ioctl.c | 2 +-
src/mesa/drivers/dri/r200/r200_maos_arrays.c | 4 +-
src/mesa/drivers/dri/r200/r200_sanity.c | 120 ++++++++++----------
src/mesa/drivers/dri/r200/r200_state.c | 2 +-
src/mesa/drivers/dri/r200/r200_state_init.c | 122 ++++++++++-----------
src/mesa/drivers/dri/r200/r200_swtcl.c | 2 +-
src/mesa/drivers/dri/r200/r200_tcl.c | 42 +++----
src/mesa/drivers/dri/r200/r200_tex.c | 16 +--
src/mesa/drivers/dri/r200/r200_texstate.c | 36 +++---
.../drivers/dri/radeon/radeon_buffer_objects.c | 1 -
src/mesa/drivers/dri/radeon/radeon_common.c | 1 -
src/mesa/drivers/dri/radeon/radeon_context.c | 15 ++-
src/mesa/drivers/dri/radeon/radeon_fbo.c | 23 ++--
src/mesa/drivers/dri/radeon/radeon_fog.c | 1 -
src/mesa/drivers/dri/radeon/radeon_ioctl.c | 1 -
src/mesa/drivers/dri/radeon/radeon_maos_arrays.c | 15 ++-
src/mesa/drivers/dri/radeon/radeon_maos_verts.c | 13 +--
src/mesa/drivers/dri/radeon/radeon_queryobj.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_queryobj.h | 1 -
src/mesa/drivers/dri/radeon/radeon_screen.c | 3 +-
src/mesa/drivers/dri/radeon/radeon_state.c | 1 -
src/mesa/drivers/dri/radeon/radeon_state_init.c | 67 ++++++-----
src/mesa/drivers/dri/radeon/radeon_swtcl.c | 33 +++---
src/mesa/drivers/dri/radeon/radeon_tcl.c | 47 ++++----
src/mesa/drivers/dri/radeon/radeon_tex.c | 11 +-
src/mesa/drivers/dri/radeon/radeon_texstate.c | 19 ++--
src/mesa/drivers/dri/radeon/radeon_texture.c | 9 +-
src/mesa/drivers/dri/swrast/swrast.c | 1 -
src/mesa/drivers/osmesa/osmesa.c | 5 +-
src/mesa/drivers/x11/fakeglx.c | 5 +-
src/mesa/drivers/x11/xfonts.c | 1 -
src/mesa/drivers/x11/xm_api.c | 1 -
src/mesa/drivers/x11/xm_buffer.c | 7 +-
src/mesa/drivers/x11/xm_dd.c | 7 +-
src/mesa/drivers/x11/xm_tri.c | 3 +-
src/mesa/main/accum.c | 6 +-
src/mesa/main/api_arrayelt.c | 2 +-
src/mesa/main/arbprogram.c | 16 +--
src/mesa/main/arrayobj.c | 4 +-
src/mesa/main/atifragshader.c | 10 +-
src/mesa/main/attrib.c | 2 +-
src/mesa/main/context.c | 2 +-
src/mesa/main/context.h | 8 +-
src/mesa/main/cpuinfo.c | 5 +-
src/mesa/main/debug.c | 6 +-
src/mesa/main/debug_output.c | 2 +-
src/mesa/main/depth.c | 2 +-
src/mesa/main/dlist.c | 2 +-
src/mesa/main/draw_validate.c | 2 +-
src/mesa/main/drawtex.c | 2 +-
src/mesa/main/errors.c | 6 +-
src/mesa/main/es1_conversion.c | 2 +-
src/mesa/main/execmem.c | 17 ++-
src/mesa/main/execmem.h | 1 +
src/mesa/main/extensions.c | 2 +-
src/mesa/main/ff_fragment_shader.cpp | 22 ++--
src/mesa/main/format_unpack.py | 1 +
src/mesa/main/format_utils.c | 2 +
src/mesa/main/format_utils.h | 2 +-
src/mesa/main/formats.c | 4 +-
src/mesa/main/framebuffer.c | 2 +-
src/mesa/main/hash.h | 6 +-
src/mesa/main/hint.c | 2 +-
src/mesa/main/image.c | 4 +-
src/mesa/main/macros.h | 3 +-
src/mesa/main/matrix.c | 16 +--
src/{util/imports.h => mesa/main/mesa_private.h} | 23 +---
src/mesa/main/mipmap.c | 4 +-
src/mesa/main/objectpurge.c | 2 +-
src/mesa/main/pack.c | 8 +-
src/mesa/main/pipelineobj.c | 1 +
src/mesa/main/pixeltransfer.c | 2 +-
src/mesa/main/polygon.c | 2 +-
src/mesa/main/queryobj.c | 2 +-
src/mesa/main/readpix.c | 2 +-
src/mesa/main/remap.c | 3 +-
src/mesa/main/renderbuffer.c | 2 +-
src/mesa/main/shared.c | 4 +-
src/mesa/main/stencil.c | 6 +-
src/mesa/main/streaming-load-memcpy.h | 2 +
src/mesa/main/syncobj.c | 2 +-
src/mesa/main/texcompress.c | 2 +-
src/mesa/main/texcompress_astc.cpp | 1 +
src/mesa/main/texcompress_cpal.c | 2 +-
src/mesa/main/texcompress_fxt1.c | 8 +-
src/mesa/main/texcompress_rgtc.c | 5 +-
src/mesa/main/texcompress_s3tc.c | 2 +-
src/mesa/main/teximage.c | 2 +-
src/mesa/main/texobj.c | 2 +-
src/mesa/main/texstorage.c | 8 +-
src/mesa/main/texstore.c | 2 +-
src/mesa/main/texturebindless.c | 2 +-
src/mesa/main/textureview.c | 2 +-
src/mesa/main/varray.c | 2 +-
src/mesa/main/version.c | 2 +-
src/mesa/main/vtxfmt.c | 2 +-
src/mesa/math/m_debug_clip.c | 2 +-
src/mesa/meson.build | 1 +
src/mesa/program/arbprogparse.c | 4 +-
src/mesa/program/prog_cache.c | 16 +--
src/mesa/program/prog_instruction.c | 3 +-
src/mesa/program/prog_noise.c | 2 +-
src/mesa/program/prog_parameter.c | 1 -
src/mesa/program/prog_parameter.h | 2 +
src/mesa/program/prog_parameter_layout.c | 6 +-
src/mesa/program/prog_print.c | 9 +-
src/mesa/program/prog_statevars.c | 12 +-
src/mesa/program/prog_to_nir.c | 2 +-
src/mesa/program/program_lexer.l | 4 +-
src/mesa/program/program_parse.y | 28 ++---
src/mesa/program/symbol_table.c | 6 +-
src/mesa/state_tracker/st_atom_atomicbuf.c | 2 +-
src/mesa/state_tracker/st_atom_constbuf.c | 2 +-
src/mesa/state_tracker/st_atom_image.c | 2 +-
src/mesa/state_tracker/st_atom_shader.c | 14 +--
src/mesa/state_tracker/st_atom_storagebuf.c | 2 +-
src/mesa/state_tracker/st_cb_bitmap.c | 12 +-
src/mesa/state_tracker/st_cb_blit.c | 14 +--
src/mesa/state_tracker/st_cb_bufferobjects.c | 2 +-
src/mesa/state_tracker/st_cb_condrender.c | 12 +-
src/mesa/state_tracker/st_cb_drawpixels.c | 14 +--
src/mesa/state_tracker/st_cb_drawtex.c | 4 +-
src/mesa/state_tracker/st_cb_fbo.c | 2 +-
src/mesa/state_tracker/st_cb_feedback.c | 12 +-
src/mesa/state_tracker/st_cb_memoryobjects.c | 2 +-
src/mesa/state_tracker/st_cb_msaa.c | 2 +-
src/mesa/state_tracker/st_cb_queryobj.c | 11 +-
src/mesa/state_tracker/st_cb_rasterpos.c | 12 +-
src/mesa/state_tracker/st_cb_readpixels.c | 12 +-
src/mesa/state_tracker/st_cb_semaphoreobjects.c | 2 +-
src/mesa/state_tracker/st_cb_texture.c | 2 +-
src/mesa/state_tracker/st_cb_texturebarrier.c | 2 +-
src/mesa/state_tracker/st_context.c | 2 +-
src/mesa/state_tracker/st_draw.c | 2 +-
src/mesa/state_tracker/st_draw_feedback.c | 12 +-
src/mesa/state_tracker/st_extensions.c | 12 +-
src/mesa/state_tracker/st_format.c | 12 +-
src/mesa/state_tracker/st_gen_mipmap.c | 12 +-
src/mesa/state_tracker/st_program.c | 12 +-
src/mesa/swrast/s_clear.c | 2 +-
src/mesa/swrast/s_context.c | 6 +-
src/mesa/swrast/s_copypix.c | 4 +-
src/mesa/swrast/s_depth.c | 4 +-
src/mesa/swrast/s_drawpix.c | 4 +-
src/mesa/swrast/s_logic.c | 2 +-
src/mesa/swrast/s_renderbuffer.c | 8 +-
src/mesa/swrast/s_span.c | 8 +-
src/mesa/swrast/s_stencil.c | 6 +-
src/mesa/swrast/s_texcombine.c | 4 +-
src/mesa/swrast/s_texfilter.c | 44 ++++----
src/mesa/swrast/s_texture.c | 1 +
src/mesa/swrast/s_triangle.c | 4 +-
src/mesa/swrast/s_zoom.c | 2 +-
src/mesa/swrast_setup/ss_context.c | 6 +-
src/mesa/tnl/t_context.c | 6 +-
src/mesa/tnl/t_context.h | 36 +++---
src/mesa/tnl/t_draw.c | 2 +-
src/mesa/tnl/t_pipeline.c | 18 +--
src/mesa/tnl/t_split_copy.c | 2 +-
src/mesa/tnl/t_vb_fog.c | 2 +-
src/mesa/tnl/t_vb_light.c | 16 +--
src/mesa/tnl/t_vb_normals.c | 2 +-
src/mesa/tnl/t_vb_points.c | 2 +-
src/mesa/tnl/t_vb_render.c | 12 +-
src/mesa/tnl/t_vb_texgen.c | 10 +-
src/mesa/tnl/t_vb_texmat.c | 4 +-
src/mesa/vbo/vbo_exec.h | 2 +-
src/mesa/vbo/vbo_primitive_restart.c | 2 +-
src/mesa/vbo/vbo_save_draw.c | 2 +-
src/mesa/vbo/vbo_save_loopback.c | 2 +-
src/mesa/x86/common_x86.c | 8 +-
src/mesa/x86/rtasm/x86sse.c | 69 ++++++------
src/meson.build | 3 +-
src/panfrost/bifrost/bifrost_compile.c | 3 +-
src/panfrost/midgard/midgard_compile.c | 5 +-
src/util/Makefile.sources | 2 -
src/util/imports.c | 62 -----------
src/util/meson.build | 2 -
src/util/register_allocate.c | 4 +-
218 files changed, 843 insertions(+), 952 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=8e3696137f2cb7b4f5a3824f26186ecbb06f9282
More information about the mesa-commit
mailing list