Module: Mesa Branch: use-utils-functions2 Commit: fc0a7b36635ddc46f748825200856cccc83037c5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc0a7b36635ddc46f748825200856cccc83037c5
Author: Dylan Baker <[email protected]> Date: Fri Sep 14 12:57:32 2018 -0700 remove final imports.h 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. v2: - remove duplicate addition --- src/compiler/glsl/glsl_to_nir.cpp | 1 - src/compiler/glsl/linker.cpp | 1 - src/compiler/nir/nir_opt_copy_propagate.c | 1 - .../drivers/panfrost/midgard/midgard_compile.c | 1 - src/gallium/state_trackers/glx/xlib/glx_api.c | 1 - src/gallium/state_trackers/glx/xlib/xm_api.c | 1 - src/mapi/glapi/gen/gl_genexec.py | 1 - src/mapi/glapi/gen/gl_table.py | 1 + src/mesa/Makefile.sources | 3 +- src/mesa/drivers/common/driverfuncs.c | 1 - src/mesa/drivers/common/meta_blit.c | 1 - src/mesa/drivers/dri/i915/i830_context.c | 1 - src/mesa/drivers/dri/i915/i915_context.c | 1 - src/mesa/drivers/dri/i915/i915_debug_fp.c | 4 +- src/mesa/drivers/dri/i915/i915_vtbl.c | 1 - src/mesa/drivers/dri/i915/intel_context.c | 1 - src/mesa/drivers/dri/i915/intel_fbo.c | 1 - src/mesa/drivers/dri/i915/intel_render.c | 1 - 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 | 2 - 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 | 1 - src/mesa/drivers/dri/r200/r200_cmdbuf.c | 1 - src/mesa/drivers/dri/r200/r200_context.c | 1 - src/mesa/drivers/dri/r200/r200_ioctl.c | 1 - src/mesa/drivers/dri/r200/r200_maos_arrays.c | 1 - src/mesa/drivers/dri/r200/r200_sanity.c | 1 - src/mesa/drivers/dri/r200/r200_state.c | 1 - src/mesa/drivers/dri/r200/r200_state_init.c | 1 - src/mesa/drivers/dri/r200/r200_swtcl.c | 1 - src/mesa/drivers/dri/r200/r200_tcl.c | 1 - src/mesa/drivers/dri/r200/r200_tex.c | 1 - src/mesa/drivers/dri/r200/r200_texstate.c | 1 - .../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 | 1 - src/mesa/drivers/dri/radeon/radeon_fbo.c | 1 - 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 | 1 - src/mesa/drivers/dri/radeon/radeon_maos_verts.c | 1 - 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 | 1 - src/mesa/drivers/dri/radeon/radeon_state.c | 1 - src/mesa/drivers/dri/radeon/radeon_state_init.c | 1 - src/mesa/drivers/dri/radeon/radeon_swtcl.c | 1 - src/mesa/drivers/dri/radeon/radeon_tcl.c | 1 - src/mesa/drivers/dri/radeon/radeon_tex.c | 1 - src/mesa/drivers/dri/radeon/radeon_texstate.c | 1 - src/mesa/drivers/dri/radeon/radeon_texture.c | 1 - src/mesa/drivers/dri/swrast/swrast.c | 1 - src/mesa/drivers/osmesa/osmesa.c | 1 - src/mesa/drivers/x11/fakeglx.c | 1 - src/mesa/drivers/x11/xfonts.c | 1 - src/mesa/drivers/x11/xm_api.c | 1 - src/mesa/drivers/x11/xm_buffer.c | 1 - src/mesa/drivers/x11/xm_dd.c | 1 - src/mesa/drivers/x11/xm_tri.c | 1 - src/mesa/main/accum.c | 1 - src/mesa/main/api_arrayelt.c | 1 - src/mesa/main/arbprogram.c | 1 - src/mesa/main/arrayobj.c | 1 - src/mesa/main/atifragshader.c | 1 - src/mesa/main/attrib.c | 1 - src/mesa/main/context.c | 1 - src/mesa/main/context.h | 1 - src/mesa/main/cpuinfo.c | 5 +- src/mesa/main/debug_output.c | 1 - src/mesa/main/depth.c | 1 - src/mesa/main/draw_validate.c | 1 - src/mesa/main/drawtex.c | 1 - src/mesa/main/es1_conversion.c | 1 - src/mesa/main/execmem.c | 1 - src/mesa/main/execmem.h | 1 + src/mesa/main/extensions.c | 1 - src/mesa/main/ff_fragment_shader.cpp | 1 - src/mesa/main/format_utils.h | 1 - src/mesa/main/formats.c | 1 - src/mesa/main/framebuffer.c | 1 - src/mesa/main/hash.h | 2 +- src/mesa/main/hint.c | 1 - src/mesa/main/image.c | 1 - src/mesa/main/imports.c | 65 ---------------------- src/mesa/main/macros.h | 3 +- src/mesa/main/matrix.c | 1 - src/mesa/main/{imports.h => mesa_private.h} | 24 ++------ src/mesa/main/mipmap.c | 1 - src/mesa/main/objectpurge.c | 1 - src/mesa/main/pack.c | 2 - src/mesa/main/pipelineobj.c | 1 + src/mesa/main/pixeltransfer.c | 1 - src/mesa/main/polygon.c | 1 - src/mesa/main/queryobj.c | 1 - src/mesa/main/readpix.c | 1 - src/mesa/main/remap.c | 2 +- src/mesa/main/renderbuffer.c | 1 - src/mesa/main/shared.c | 1 - src/mesa/main/stencil.c | 1 - src/mesa/main/streaming-load-memcpy.h | 2 + src/mesa/main/syncobj.c | 1 - src/mesa/main/texcompress.c | 1 - src/mesa/main/texcompress_cpal.c | 1 - src/mesa/main/texcompress_fxt1.c | 1 - src/mesa/main/texcompress_rgtc.c | 1 - src/mesa/main/texcompress_s3tc.c | 1 - src/mesa/main/texobj.c | 1 - src/mesa/main/texstorage.c | 1 - src/mesa/main/texstore.c | 1 - src/mesa/main/texturebindless.c | 1 - src/mesa/main/textureview.c | 1 - src/mesa/main/varray.c | 1 - src/mesa/main/vtxfmt.c | 1 - src/mesa/math/m_debug_clip.c | 1 - src/mesa/meson.build | 3 +- src/mesa/program/arbprogparse.c | 1 - src/mesa/program/prog_cache.c | 1 - src/mesa/program/prog_noise.c | 1 - src/mesa/program/prog_parameter.c | 1 - src/mesa/program/prog_parameter.h | 1 + src/mesa/program/prog_parameter_layout.c | 1 - src/mesa/program/prog_statevars.c | 1 - src/mesa/program/prog_to_nir.c | 1 - src/mesa/program/program_lexer.l | 1 - src/mesa/program/program_parse.y | 1 - src/mesa/program/symbol_table.c | 3 +- src/mesa/state_tracker/st_atom_atomicbuf.c | 1 - src/mesa/state_tracker/st_atom_constbuf.c | 1 - src/mesa/state_tracker/st_atom_image.c | 1 - src/mesa/state_tracker/st_atom_shader.c | 1 - src/mesa/state_tracker/st_atom_storagebuf.c | 1 - src/mesa/state_tracker/st_cb_bitmap.c | 1 - src/mesa/state_tracker/st_cb_blit.c | 1 - src/mesa/state_tracker/st_cb_bufferobjects.c | 1 - src/mesa/state_tracker/st_cb_condrender.c | 1 - src/mesa/state_tracker/st_cb_drawpixels.c | 1 - src/mesa/state_tracker/st_cb_drawtex.c | 1 - src/mesa/state_tracker/st_cb_fbo.c | 1 - src/mesa/state_tracker/st_cb_feedback.c | 1 - src/mesa/state_tracker/st_cb_memoryobjects.c | 1 - src/mesa/state_tracker/st_cb_msaa.c | 1 - src/mesa/state_tracker/st_cb_queryobj.c | 1 - src/mesa/state_tracker/st_cb_rasterpos.c | 1 - src/mesa/state_tracker/st_cb_readpixels.c | 1 - src/mesa/state_tracker/st_cb_semaphoreobjects.c | 1 - src/mesa/state_tracker/st_cb_texture.c | 1 - src/mesa/state_tracker/st_cb_texturebarrier.c | 1 - src/mesa/state_tracker/st_context.c | 1 - src/mesa/state_tracker/st_draw.c | 1 - src/mesa/state_tracker/st_draw_feedback.c | 1 - src/mesa/state_tracker/st_extensions.c | 1 - src/mesa/state_tracker/st_format.c | 1 - src/mesa/state_tracker/st_gen_mipmap.c | 1 - src/mesa/state_tracker/st_program.c | 1 - src/mesa/swrast/s_clear.c | 1 - src/mesa/swrast/s_context.c | 1 - src/mesa/swrast/s_copypix.c | 1 - src/mesa/swrast/s_depth.c | 1 - src/mesa/swrast/s_drawpix.c | 1 - src/mesa/swrast/s_logic.c | 1 - src/mesa/swrast/s_renderbuffer.c | 1 - src/mesa/swrast/s_span.c | 1 - src/mesa/swrast/s_stencil.c | 1 - src/mesa/swrast/s_texcombine.c | 1 - src/mesa/swrast/s_texfilter.c | 1 - src/mesa/swrast/s_texture.c | 1 + src/mesa/swrast/s_triangle.c | 1 - src/mesa/swrast/s_zoom.c | 1 - src/mesa/swrast_setup/ss_context.c | 1 - src/mesa/tnl/t_context.c | 1 - src/mesa/tnl/t_context.h | 1 - src/mesa/tnl/t_draw.c | 1 - src/mesa/tnl/t_pipeline.c | 1 - src/mesa/tnl/t_split_copy.c | 1 - src/mesa/tnl/t_vb_fog.c | 1 - src/mesa/tnl/t_vb_light.c | 1 - src/mesa/tnl/t_vb_normals.c | 1 - src/mesa/tnl/t_vb_points.c | 1 - src/mesa/tnl/t_vb_render.c | 1 - src/mesa/tnl/t_vb_texgen.c | 1 - src/mesa/tnl/t_vb_texmat.c | 1 - src/mesa/vbo/vbo_exec.h | 2 +- src/mesa/vbo/vbo_primitive_restart.c | 1 - src/mesa/vbo/vbo_save_draw.c | 2 +- src/mesa/vbo/vbo_save_loopback.c | 2 +- src/mesa/x86/common_x86.c | 1 - src/mesa/x86/rtasm/x86sse.c | 1 - src/meson.build | 5 +- src/util/register_allocate.c | 1 - 200 files changed, 32 insertions(+), 287 deletions(-) Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=fc0a7b36635ddc46f748825200856cccc83037c5 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
