diff options
| author | Dylan Baker <[email protected]> | 2018-09-14 12:57:32 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2020-04-21 11:09:04 -0700 |
| commit | 8e3696137f2cb7b4f5a3824f26186ecbb06f9282 (patch) | |
| tree | 4494df8d138aaf2bab2feafa832f68e9fdf9bfb1 /src/mapi | |
| parent | 289f02d1d5990e052e21eb250f6d40b47d6eb12f (diff) | |
remove final imports.h and imports.c bits
This moves the fi_types to a new mesa_private.h and removes the
imports.c file. The vast majority of this patch is just removing
pound includes of imports.h and fixing up the recursive includes.
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Kristian H. Kristensen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/gen/gl_enums.py | 3 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_genexec.py | 1 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_table.py | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py index 255b1adfbed..1e4d5a3b3cf 100644 --- a/src/mapi/glapi/gen/gl_enums.py +++ b/src/mapi/glapi/gen/gl_enums.py @@ -2,7 +2,7 @@ # (C) Copyright Zack Rusin 2005. All Rights Reserved. # Copyright (C) 2015 Intel Corporation # Copyright (C) 2015 Broadcom Corporation -# +# # 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 @@ -53,7 +53,6 @@ class PrintGlEnums(gl_XML.gl_print_base): print('#include <stdio.h>') print('#include "main/glheader.h"') print('#include "main/enums.h"') - print('#include "util/imports.h"') print('#include "main/mtypes.h"') print('') print('typedef struct PACKED {') diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 0309ae58465..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 "util/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 e9fc0538cbe..cbd7cf5dbf7 100644 --- a/src/mapi/glapi/gen/gl_table.py +++ b/src/mapi/glapi/gen/gl_table.py @@ -103,6 +103,7 @@ class PrintRemapTable(gl_XML.gl_print_base): #include "main/glheader.h" """) + print('#include "main/glheader.h"') return |