Commit 56ff5359 authored by Dylan Baker's avatar Dylan Baker

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
parent cbdf3fa3
Pipeline #47396 failed with stages
in 13 minutes and 44 seconds
......@@ -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"
......
......@@ -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"
......
......@@ -26,7 +26,6 @@
*/
#include "nir.h"
#include <main/imports.h>
/**
* SSA-based copy propagation
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
......
......@@ -101,6 +101,7 @@ class PrintRemapTable(gl_XML.gl_print_base):
* named function in the specified dispatch table.
*/
""")
print('#include "main/glheader.h"')
return
......
......@@ -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 \
......
......@@ -24,7 +24,6 @@
#include "main/glheader.h"
#include "main/imports.h"
#include "main/accum.h"
#include "main/arrayobj.h"
#include "main/context.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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",
......
......@@ -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"
......
......@@ -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"
......
......@@ -27,7 +27,6 @@
#include "main/enums.h"
#include "main/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/fbobject.h"
......
......@@ -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"
......
......@@ -38,8 +38,6 @@
* performance bottleneck, though.
*/
#include "main/imports.h"
#include "intel_context.h"
#include "intel_batchbuffer.h"
#include "intel_reg.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -25,7 +25,6 @@
*
*/
#include "main/imports.h"
#include "main/bufferobj.h"
#include "main/varray.h"
#include "vbo/vbo.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -24,7 +24,6 @@
*/
#include "main/enums.h"
#include "main/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/fbobject.h"
......
......@@ -28,7 +28,6 @@
* Batched upload via BOs.
*/
#include "main/imports.h"
#include "main/macros.h"
#include "brw_bufmgr.h"
#include "brw_context.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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -25,7 +25,6 @@
*
*/
#include "main/imports.h"
#include "main/mtypes.h"
#include "main/bufferobj.h"
#include "util/u_memory.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -26,7 +26,6 @@
**************************************************************************/
#include "main/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/enums.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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)
......
......@@ -25,7 +25,6 @@
*
*/
#include "main/imports.h"
#include "util/simple_list.h"
#include "radeon_common_context.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -30,7 +30,6 @@
*/
#include "main/glheader.h"
#include "main/imports.h"
#include "main/context.h"
#include "main/enums.h"
#include "main/mipmap.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -31,7 +31,6 @@
#include <stdio.h>
#include "glxheader.h"
#include "main/context.h"
#include "main/imports.h"
#include "xfonts.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -24,7 +24,6 @@
*/
#include "glheader.h"