diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-09-14 12:57:32 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-07-08 14:27:09 -0700 |
| commit | 56ff5359890b88ee09849876443feb3fa3065913 (patch) | |
| tree | be552f16b5884a59df1b8d4fb19e917bc6840ebb | |
| parent | cbdf3fa3432b2a4a217f6d44399f99713f6ae840 (diff) | |
| download | mesa-use-utils-functions2.tar.gz | |
remove final imports.h bitsuse-utils-functions2
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
200 files changed, 32 insertions, 287 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index 7b454cab623..40bae5ff4f1 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -36,7 +36,6 @@ #include "compiler/nir/nir_builder.h" #include "compiler/nir/nir_deref.h" #include "main/errors.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/shaderobj.h" #include "util/u_math.h" diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 7445def6aa4..a887d87c9a4 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -86,7 +86,6 @@ #include "util/u_string.h" #include "util/u_math.h" -#include "main/imports.h" #include "main/shaderobj.h" #include "main/enums.h" #include "main/mtypes.h" diff --git a/src/compiler/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c index 0961d6bbf29..839f7883a3b 100644 --- a/src/compiler/nir/nir_opt_copy_propagate.c +++ b/src/compiler/nir/nir_opt_copy_propagate.c @@ -26,7 +26,6 @@ */ #include "nir.h" -#include <main/imports.h> /** * SSA-based copy propagation diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/gallium/drivers/panfrost/midgard/midgard_compile.c index 5559aa44454..05cc8008d51 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard_compile.c +++ b/src/gallium/drivers/panfrost/midgard/midgard_compile.c @@ -33,7 +33,6 @@ #include "main/mtypes.h" #include "compiler/glsl/glsl_to_nir.h" #include "compiler/nir_types.h" -#include "main/imports.h" #include "compiler/nir/nir_builder.h" #include "util/half_float.h" #include "util/u_math.h" diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c index dee0cfadfeb..d6474366358 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_api.c +++ b/src/gallium/state_trackers/glx/xlib/glx_api.c @@ -39,7 +39,6 @@ #include <GL/glxproto.h> #include "xm_api.h" -#include "main/imports.h" #include "main/errors.h" #include "util/u_math.h" #include "util/u_memory.h" diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index ae3e528da31..ebad7b85838 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -71,7 +71,6 @@ #include "hud/hud_context.h" #include "main/errors.h" -#include "main/imports.h" #include "xm_public.h" #include <GL/glx.h> diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index bd14bff4f27..cb70782da2c 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -89,7 +89,6 @@ header = """/** #include "main/genmipmap.h" #include "main/hint.h" #include "main/histogram.h" -#include "main/imports.h" #include "main/light.h" #include "main/lines.h" #include "main/matrix.h" diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py index 4b89ef8a856..838558507f1 100644 --- a/src/mapi/glapi/gen/gl_table.py +++ b/src/mapi/glapi/gen/gl_table.py @@ -101,6 +101,7 @@ class PrintRemapTable(gl_XML.gl_print_base): * named function in the specified dispatch table. */ """) + print('#include "main/glheader.h"') return diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 89bcfe40bb5..dfcbfddcf3e 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -134,8 +134,7 @@ MAIN_FILES = \ main/histogram.h \ main/image.c \ main/image.h \ - main/imports.c \ - main/imports.h \ + main/mesa_private.h \ main/light.c \ main/light.h \ main/lines.c \ diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index bdfac61f344..5d6be97a206 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -24,7 +24,6 @@ #include "main/glheader.h" -#include "main/imports.h" #include "main/accum.h" #include "main/arrayobj.h" #include "main/context.h" diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index 54ad72bae53..f2bf1ba5b4a 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -24,7 +24,6 @@ #include "main/glheader.h" #include "main/mtypes.h" -#include "main/imports.h" #include "main/arbprogram.h" #include "main/arrayobj.h" #include "main/blend.h" diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c index 166c60190b7..d95dab4ebfa 100644 --- a/src/mesa/drivers/dri/i915/i830_context.c +++ b/src/mesa/drivers/dri/i915/i830_context.c @@ -28,7 +28,6 @@ #include "i830_context.h" #include "main/api_exec.h" #include "main/extensions.h" -#include "main/imports.h" #include "main/version.h" #include "main/vtxfmt.h" #include "tnl/tnl.h" diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 64843020127..1c66a3eb227 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -29,7 +29,6 @@ #include "main/api_exec.h" #include "main/framebuffer.h" #include "main/extensions.h" -#include "main/imports.h" #include "main/macros.h" #include "main/version.h" #include "main/vtxfmt.h" diff --git a/src/mesa/drivers/dri/i915/i915_debug_fp.c b/src/mesa/drivers/dri/i915/i915_debug_fp.c index d107c5afb38..99ba9f383e2 100644 --- a/src/mesa/drivers/dri/i915/i915_debug_fp.c +++ b/src/mesa/drivers/dri/i915/i915_debug_fp.c @@ -26,10 +26,12 @@ **************************************************************************/ #include <stdio.h> +#include <assert.h> + +#include "main/glheader.h" #include "i915_reg.h" #include "i915_debug.h" -#include "main/imports.h" static const char *opcodes[0x20] = { "NOP", diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c index 562c83a665f..329e0a607c2 100644 --- a/src/mesa/drivers/dri/i915/i915_vtbl.c +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c @@ -29,7 +29,6 @@ #include "main/glheader.h" #include "main/mtypes.h" -#include "main/imports.h" #include "main/macros.h" #include "main/renderbuffer.h" #include "main/framebuffer.h" diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index aa3175816cf..a9345d8ec04 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -31,7 +31,6 @@ #include "main/extensions.h" #include "main/fbobject.h" #include "main/framebuffer.h" -#include "main/imports.h" #include "main/points.h" #include "main/renderbuffer.h" diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c index bab05666b13..91c5cfbee3e 100644 --- a/src/mesa/drivers/dri/i915/intel_fbo.c +++ b/src/mesa/drivers/dri/i915/intel_fbo.c @@ -27,7 +27,6 @@ #include "main/enums.h" -#include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" #include "main/fbobject.h" diff --git a/src/mesa/drivers/dri/i915/intel_render.c b/src/mesa/drivers/dri/i915/intel_render.c index a3952826246..c9437825550 100644 --- a/src/mesa/drivers/dri/i915/intel_render.c +++ b/src/mesa/drivers/dri/i915/intel_render.c @@ -33,7 +33,6 @@ #include "main/glheader.h" #include "main/context.h" #include "main/macros.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/enums.h" diff --git a/src/mesa/drivers/dri/i915/intel_syncobj.c b/src/mesa/drivers/dri/i915/intel_syncobj.c index 4839164ed97..7355b493c32 100644 --- a/src/mesa/drivers/dri/i915/intel_syncobj.c +++ b/src/mesa/drivers/dri/i915/intel_syncobj.c @@ -38,8 +38,6 @@ * performance bottleneck, though. */ -#include "main/imports.h" - #include "intel_context.h" #include "intel_batchbuffer.h" #include "intel_reg.h" diff --git a/src/mesa/drivers/dri/i965/brw_conditional_render.c b/src/mesa/drivers/dri/i965/brw_conditional_render.c index 5de6778430c..463918f70e3 100644 --- a/src/mesa/drivers/dri/i965/brw_conditional_render.c +++ b/src/mesa/drivers/dri/i965/brw_conditional_render.c @@ -30,7 +30,6 @@ * (GL_NV_conditional_render, GL_ARB_conditional_render_inverted) on Gen7+. */ -#include "main/imports.h" #include "main/condrender.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index c3d4784e94c..5e3a7a9a774 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -37,7 +37,6 @@ #include "main/fbobject.h" #include "main/extensions.h" #include "main/glthread.h" -#include "main/imports.h" #include "main/macros.h" #include "main/points.h" #include "main/version.h" diff --git a/src/mesa/drivers/dri/i965/brw_object_purgeable.c b/src/mesa/drivers/dri/i965/brw_object_purgeable.c index c6d4a085f0f..7a75cfc3f97 100644 --- a/src/mesa/drivers/dri/i965/brw_object_purgeable.c +++ b/src/mesa/drivers/dri/i965/brw_object_purgeable.c @@ -27,7 +27,6 @@ * The driver implementation of the GL_APPLE_object_purgeable extension. */ -#include "main/imports.h" #include "main/mtypes.h" #include "main/macros.h" #include "main/bufferobj.h" diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c index 3b696aa9cbc..4f358d5054e 100644 --- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c +++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c @@ -25,7 +25,6 @@ * */ -#include "main/imports.h" #include "main/bufferobj.h" #include "main/varray.h" #include "vbo/vbo.h" diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index aa7961ff196..bf7cf902cd4 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -30,7 +30,6 @@ */ #include <pthread.h> -#include "main/imports.h" #include "main/glspirv.h" #include "program/prog_parameter.h" #include "program/prog_print.h" diff --git a/src/mesa/drivers/dri/i965/brw_program_cache.c b/src/mesa/drivers/dri/i965/brw_program_cache.c index 98820fbf1b4..496cb62efb2 100644 --- a/src/mesa/drivers/dri/i965/brw_program_cache.c +++ b/src/mesa/drivers/dri/i965/brw_program_cache.c @@ -44,7 +44,6 @@ * big we throw out all of the cache data and let it get regenerated. */ -#include "main/imports.h" #include "main/streaming-load-memcpy.h" #include "x86/common_x86_asm.h" #include "intel_batchbuffer.h" diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c index 1fb809cab8f..9c138262bde 100644 --- a/src/mesa/drivers/dri/i965/brw_queryobj.c +++ b/src/mesa/drivers/dri/i965/brw_queryobj.c @@ -35,8 +35,6 @@ * appropriately synced with the stage of the pipeline for our extensions' * needs. */ -#include "main/imports.h" - #include "brw_context.h" #include "brw_defines.h" #include "brw_state.h" diff --git a/src/mesa/drivers/dri/i965/brw_sync.c b/src/mesa/drivers/dri/i965/brw_sync.c index 63916488791..640027575e5 100644 --- a/src/mesa/drivers/dri/i965/brw_sync.c +++ b/src/mesa/drivers/dri/i965/brw_sync.c @@ -40,8 +40,6 @@ #include <libsync.h> /* Requires Android or libdrm-2.4.72 */ -#include "main/imports.h" - #include "brw_context.h" #include "intel_batchbuffer.h" diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c b/src/mesa/drivers/dri/i965/gen6_queryobj.c index ada28a4a824..31d37c6c1f9 100644 --- a/src/mesa/drivers/dri/i965/gen6_queryobj.c +++ b/src/mesa/drivers/dri/i965/gen6_queryobj.c @@ -31,8 +31,6 @@ * GL_EXT_transform_feedback, and friends) on platforms that support * hardware contexts (Gen6+). */ -#include "main/imports.h" - #include "brw_context.h" #include "brw_defines.h" #include "brw_state.h" diff --git a/src/mesa/drivers/dri/i965/hsw_queryobj.c b/src/mesa/drivers/dri/i965/hsw_queryobj.c index 0f6c4837936..f0eb3fdbbd7 100644 --- a/src/mesa/drivers/dri/i965/hsw_queryobj.c +++ b/src/mesa/drivers/dri/i965/hsw_queryobj.c @@ -26,8 +26,6 @@ * * Support for query buffer objects (GL_ARB_query_buffer_object) on Haswell+. */ -#include "main/imports.h" - #include "brw_context.h" #include "brw_defines.h" #include "intel_batchbuffer.h" diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/intel_buffer_objects.c index 63bafa88906..19fa253af41 100644 --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c @@ -29,7 +29,6 @@ * This provides core GL buffer object functionality. */ -#include "main/imports.h" #include "main/mtypes.h" #include "main/macros.h" #include "main/streaming-load-memcpy.h" diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 02a1bdb0366..293eceb959f 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -24,7 +24,6 @@ */ #include "main/enums.h" -#include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" #include "main/fbobject.h" diff --git a/src/mesa/drivers/dri/i965/intel_upload.c b/src/mesa/drivers/dri/i965/intel_upload.c index d81ae43e8a0..a4a353ed069 100644 --- a/src/mesa/drivers/dri/i965/intel_upload.c +++ b/src/mesa/drivers/dri/i965/intel_upload.c @@ -28,7 +28,6 @@ * Batched upload via BOs. */ -#include "main/imports.h" #include "main/macros.h" #include "brw_bufmgr.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h index 237e9563246..7920d259154 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h +++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h @@ -27,7 +27,6 @@ #ifndef __NOUVEAU_DRIVER_H__ #define __NOUVEAU_DRIVER_H__ -#include "main/imports.h" #include "main/mtypes.h" #include "main/macros.h" #include "main/formats.h" diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c index 83846d6ac07..69404d8646c 100644 --- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c +++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c @@ -32,7 +32,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/macros.h" #include "main/context.h" #include "util/simple_list.h" diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 4f210bf6522..a8622b3e022 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -37,7 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/api_arrayelt.h" #include "main/api_exec.h" #include "main/context.h" -#include "main/imports.h" #include "main/extensions.h" #include "main/version.h" #include "main/vtxfmt.h" diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c index 90232d45e9e..327ff00534e 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.c +++ b/src/mesa/drivers/dri/r200/r200_ioctl.c @@ -36,7 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <errno.h> #include "main/glheader.h" -#include "main/imports.h" #include "main/macros.h" #include "main/context.h" #include "swrast/swrast.h" diff --git a/src/mesa/drivers/dri/r200/r200_maos_arrays.c b/src/mesa/drivers/dri/r200/r200_maos_arrays.c index a3d45cf7369..57d54dcac88 100644 --- a/src/mesa/drivers/dri/r200/r200_maos_arrays.c +++ b/src/mesa/drivers/dri/r200/r200_maos_arrays.c @@ -34,7 +34,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/glheader.h" #include "main/mtypes.h" -#include "main/imports.h" #include "main/macros.h" #include "main/state.h" diff --git a/src/mesa/drivers/dri/r200/r200_sanity.c b/src/mesa/drivers/dri/r200/r200_sanity.c index 6628674431c..0320bc05a51 100644 --- a/src/mesa/drivers/dri/r200/r200_sanity.c +++ b/src/mesa/drivers/dri/r200/r200_sanity.c @@ -35,7 +35,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include <errno.h> #include "main/glheader.h" -#include "main/imports.h" #include "r200_context.h" #include "r200_sanity.h" diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index b4cff8c2592..80c3ab922e6 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -34,7 +34,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/enums.h" #include "main/light.h" #include "main/framebuffer.h" diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c index 41c3df710e5..8eb6e50290f 100644 --- a/src/mesa/drivers/dri/r200/r200_state_init.c +++ b/src/mesa/drivers/dri/r200/r200_state_init.c @@ -33,7 +33,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/errors.h" #include "main/glheader.h" -#include "main/imports.h" #include "main/enums.h" #include "main/api_arrayelt.h" #include "main/state.h" diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c index 0fda58656c7..dda137a294f 100644 --- a/src/mesa/drivers/dri/r200/r200_swtcl.c +++ b/src/mesa/drivers/dri/r200/r200_swtcl.c @@ -36,7 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/mtypes.h" #include "main/enums.h" #include "main/image.h" -#include "main/imports.h" #include "main/macros.h" #include "main/state.h" diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c index 662c041c79f..767ae90285c 100644 --- a/src/mesa/drivers/dri/r200/r200_tcl.c +++ b/src/mesa/drivers/dri/r200/r200_tcl.c @@ -33,7 +33,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/enums.h" #include "main/light.h" diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index cbfda0e4241..829d91c0118 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/src/mesa/drivers/dri/r200/r200_tex.c @@ -32,7 +32,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/enums.h" #include "main/image.h" diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index 1313c9e99a1..9041e1a1c56 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -33,7 +33,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/macros.h" #include "main/state.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c index 4c81afbc84c..71fe9302cf7 100644 --- a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c +++ b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c @@ -25,7 +25,6 @@ * */ -#include "main/imports.h" #include "main/mtypes.h" #include "main/bufferobj.h" #include "util/u_memory.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c index a3bf00b09f7..1b734d26a57 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.c +++ b/src/mesa/drivers/dri/radeon/radeon_common.c @@ -43,7 +43,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <errno.h> #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/enums.h" #include "main/fbobject.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 57c7079b2f2..bba7281264a 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -40,7 +40,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/api_exec.h" #include "main/context.h" #include "util/simple_list.h" -#include "main/imports.h" #include "main/extensions.h" #include "main/version.h" #include "main/vtxfmt.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c index c92ec554b04..b8e37469306 100644 --- a/src/mesa/drivers/dri/radeon/radeon_fbo.c +++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c @@ -26,7 +26,6 @@ **************************************************************************/ -#include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" #include "main/enums.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_fog.c b/src/mesa/drivers/dri/radeon/radeon_fog.c index d5c6537036e..107bc23295a 100644 --- a/src/mesa/drivers/dri/radeon/radeon_fog.c +++ b/src/mesa/drivers/dri/radeon/radeon_fog.c @@ -34,7 +34,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "c99_math.h" #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/mtypes.h" #include "main/enums.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c index 58fb9f1c6b9..c8936c7c6bf 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c +++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c @@ -42,7 +42,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "swrast/swrast.h" #include "main/glheader.h" -#include "main/imports.h" #include "util/simple_list.h" #include "radeon_context.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c index b6520c3d172..d1dd3a073a3 100644 --- a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c +++ b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c @@ -33,7 +33,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/macros.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c index c9c91f8640c..9b75aec688c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c +++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c @@ -33,7 +33,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/state.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.c b/src/mesa/drivers/dri/radeon/radeon_queryobj.c index baf7081994c..d2b4479d175 100644 --- a/src/mesa/drivers/dri/radeon/radeon_queryobj.c +++ b/src/mesa/drivers/dri/radeon/radeon_queryobj.c @@ -28,8 +28,6 @@ #include "radeon_queryobj.h" #include "radeon_debug.h" -#include "main/imports.h" - #include <inttypes.h> static void radeonQueryGetResult(struct gl_context *ctx, struct gl_query_object *q) diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.h b/src/mesa/drivers/dri/radeon/radeon_queryobj.h index a2e7724da14..9dfeccbc4bb 100644 --- a/src/mesa/drivers/dri/radeon/radeon_queryobj.h +++ b/src/mesa/drivers/dri/radeon/radeon_queryobj.h @@ -25,7 +25,6 @@ * */ -#include "main/imports.h" #include "util/simple_list.h" #include "radeon_common_context.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 90e509e5259..c319195233a 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -37,7 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <errno.h> #include "main/glheader.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/framebuffer.h" #include "main/renderbuffer.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index 410a78fc084..59dc4708901 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -33,7 +33,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/enums.h" #include "main/light.h" #include "main/context.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c index 6a8cf606dcb..0b67164d7c9 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state_init.c +++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c @@ -29,7 +29,6 @@ #include "main/errors.h" #include "main/glheader.h" -#include "main/imports.h" #include "main/api_arrayelt.h" #include "swrast/swrast.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c b/src/mesa/drivers/dri/radeon/radeon_swtcl.c index 860bba6d32f..867e84fc9ec 100644 --- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c +++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.c @@ -35,7 +35,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/glheader.h" #include "main/mtypes.h" #include "main/enums.h" -#include "main/imports.h" #include "main/macros.h" #include "main/state.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_tcl.c b/src/mesa/drivers/dri/radeon/radeon_tcl.c index 61ff2311e95..c12efd09589 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tcl.c +++ b/src/mesa/drivers/dri/radeon/radeon_tcl.c @@ -33,7 +33,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/light.h" #include "main/enums.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c index bc5bdc9734e..0e622eb4fb2 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c +++ b/src/mesa/drivers/dri/radeon/radeon_tex.c @@ -32,7 +32,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/enums.h" #include "main/image.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c index 47eac855c66..0fefc6d51d5 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texstate.c +++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c @@ -34,7 +34,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/macros.h" #include "main/teximage.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index 478942b4838..3b78202a6cf 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -30,7 +30,6 @@ */ #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/enums.h" #include "main/mipmap.h" diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index 68514c6f0d8..6bc4dcf9727 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -39,7 +39,6 @@ #include "main/fbobject.h" #include "main/formats.h" #include "main/framebuffer.h" -#include "main/imports.h" #include "main/renderbuffer.h" #include "main/version.h" #include "main/vtxfmt.h" diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 8649c6b9d5d..f13596cedfc 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -41,7 +41,6 @@ #include "main/extensions.h" #include "main/formats.h" #include "main/framebuffer.h" -#include "main/imports.h" #include "main/macros.h" #include "main/mipmap.h" #include "main/mtypes.h" diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index e6d488c4dc3..a7d6de7a8be 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -47,7 +47,6 @@ #include "main/context.h" #include "main/config.h" #include "main/macros.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/version.h" #include "xfonts.h" diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c index 8405013b85c..377edcb23b3 100644 --- a/src/mesa/drivers/x11/xfonts.c +++ b/src/mesa/drivers/x11/xfonts.c @@ -31,7 +31,6 @@ #include <stdio.h> #include "glxheader.h" #include "main/context.h" -#include "main/imports.h" #include "xfonts.h" diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 514b885f68d..1fe3be4a1fb 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -69,7 +69,6 @@ #include "main/context.h" #include "main/extensions.h" #include "main/framebuffer.h" -#include "main/imports.h" #include "main/macros.h" #include "main/renderbuffer.h" #include "main/teximage.h" diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c index 781b2a448d2..d800f6da783 100644 --- a/src/mesa/drivers/x11/xm_buffer.c +++ b/src/mesa/drivers/x11/xm_buffer.c @@ -32,7 +32,6 @@ #include "glxheader.h" #include "xmesaP.h" #include "main/errors.h" -#include "main/imports.h" #include "main/formats.h" #include "main/framebuffer.h" #include "main/renderbuffer.h" diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index a25debc9887..f7811c85a8f 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -37,7 +37,6 @@ #include "main/macros.h" #include "main/mipmap.h" #include "main/image.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/pbo.h" #include "main/texformat.h" diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c index da26235ff04..c4889b31fad 100644 --- a/src/mesa/drivers/x11/xm_tri.c +++ b/src/mesa/drivers/x11/xm_tri.c @@ -32,7 +32,6 @@ #include <stdio.h> #include "c99_math.h" -#include "main/imports.h" #include "main/mtypes.h" #include "glxheader.h" #include "xmesaP.h" diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index a0a206bea67..aeb86b9506f 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -29,7 +29,6 @@ #include "format_unpack.h" #include "format_pack.h" #include "framebuffer.h" -#include "imports.h" #include "macros.h" #include "state.h" #include "mtypes.h" diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 51a7d63b83e..f9125543cf5 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -39,7 +39,6 @@ #include "api_arrayelt.h" #include "bufferobj.h" #include "context.h" -#include "imports.h" #include "macros.h" #include "mtypes.h" #include "main/dispatch.h" diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c index 24ef8666b3c..ce507a10e3d 100644 --- a/src/mesa/main/arbprogram.c +++ b/src/mesa/main/arbprogram.c @@ -32,7 +32,6 @@ #include "main/glheader.h" #include "main/context.h" #include "main/hash.h" -#include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" #include "main/arbprogram.h" diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 543470a13cc..3e36ed924a6 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -43,7 +43,6 @@ #include "glheader.h" #include "hash.h" #include "image.h" -#include "imports.h" #include "context.h" #include "bufferobj.h" #include "arrayobj.h" diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c index 5e08e258b22..d363bc41ad5 100644 --- a/src/mesa/main/atifragshader.c +++ b/src/mesa/main/atifragshader.c @@ -24,7 +24,6 @@ #include "main/glheader.h" #include "main/context.h" #include "main/hash.h" -#include "main/imports.h" #include "main/macros.h" #include "main/enums.h" #include "main/mtypes.h" diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index a63387d825d..d2514eb587b 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -24,7 +24,6 @@ */ #include "glheader.h" -#include "imports.h" #include "accum.h" #include "arrayobj.h" #include "attrib.h" diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index d30d94d15b5..5578eaea48e 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -77,7 +77,6 @@ #include "glheader.h" -#include "imports.h" #include "accum.h" #include "api_exec.h" #include "api_loopback.h" diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index e9b270df14c..9dfc6758256 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -50,7 +50,6 @@ #include "errors.h" -#include "imports.h" #include "extensions.h" #include "mtypes.h" #include "vbo/vbo.h" diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c index 67f22ab9c81..1623a20892e 100644 --- a/src/mesa/main/cpuinfo.c +++ b/src/mesa/main/cpuinfo.c @@ -23,7 +23,10 @@ */ -#include "main/imports.h" +#include <stdlib.h> +#include <string.h> +#include <assert.h> + #include "main/cpuinfo.h" diff --git a/src/mesa/main/debug_output.c b/src/mesa/main/debug_output.c index bac150c8ce4..a929103faed 100644 --- a/src/mesa/main/debug_output.c +++ b/src/mesa/main/debug_output.c @@ -28,7 +28,6 @@ #include "context.h" #include "debug_output.h" #include "enums.h" -#include "imports.h" #include "hash.h" #include "mtypes.h" #include "version.h" diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c index 930f5e816f9..54b078b0240 100644 --- a/src/mesa/main/depth.c +++ b/src/mesa/main/depth.c @@ -24,7 +24,6 @@ #include "glheader.h" -#include "imports.h" #include "context.h" #include "depth.h" #include "enums.h" diff --git a/src/mesa/main/draw_validate.c b/src/mesa/main/draw_validate.c index 779cd1c12c7..1b05b7527b8 100644 --- a/src/mesa/main/draw_validate.c +++ b/src/mesa/main/draw_validate.c @@ -28,7 +28,6 @@ #include "arrayobj.h" #include "bufferobj.h" #include "context.h" -#include "imports.h" #include "mtypes.h" #include "pipelineobj.h" #include "enums.h" diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c index 6114b3277b0..2b52a7ef575 100644 --- a/src/mesa/main/drawtex.c +++ b/src/mesa/main/drawtex.c @@ -24,7 +24,6 @@ #include "main/errors.h" #include "main/drawtex.h" #include "main/state.h" -#include "main/imports.h" #include "main/mtypes.h" diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c index 1dfe8278e71..81e343decf6 100644 --- a/src/mesa/main/es1_conversion.c +++ b/src/mesa/main/es1_conversion.c @@ -9,7 +9,6 @@ #include "context.h" #include "depth.h" #include "fog.h" -#include "imports.h" #include "light.h" #include "lines.h" #include "matrix.h" diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c index 2142b50a6e9..832d777f092 100644 --- a/src/mesa/main/execmem.c +++ b/src/mesa/main/execmem.c @@ -32,7 +32,6 @@ #include <stdio.h> -#include "imports.h" #include "execmem.h" #include "c11/threads.h" diff --git a/src/mesa/main/execmem.h b/src/mesa/main/execmem.h index bc51a8c8411..c573352c8cc 100644 --- a/src/mesa/main/execmem.h +++ b/src/mesa/main/execmem.h @@ -26,6 +26,7 @@ #ifndef EXECMEM_H #define EXECMEM_H +#include "glheader.h" extern void * _mesa_exec_malloc(GLuint size); diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 0aeda39cc22..328dc297b0d 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -31,7 +31,6 @@ #include "glheader.h" -#include "imports.h" #include "context.h" #include "extensions.h" #include "macros.h" diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index 8f2b4e9de48..04710a75a46 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -29,7 +29,6 @@ #include "main/glheader.h" #include "main/context.h" -#include "main/imports.h" #include "main/macros.h" #include "main/samplerobj.h" #include "main/shaderobj.h" diff --git a/src/mesa/main/format_utils.h b/src/mesa/main/format_utils.h index 78365cab533..9d4ef00c11d 100644 --- a/src/mesa/main/format_utils.h +++ b/src/mesa/main/format_utils.h @@ -32,7 +32,6 @@ #define FORMAT_UTILS_H #include "formats.h" -#include "imports.h" #include "macros.h" #include "util/rounding.h" #include "util/half_float.h" diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 55b893861bf..353fb79123f 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -25,7 +25,6 @@ #include "errors.h" -#include "imports.h" #include "formats.h" #include "macros.h" #include "glformats.h" diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c index bab0f189236..87b19576a22 100644 --- a/src/mesa/main/framebuffer.c +++ b/src/mesa/main/framebuffer.c @@ -31,7 +31,6 @@ #include <stdio.h> #include "glheader.h" -#include "imports.h" #include "blend.h" #include "buffers.h" #include "context.h" diff --git a/src/mesa/main/hash.h b/src/mesa/main/hash.h index 64f2962aba6..abef62e8130 100644 --- a/src/mesa/main/hash.h +++ b/src/mesa/main/hash.h @@ -32,8 +32,8 @@ #define HASH_H +#include <stdbool.h> #include "glheader.h" -#include "imports.h" #include "c11/threads.h" /** diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c index 2bcaeebc4aa..e9afa424156 100644 --- a/src/mesa/main/hint.c +++ b/src/mesa/main/hint.c @@ -28,7 +28,6 @@ #include "enums.h" #include "context.h" #include "hint.h" -#include "imports.h" #include "mtypes.h" diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index ad6b378f7f6..f831bc27a61 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -34,7 +34,6 @@ #include "colormac.h" #include "glformats.h" #include "image.h" -#include "imports.h" #include "macros.h" #include "mtypes.h" diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c deleted file mode 100644 index 070d7ada0b8..00000000000 --- a/src/mesa/main/imports.c +++ /dev/null @@ -1,65 +0,0 @@ -/** - * \file imports.c - * Standard C library function wrappers. - * - * Imports are services which the device driver or window system or - * operating system provides to the core renderer. The core renderer (Mesa) - * will call these functions in order to do memory allocation, simple I/O, - * etc. - * - * Some drivers will want to override/replace this file with something - * specialized, but that'll be rare. - * - * Eventually, I want to move roll the glheader.h file into this. - * - * \todo Functions still needed: - * - scanf - * - qsort - * - rand and RAND_MAX - */ - -/* - * Mesa 3-D graphics library - * - * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include <stdio.h> -#include <stdarg.h> -#include "c99_math.h" -#include "util/rounding.h" /* for _mesa_roundeven */ -#include "imports.h" -#include "context.h" -#include "version.h" - -#ifdef _GNU_SOURCE -#include <locale.h> -#ifdef __APPLE__ -#include <xlocale.h> -#endif -#endif - - -#ifdef _WIN32 -#define vsnprintf _vsnprintf -#elif defined(__IBMC__) || defined(__IBMCPP__) -extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg); -#endif diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 97d48c42df4..35bc1cfb833 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -34,7 +34,8 @@ #include "util/macros.h" #include "util/u_math.h" #include "util/rounding.h" -#include "imports.h" +#include "mesa_private.h" +#include "compiler.h" /** diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index 7d75a900e1b..d66bd48efe7 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -36,7 +36,6 @@ #include "glheader.h" -#include "imports.h" #include "context.h" #include "enums.h" #include "macros.h" diff --git a/src/mesa/main/imports.h b/src/mesa/main/mesa_private.h index a357cd84992..6fc335b5d79 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/mesa_private.h @@ -22,26 +22,16 @@ * OTHER DEALINGS IN THE SOFTWARE. */ - /** - * \file imports.h - * Standard C library function wrappers. - * - * This file provides wrappers for all the standard C library functions - * like malloc(), free(), printf(), getenv(), etc. + * \file mesa_private.h + * Contains mesa internal values + * */ +#ifndef MESA_PRIVATE_H +#define MESA_PRIVATE_H -#ifndef IMPORTS_H -#define IMPORTS_H - - -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include "compiler.h" #include "glheader.h" -#include "util/bitscan.h" #ifdef __cplusplus extern "C" { @@ -59,12 +49,8 @@ extern "C" { typedef union { GLfloat f; GLint i; GLuint u; } fi_type; -/*@}*/ - - #ifdef __cplusplus } #endif - #endif /* IMPORTS_H */ diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 88e6baa08ad..d74d4fdff79 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -28,7 +28,6 @@ */ #include "errors.h" -#include "imports.h" #include "formats.h" #include "glformats.h" #include "mipmap.h" diff --git a/src/mesa/main/objectpurge.c b/src/mesa/main/objectpurge.c index d730f46b8ec..c3d5727bf9b 100644 --- a/src/mesa/main/objectpurge.c +++ b/src/mesa/main/objectpurge.c @@ -31,7 +31,6 @@ #include "glheader.h" #include "enums.h" #include "hash.h" -#include "imports.h" #include "context.h" #include "bufferobj.h" #include "fbobject.h" diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index 64ad115f8b5..a400085f0da 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -46,12 +46,10 @@ #include "glheader.h" #include "enums.h" #include "image.h" -#include "imports.h" #include "macros.h" #include "mtypes.h" #include "pack.h" #include "pixeltransfer.h" -#include "imports.h" #include "glformats.h" #include "format_utils.h" #include "format_pack.h" diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index 1fe1205fb52..15e56b65e77 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -48,6 +48,7 @@ #include "program/program.h" #include "program/prog_parameter.h" #include "util/ralloc.h" +#include "util/bitscan.h" /** * Delete a pipeline object. diff --git a/src/mesa/main/pixeltransfer.c b/src/mesa/main/pixeltransfer.c index 22eac00a7df..8a7eb8c58a6 100644 --- a/src/mesa/main/pixeltransfer.c +++ b/src/mesa/main/pixeltransfer.c @@ -33,7 +33,6 @@ #include "glheader.h" #include "macros.h" #include "pixeltransfer.h" -#include "imports.h" #include "mtypes.h" #include "util/rounding.h" diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index ae8f2a85645..0eca2ff6945 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -29,7 +29,6 @@ #include "glheader.h" -#include "imports.h" #include "context.h" #include "image.h" #include "enums.h" diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 7d14bd9315d..5a10f854a4d 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -28,7 +28,6 @@ #include "context.h" #include "enums.h" #include "hash.h" -#include "imports.h" #include "queryobj.h" #include "mtypes.h" #include "util/u_memory.h" diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 556c860d393..86b38bff3f8 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -23,7 +23,6 @@ */ #include "glheader.h" -#include "imports.h" #include "blend.h" #include "bufferobj.h" #include "context.h" diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c index fa412c0c4f7..a1a91f51851 100644 --- a/src/mesa/main/remap.c +++ b/src/mesa/main/remap.c @@ -36,8 +36,8 @@ */ #include <stdbool.h> +#include <string.h> #include "remap.h" -#include "imports.h" #include "glapi/glapi.h" #define MAX_ENTRY_POINTS 16 diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c index a46fca33247..affbd489f30 100644 --- a/src/mesa/main/renderbuffer.c +++ b/src/mesa/main/renderbuffer.c @@ -24,7 +24,6 @@ #include "glheader.h" -#include "imports.h" #include "context.h" #include "fbobject.h" #include "formats.h" diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index 7a2ab0af725..ded104467fd 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -27,7 +27,6 @@ * Shared-context state */ -#include "imports.h" #include "mtypes.h" #include "hash.h" #include "atifragshader.h" diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c index d89312ce12d..4c8ccb0898f 100644 --- a/src/mesa/main/stencil.c +++ b/src/mesa/main/stencil.c @@ -48,7 +48,6 @@ #include "glheader.h" -#include "imports.h" #include "context.h" #include "macros.h" #include "stencil.h" diff --git a/src/mesa/main/streaming-load-memcpy.h b/src/mesa/main/streaming-load-memcpy.h index d31c199a27c..9ecb685d660 100644 --- a/src/mesa/main/streaming-load-memcpy.h +++ b/src/mesa/main/streaming-load-memcpy.h @@ -33,6 +33,8 @@ #ifndef STREAMING_LOAD_MEMCPY_H #define STREAMING_LOAD_MEMCPY_H +#include <stdlib.h> + void _mesa_streaming_load_memcpy(void *restrict dst, void *restrict src, size_t len); diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c index ec85c52c523..28d8ffc29b2 100644 --- a/src/mesa/main/syncobj.c +++ b/src/mesa/main/syncobj.c @@ -57,7 +57,6 @@ #include <inttypes.h> #include "glheader.h" -#include "imports.h" #include "context.h" #include "macros.h" #include "get.h" diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index 48d794ddfd2..e48a42ed745 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -31,7 +31,6 @@ #include "glheader.h" -#include "imports.h" #include "context.h" #include "formats.h" #include "mtypes.h" diff --git a/src/mesa/main/texcompress_cpal.c b/src/mesa/main/texcompress_cpal.c index c46ef8c53fb..5d4a3ad2879 100644 --- a/src/mesa/main/texcompress_cpal.c +++ b/src/mesa/main/texcompress_cpal.c @@ -34,7 +34,6 @@ #include "glheader.h" #include "context.h" #include "mtypes.h" -#include "imports.h" #include "pixelstore.h" #include "texcompress_cpal.h" #include "teximage.h" diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index 91efa8b928c..7116dde3b2d 100644 --- a/src/mesa/main/texcompress_fxt1.c +++ b/src/mesa/main/texcompress_fxt1.c @@ -31,7 +31,6 @@ #include "errors.h" #include "glheader.h" -#include "imports.h" #include "image.h" #include "macros.h" #include "mipmap.h" diff --git a/src/mesa/main/texcompress_rgtc.c b/src/mesa/main/texcompress_rgtc.c index e3e3812f5df..c404cd1d1e6 100644 --- a/src/mesa/main/texcompress_rgtc.c +++ b/src/mesa/main/texcompress_rgtc.c @@ -35,7 +35,6 @@ #include "config.h" #include "glheader.h" -#include "imports.h" #include "image.h" #include "macros.h" #include "mipmap.h" diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c index ded32a7ee90..f9b8ff50064 100644 --- a/src/mesa/main/texcompress_s3tc.c +++ b/src/mesa/main/texcompress_s3tc.c @@ -30,7 +30,6 @@ */ #include "glheader.h" -#include "imports.h" #include "image.h" #include "macros.h" #include "mtypes.h" diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 73889676949..4a2823544c5 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -35,7 +35,6 @@ #include "fbobject.h" #include "formats.h" #include "hash.h" -#include "imports.h" #include "macros.h" #include "shaderimage.h" #include "teximage.h" diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c index 9cb8b900651..0f6d23863bd 100644 --- a/src/mesa/main/texstorage.c +++ b/src/mesa/main/texstorage.c @@ -30,7 +30,6 @@ #include "glheader.h" #include "context.h" #include "enums.h" -#include "imports.h" #include "macros.h" #include "teximage.h" #include "texobj.h" diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 3b1cba7c1f1..509c467b2b1 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -62,7 +62,6 @@ #include "mtypes.h" #include "pack.h" #include "pbo.h" -#include "imports.h" #include "texcompress.h" #include "texcompress_fxt1.h" #include "texcompress_rgtc.h" diff --git a/src/mesa/main/texturebindless.c b/src/mesa/main/texturebindless.c index 30a50872eb7..64199c5776b 100644 --- a/src/mesa/main/texturebindless.c +++ b/src/mesa/main/texturebindless.c @@ -24,7 +24,6 @@ #include "glheader.h" #include "context.h" #include "enums.h" -#include "imports.h" #include "hash.h" #include "mtypes.h" #include "shaderimage.h" diff --git a/src/mesa/main/textureview.c b/src/mesa/main/textureview.c index 62c86eb5f03..cfd2062a7f1 100644 --- a/src/mesa/main/textureview.c +++ b/src/mesa/main/textureview.c @@ -34,7 +34,6 @@ #include "glheader.h" #include "context.h" #include "enums.h" -#include "imports.h" #include "macros.h" #include "teximage.h" #include "texobj.h" diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index fad0c227d49..5dc6b9c8047 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -28,7 +28,6 @@ #include <inttypes.h> /* for PRId64 macro */ #include "glheader.h" -#include "imports.h" #include "bufferobj.h" #include "context.h" #include "enable.h" diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index 3e96c7d2fba..07d3b14d0ce 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -28,7 +28,6 @@ #include "glheader.h" #include "api_arrayelt.h" #include "context.h" -#include "imports.h" #include "mtypes.h" #include "vtxfmt.h" #include "eval.h" diff --git a/src/mesa/math/m_debug_clip.c b/src/mesa/math/m_debug_clip.c index 044768dbdd2..d5fd5f461c2 100644 --- a/src/mesa/math/m_debug_clip.c +++ b/src/mesa/math/m_debug_clip.c @@ -28,7 +28,6 @@ #include "main/glheader.h" #include "main/context.h" #include "main/macros.h" -#include "main/imports.h" #include "m_matrix.h" #include "m_xform.h" diff --git a/src/mesa/meson.build b/src/mesa/meson.build index baf5c6b11c1..f999f2edb83 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -176,8 +176,7 @@ files_libmesa_common = files( 'main/histogram.h', 'main/image.c', 'main/image.h', - 'main/imports.c', - 'main/imports.h', + 'main/mesa_private.h', 'main/light.c', 'main/light.h', 'main/lines.c', diff --git a/src/mesa/program/arbprogparse.c b/src/mesa/program/arbprogparse.c index 99aa6914624..b35afc863e6 100644 --- a/src/mesa/program/arbprogparse.c +++ b/src/mesa/program/arbprogparse.c @@ -52,7 +52,6 @@ having three separate program parameter arrays. #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/mtypes.h" #include "arbprogparse.h" diff --git a/src/mesa/program/prog_cache.c b/src/mesa/program/prog_cache.c index 1fff0b480bd..2e7ceaa6af2 100644 --- a/src/mesa/program/prog_cache.c +++ b/src/mesa/program/prog_cache.c @@ -28,7 +28,6 @@ #include "main/glheader.h" #include "main/mtypes.h" -#include "main/imports.h" #include "main/shaderobj.h" #include "program/prog_cache.h" #include "program/program.h" diff --git a/src/mesa/program/prog_noise.c b/src/mesa/program/prog_noise.c index e2e209e5bd3..a381094fd33 100644 --- a/src/mesa/program/prog_noise.c +++ b/src/mesa/program/prog_noise.c @@ -49,7 +49,6 @@ */ -#include "main/imports.h" #include "prog_noise.h" #define FASTFLOOR(x) ( ((x)>0) ? ((int)x) : (((int)x)-1) ) diff --git a/src/mesa/program/prog_parameter.c b/src/mesa/program/prog_parameter.c index 897082ae045..c0275ad65b2 100644 --- a/src/mesa/program/prog_parameter.c +++ b/src/mesa/program/prog_parameter.c @@ -28,7 +28,6 @@ * \author Brian Paul */ - #include "main/glheader.h" #include "main/macros.h" #include "util/u_memory.h" diff --git a/src/mesa/program/prog_parameter.h b/src/mesa/program/prog_parameter.h index 57050042012..7d063aeb1ef 100644 --- a/src/mesa/program/prog_parameter.h +++ b/src/mesa/program/prog_parameter.h @@ -31,6 +31,7 @@ #ifndef PROG_PARAMETER_H #define PROG_PARAMETER_H +#include <stdbool.h> #include "prog_statevars.h" #include <string.h> diff --git a/src/mesa/program/prog_parameter_layout.c b/src/mesa/program/prog_parameter_layout.c index d28a6675c06..5502089b1e6 100644 --- a/src/mesa/program/prog_parameter_layout.c +++ b/src/mesa/program/prog_parameter_layout.c @@ -28,7 +28,6 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "main/imports.h" #include "main/mtypes.h" #include "prog_parameter.h" #include "prog_parameter_layout.h" diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index 3bbe451399f..80e69c15d06 100644 --- a/src/mesa/program/prog_statevars.c +++ b/src/mesa/program/prog_statevars.c @@ -33,7 +33,6 @@ #include "main/glheader.h" #include "main/context.h" #include "main/blend.h" -#include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" #include "main/fbobject.h" diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index a5ac37af908..69876668c88 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -26,7 +26,6 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" #include "compiler/glsl/list.h" -#include "main/imports.h" #include "main/mtypes.h" #include "util/ralloc.h" diff --git a/src/mesa/program/program_lexer.l b/src/mesa/program/program_lexer.l index c4973fd2791..7db98661738 100644 --- a/src/mesa/program/program_lexer.l +++ b/src/mesa/program/program_lexer.l @@ -27,7 +27,6 @@ #endif #include "main/glheader.h" -#include "main/imports.h" #include "program/prog_instruction.h" #include "program/prog_statevars.h" #include "program/symbol_table.h" diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y index 2639c72d42b..436fed4d766 100644 --- a/src/mesa/program/program_parse.y +++ b/src/mesa/program/program_parse.y @@ -29,7 +29,6 @@ #include "main/errors.h" #include "main/mtypes.h" -#include "main/imports.h" #include "program/program.h" #include "program/prog_parameter.h" #include "program/prog_parameter_layout.h" diff --git a/src/mesa/program/symbol_table.c b/src/mesa/program/symbol_table.c index e01faa5c6e1..d6ed5250920 100644 --- a/src/mesa/program/symbol_table.c +++ b/src/mesa/program/symbol_table.c @@ -21,10 +21,9 @@ * DEALINGS IN THE SOFTWARE. */ -#include "main/imports.h" #include "main/errors.h" #include "symbol_table.h" -#include "../../util/hash_table.h" +#include "util/hash_table.h" #include "util/u_string.h" struct symbol { diff --git a/src/mesa/state_tracker/st_atom_atomicbuf.c b/src/mesa/state_tracker/st_atom_atomicbuf.c index 5a8ff0f05f2..5b8c66817f1 100644 --- a/src/mesa/state_tracker/st_atom_atomicbuf.c +++ b/src/mesa/state_tracker/st_atom_atomicbuf.c @@ -24,7 +24,6 @@ * **************************************************************************/ -#include "main/imports.h" #include "program/prog_parameter.h" #include "program/prog_print.h" #include "compiler/glsl/ir_uniform.h" diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index fa147b89688..d996c4eb1d1 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -31,7 +31,6 @@ * Brian Paul */ -#include "main/imports.h" #include "program/prog_parameter.h" #include "program/prog_print.h" #include "main/shaderapi.h" diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c index db3539259ce..ede98842a87 100644 --- a/src/mesa/state_tracker/st_atom_image.c +++ b/src/mesa/state_tracker/st_atom_image.c @@ -24,7 +24,6 @@ * **************************************************************************/ -#include "main/imports.h" #include "main/shaderimage.h" #include "program/prog_parameter.h" #include "program/prog_print.h" diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index 700239a00a2..7e5179608c3 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -35,7 +35,6 @@ * Brian Paul */ -#include "main/imports.h" #include "main/mtypes.h" #include "main/framebuffer.h" #include "main/texobj.h" diff --git a/src/mesa/state_tracker/st_atom_storagebuf.c b/src/mesa/state_tracker/st_atom_storagebuf.c index 5ec3175f2c9..60103f58dec 100644 --- a/src/mesa/state_tracker/st_atom_storagebuf.c +++ b/src/mesa/state_tracker/st_atom_storagebuf.c @@ -24,7 +24,6 @@ * **************************************************************************/ -#include "main/imports.h" #include "program/prog_parameter.h" #include "program/prog_print.h" #include "compiler/glsl/ir_uniform.h" diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c index c06f9287c96..4a711129e29 100644 --- a/src/mesa/state_tracker/st_cb_bitmap.c +++ b/src/mesa/state_tracker/st_cb_bitmap.c @@ -31,7 +31,6 @@ */ #include "main/errors.h" -#include "main/imports.h" #include "main/image.h" #include "main/bufferobj.h" #include "main/dlist.h" diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index cc8649eb392..401c3512804 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -30,7 +30,6 @@ * Brian Paul */ -#include "main/imports.h" #include "main/image.h" #include "main/macros.h" diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index 080dcccba0b..3518103998a 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -34,7 +34,6 @@ #include <inttypes.h> /* for PRId64 macro */ #include "main/errors.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/arrayobj.h" #include "main/bufferobj.h" diff --git a/src/mesa/state_tracker/st_cb_condrender.c b/src/mesa/state_tracker/st_cb_condrender.c index f02472aec8b..559bb61fb44 100644 --- a/src/mesa/state_tracker/st_cb_condrender.c +++ b/src/mesa/state_tracker/st_cb_condrender.c @@ -33,7 +33,6 @@ */ -#include "main/imports.h" #include "main/context.h" #include "pipe/p_context.h" diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index 26d3cc33e5c..456f3e2b82f 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -31,7 +31,6 @@ */ #include "main/errors.h" -#include "main/imports.h" #include "main/image.h" #include "main/bufferobj.h" #include "main/blit.h" diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c index f08ffde6b01..19ec19d0597 100644 --- a/src/mesa/state_tracker/st_cb_drawtex.c +++ b/src/mesa/state_tracker/st_cb_drawtex.c @@ -12,7 +12,6 @@ -#include "main/imports.h" #include "main/image.h" #include "main/macros.h" #include "main/teximage.h" diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c index 5e3425a73a6..0457ba34816 100644 --- a/src/mesa/state_tracker/st_cb_fbo.c +++ b/src/mesa/state_tracker/st_cb_fbo.c @@ -33,7 +33,6 @@ */ -#include "main/imports.h" #include "main/context.h" #include "main/fbobject.h" #include "main/framebuffer.h" diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c index ce236c05d98..726d2d8f6fc 100644 --- a/src/mesa/state_tracker/st_cb_feedback.c +++ b/src/mesa/state_tracker/st_cb_feedback.c @@ -37,7 +37,6 @@ * Brian Paul */ -#include "main/imports.h" #include "main/context.h" #include "main/feedback.h" #include "main/varray.h" diff --git a/src/mesa/state_tracker/st_cb_memoryobjects.c b/src/mesa/state_tracker/st_cb_memoryobjects.c index 7e5cd2a04cb..f8243fb3b14 100644 --- a/src/mesa/state_tracker/st_cb_memoryobjects.c +++ b/src/mesa/state_tracker/st_cb_memoryobjects.c @@ -22,7 +22,6 @@ * DEALINGS IN THE SOFTWARE. */ -#include "main/imports.h" #include "main/mtypes.h" #include "main/externalobjects.h" diff --git a/src/mesa/state_tracker/st_cb_msaa.c b/src/mesa/state_tracker/st_cb_msaa.c index 6c5dc1fd43e..699939fc100 100644 --- a/src/mesa/state_tracker/st_cb_msaa.c +++ b/src/mesa/state_tracker/st_cb_msaa.c @@ -26,7 +26,6 @@ **************************************************************************/ #include "main/bufferobj.h" -#include "main/imports.h" #include "main/framebuffer.h" #include "state_tracker/st_cb_msaa.h" diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c index 460c3e71ff9..34e276615b0 100644 --- a/src/mesa/state_tracker/st_cb_queryobj.c +++ b/src/mesa/state_tracker/st_cb_queryobj.c @@ -33,7 +33,6 @@ */ -#include "main/imports.h" #include "main/compiler.h" #include "main/context.h" diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c index 52ead76baab..abebed9fc27 100644 --- a/src/mesa/state_tracker/st_cb_rasterpos.c +++ b/src/mesa/state_tracker/st_cb_rasterpos.c @@ -36,7 +36,6 @@ */ -#include "main/imports.h" #include "main/macros.h" #include "main/arrayobj.h" #include "main/feedback.h" diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index e887d8de6d7..2d421d18974 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -28,7 +28,6 @@ #include "main/bufferobj.h" #include "main/image.h" #include "main/pbo.h" -#include "main/imports.h" #include "main/readpix.h" #include "main/enums.h" #include "main/framebuffer.h" diff --git a/src/mesa/state_tracker/st_cb_semaphoreobjects.c b/src/mesa/state_tracker/st_cb_semaphoreobjects.c index 4b1f21e6b17..e5cc71eff4a 100644 --- a/src/mesa/state_tracker/st_cb_semaphoreobjects.c +++ b/src/mesa/state_tracker/st_cb_semaphoreobjects.c @@ -21,7 +21,6 @@ * DEALINGS IN THE SOFTWARE. */ -#include "main/imports.h" #include "main/mtypes.h" #include "main/context.h" diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index d89230d4ba2..ea031d25b00 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -34,7 +34,6 @@ #include "main/format_utils.h" #include "main/glformats.h" #include "main/image.h" -#include "main/imports.h" #include "main/macros.h" #include "main/mipmap.h" #include "main/pack.h" diff --git a/src/mesa/state_tracker/st_cb_texturebarrier.c b/src/mesa/state_tracker/st_cb_texturebarrier.c index 4a9c72f2c62..b2a2ec641b0 100644 --- a/src/mesa/state_tracker/st_cb_texturebarrier.c +++ b/src/mesa/state_tracker/st_cb_texturebarrier.c @@ -33,7 +33,6 @@ */ -#include "main/imports.h" #include "main/context.h" #include "pipe/p_context.h" diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index a6577d483a2..5136e6bf1a4 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -25,7 +25,6 @@ * **************************************************************************/ -#include "main/imports.h" #include "main/accum.h" #include "main/api_exec.h" #include "main/context.h" diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index a5e93186bf5..a715a9abab8 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -37,7 +37,6 @@ #include "main/errors.h" -#include "main/imports.h" #include "main/image.h" #include "main/bufferobj.h" #include "main/macros.h" diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c index 275e1090735..a1b296fd02f 100644 --- a/src/mesa/state_tracker/st_draw_feedback.c +++ b/src/mesa/state_tracker/st_draw_feedback.c @@ -25,7 +25,6 @@ * **************************************************************************/ -#include "main/imports.h" #include "main/arrayobj.h" #include "main/image.h" #include "main/macros.h" diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index f423136929f..28bdf7bebde 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -28,7 +28,6 @@ #include "compiler/nir/nir.h" -#include "main/imports.h" #include "main/context.h" #include "main/macros.h" #include "main/version.h" diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 7f2f1984e65..ccd6abf6c23 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -32,7 +32,6 @@ * \author Brian Paul */ -#include "main/imports.h" #include "main/context.h" #include "main/enums.h" #include "main/formats.h" diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c index b71a8ee57bb..b9ead79d166 100644 --- a/src/mesa/state_tracker/st_gen_mipmap.c +++ b/src/mesa/state_tracker/st_gen_mipmap.c @@ -27,7 +27,6 @@ #include "main/errors.h" -#include "main/imports.h" #include "main/mipmap.h" #include "main/teximage.h" diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 6e8e48813e4..54dab380f8b 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -32,7 +32,6 @@ #include "main/errors.h" -#include "main/imports.h" #include "main/hash.h" #include "main/mtypes.h" #include "program/prog_parameter.h" diff --git a/src/mesa/swrast/s_clear.c b/src/mesa/swrast/s_clear.c index ef0f6df9d9c..94a1d456e7e 100644 --- a/src/mesa/swrast/s_clear.c +++ b/src/mesa/swrast/s_clear.c @@ -27,7 +27,6 @@ #include "main/condrender.h" #include "main/format_pack.h" #include "main/macros.h" -#include "main/imports.h" #include "main/mtypes.h" #include "s_context.h" diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 5506ed51905..3692369b8c3 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -26,7 +26,6 @@ */ #include "main/errors.h" -#include "main/imports.h" #include "main/bufferobj.h" #include "main/mtypes.h" #include "main/samplerobj.h" diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index d0703fa07a6..6a6cb568174 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -29,7 +29,6 @@ #include "main/macros.h" #include "main/blit.h" #include "main/pixeltransfer.h" -#include "main/imports.h" #include "s_context.h" #include "s_depth.h" diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c index de7f14a4fc8..6094d510e30 100644 --- a/src/mesa/swrast/s_depth.c +++ b/src/mesa/swrast/s_depth.c @@ -29,7 +29,6 @@ #include "main/format_unpack.h" #include "main/format_pack.h" #include "main/macros.h" -#include "main/imports.h" #include "s_context.h" #include "s_depth.h" diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 7ee401b2d4c..4c7366248f3 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -32,7 +32,6 @@ #include "main/format_utils.h" #include "main/glformats.h" #include "main/image.h" -#include "main/imports.h" #include "main/macros.h" #include "main/pack.h" #include "main/pbo.h" diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c index c7cac2e4016..94711a0eac3 100644 --- a/src/mesa/swrast/s_logic.c +++ b/src/mesa/swrast/s_logic.c @@ -25,7 +25,6 @@ #include "main/glheader.h" #include "main/context.h" -#include "main/imports.h" #include "main/macros.h" #include "s_context.h" diff --git a/src/mesa/swrast/s_renderbuffer.c b/src/mesa/swrast/s_renderbuffer.c index ca7f39a8635..4654e434afa 100644 --- a/src/mesa/swrast/s_renderbuffer.c +++ b/src/mesa/swrast/s_renderbuffer.c @@ -31,7 +31,6 @@ #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/fbobject.h" #include "main/formats.h" diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 586f46dee40..937b6a0dbfc 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -37,7 +37,6 @@ #include "main/format_pack.h" #include "main/format_unpack.h" #include "main/macros.h" -#include "main/imports.h" #include "main/image.h" #include "main/samplerobj.h" #include "main/state.h" diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c index 8ccd5a16442..42f2b0c5dbb 100644 --- a/src/mesa/swrast/s_stencil.c +++ b/src/mesa/swrast/s_stencil.c @@ -25,7 +25,6 @@ #include "main/glheader.h" #include "main/context.h" -#include "main/imports.h" #include "main/format_pack.h" #include "main/format_unpack.h" #include "main/stencil.h" diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 743ee4015bb..4572d4fe26f 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/src/mesa/swrast/s_texcombine.c @@ -26,7 +26,6 @@ #include "main/glheader.h" #include "main/context.h" -#include "main/imports.h" #include "main/macros.h" #include "main/pixeltransfer.h" #include "main/samplerobj.h" diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c index 62d29dd0fe7..fb0de21e216 100644 --- a/src/mesa/swrast/s_texfilter.c +++ b/src/mesa/swrast/s_texfilter.c @@ -26,7 +26,6 @@ #include "c99_math.h" #include "main/glheader.h" #include "main/context.h" -#include "main/imports.h" #include "main/macros.h" #include "main/samplerobj.h" #include "main/teximage.h" diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index 7228d2e0e0d..24fddd7718d 100644 --- a/src/mesa/swrast/s_texture.c +++ b/src/mesa/swrast/s_texture.c @@ -32,6 +32,7 @@ #include "main/teximage.h" #include "main/texobj.h" #include "util/u_memory.h" +#include "util/u_math.h" #include "swrast/swrast.h" #include "swrast/s_context.h" diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index e7fa0bbb179..7dbe8affb6a 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -31,7 +31,6 @@ #include "main/glheader.h" #include "main/context.h" -#include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" #include "main/state.h" diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c index 2472aa730f9..1c7244caaa2 100644 --- a/src/mesa/swrast/s_zoom.c +++ b/src/mesa/swrast/s_zoom.c @@ -25,7 +25,6 @@ #include "main/errors.h" #include "main/glheader.h" #include "main/macros.h" -#include "main/imports.h" #include "main/format_pack.h" #include "s_context.h" diff --git a/src/mesa/swrast_setup/ss_context.c b/src/mesa/swrast_setup/ss_context.c index ec20d6c35a1..cee6f104e40 100644 --- a/src/mesa/swrast_setup/ss_context.c +++ b/src/mesa/swrast_setup/ss_context.c @@ -26,7 +26,6 @@ */ #include "main/glheader.h" -#include "main/imports.h" #include "main/macros.h" #include "main/state.h" #include "tnl/tnl.h" diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 7fd766cba8d..aa3c2580153 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -27,7 +27,6 @@ #include "main/glheader.h" -#include "main/imports.h" #include "main/context.h" #include "main/macros.h" #include "main/mtypes.h" diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h index eca9f66037a..6d8b806896c 100644 --- a/src/mesa/tnl/t_context.h +++ b/src/mesa/tnl/t_context.h @@ -50,7 +50,6 @@ #define _T_CONTEXT_H #include "main/glheader.h" -#include "main/imports.h" #include "main/mtypes.h" #include "math/m_vector.h" diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c index 009a0bf3626..f1b4f4739c6 100644 --- a/src/mesa/tnl/t_draw.c +++ b/src/mesa/tnl/t_draw.c @@ -32,7 +32,6 @@ #include "main/bufferobj.h" #include "main/condrender.h" #include "main/context.h" -#include "main/imports.h" #include "main/mtypes.h" #include "main/macros.h" #include "main/enums.h" diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c index 0adbef01264..7765e8283e6 100644 --- a/src/mesa/tnl/t_pipeline.c +++ b/src/mesa/tnl/t_pipeline.c @@ -27,7 +27,6 @@ #include "main/glheader.h" #include "main/context.h" -#include "main/imports.h" #include "main/mtypes.h" #include "t_context.h" diff --git a/src/mesa/tnl/t_split_copy.c b/src/mesa/tnl/t_split_copy.c index ae8d45db5b7..5370e527375 100644 --- a/src/mesa/tnl/t_split_copy.c +++ b/src/mesa/tnl/t_split_copy.c @@ -33,7 +33,6 @@ #include "main/glheader.h" #include "main/bufferobj.h" -#include "main/imports.h" #include "main/glformats.h" #include "main/macros.h" #include "main/mtypes.h" diff --git a/src/mesa/tnl/t_vb_fog.c b/src/mesa/tnl/t_vb_fog.c index c224a4192a4..a392451aa69 100644 --- a/src/mesa/tnl/t_vb_fog.c +++ b/src/mesa/tnl/t_vb_fog.c @@ -30,7 +30,6 @@ #include "main/errors.h" #include "main/glheader.h" #include "main/macros.h" -#include "main/imports.h" #include "main/mtypes.h" #include "math/m_xform.h" diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c index d9650a797c3..982a11fae1d 100644 --- a/src/mesa/tnl/t_vb_light.c +++ b/src/mesa/tnl/t_vb_light.c @@ -27,7 +27,6 @@ #include "main/glheader.h" #include "main/light.h" #include "main/macros.h" -#include "main/imports.h" #include "util/simple_list.h" #include "main/mtypes.h" diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c index 6fc89c23b33..72190695e75 100644 --- a/src/mesa/tnl/t_vb_normals.c +++ b/src/mesa/tnl/t_vb_normals.c @@ -28,7 +28,6 @@ #include "main/glheader.h" #include "main/macros.h" -#include "main/imports.h" #include "main/mtypes.h" #include "math/m_xform.h" diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c index 0f8578daa18..3c026cbba9c 100644 --- a/src/mesa/tnl/t_vb_points.c +++ b/src/mesa/tnl/t_vb_points.c @@ -29,7 +29,6 @@ #include "main/glheader.h" #include "main/mtypes.h" #include "main/dd.h" -#include "main/imports.h" #include "t_context.h" #include "t_pipeline.h" diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c index 9ff1f18f53b..d35a43f0c68 100644 --- a/src/mesa/tnl/t_vb_render.c +++ b/src/mesa/tnl/t_vb_render.c @@ -43,7 +43,6 @@ #include "main/context.h" #include "main/enums.h" #include "main/macros.h" -#include "main/imports.h" #include "main/mtypes.h" #include "math/m_xform.h" #include "util/bitscan.h" diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c index bd585324e2b..3e7bf6895e8 100644 --- a/src/mesa/tnl/t_vb_texgen.c +++ b/src/mesa/tnl/t_vb_texgen.c @@ -37,7 +37,6 @@ #include "main/errors.h" #include "main/glheader.h" #include "main/macros.h" -#include "main/imports.h" #include "main/mtypes.h" #include "math/m_xform.h" diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c index ef034d643bf..dc909f733ba 100644 --- a/src/mesa/tnl/t_vb_texmat.c +++ b/src/mesa/tnl/t_vb_texmat.c @@ -28,7 +28,6 @@ #include "main/glheader.h" #include "main/macros.h" -#include "main/imports.h" #include "main/mtypes.h" #include "math/m_xform.h" diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h index 2624dcec0f2..67e7e00480a 100644 --- a/src/mesa/vbo/vbo_exec.h +++ b/src/mesa/vbo/vbo_exec.h @@ -35,7 +35,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define VBO_EXEC_H #include "main/dd.h" -#include "main/imports.h" +#include "main/mesa_private.h" #include "vbo.h" #include "vbo_attrib.h" diff --git a/src/mesa/vbo/vbo_primitive_restart.c b/src/mesa/vbo/vbo_primitive_restart.c index a3c65f422ba..6959635a93a 100644 --- a/src/mesa/vbo/vbo_primitive_restart.c +++ b/src/mesa/vbo/vbo_primitive_restart.c @@ -29,7 +29,6 @@ */ #include "main/errors.h" -#include "main/imports.h" #include "main/macros.h" #include "main/varray.h" diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index b5807bb377c..730ebcfffee 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -31,7 +31,7 @@ #include "main/glheader.h" #include "main/bufferobj.h" #include "main/context.h" -#include "main/imports.h" +#include "main/mesa_private.h" #include "main/macros.h" #include "main/light.h" #include "main/state.h" diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c index 26a9f94facb..9cedc6c067c 100644 --- a/src/mesa/vbo/vbo_save_loopback.c +++ b/src/mesa/vbo/vbo_save_loopback.c @@ -29,7 +29,7 @@ #include "main/context.h" #include "main/glheader.h" #include "main/enums.h" -#include "main/imports.h" +#include "main/mesa_private.h" #include "main/dispatch.h" #include "glapi/glapi.h" diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c index 36b2e82fb63..4aed0601d7d 100644 --- a/src/mesa/x86/common_x86.c +++ b/src/mesa/x86/common_x86.c @@ -55,7 +55,6 @@ #endif #include "main/errors.h" -#include "main/imports.h" #include "common_x86_asm.h" diff --git a/src/mesa/x86/rtasm/x86sse.c b/src/mesa/x86/rtasm/x86sse.c index ddb2ec37380..8d06256ae4e 100644 --- a/src/mesa/x86/rtasm/x86sse.c +++ b/src/mesa/x86/rtasm/x86sse.c @@ -3,7 +3,6 @@ #include <stdio.h> -#include "main/imports.h" #include "main/execmem.h" #include "x86sse.h" diff --git a/src/meson.build b/src/meson.build index 0dcd7eef65d..a5284be7d89 100644 --- a/src/meson.build +++ b/src/meson.build @@ -30,8 +30,9 @@ inc_amd_common = include_directories('amd/common') libglsl_util = static_library( 'glsl_util', files( - 'mesa/main/extensions_table.c', 'mesa/main/imports.c', - 'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c', + 'mesa/main/extensions_table.c', + 'mesa/program/prog_parameter.c', + 'mesa/program/symbol_table.c', 'mesa/program/dummy_errors.c', ), include_directories : [inc_common], diff --git a/src/util/register_allocate.c b/src/util/register_allocate.c index fe00af67283..17b468b6ce2 100644 --- a/src/util/register_allocate.c +++ b/src/util/register_allocate.c @@ -73,7 +73,6 @@ #include <stdbool.h> #include "ralloc.h" -#include "main/imports.h" #include "main/macros.h" #include "util/bitset.h" #include "register_allocate.h" |