summaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2020-03-25 21:11:44 -0400
committerMarge Bot <[email protected]>2020-03-27 21:00:09 +0000
commite5339fe4a47c242693962c9f90bbab8b74935cba (patch)
treef625ba8d1d8c073b7b13d07f259da701e6339e4f /src/mapi
parent6cfe074b8617f92b4538f3006b0c4e55d6681436 (diff)
Move compiler.h and imports.h/c from src/mesa/main into src/util
Reviewed-by: Timothy Arceri <[email protected] Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4324>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/glapi/gen/gl_enums.py2
-rw-r--r--src/mapi/glapi/gen/gl_genexec.py2
-rw-r--r--src/mapi/glapi/gen/gl_table.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py
index 00f8134bae2..53987813642 100644
--- a/src/mapi/glapi/gen/gl_enums.py
+++ b/src/mapi/glapi/gen/gl_enums.py
@@ -52,7 +52,7 @@ class PrintGlEnums(gl_XML.gl_print_base):
def printRealHeader(self):
print('#include "main/glheader.h"')
print('#include "main/enums.h"')
- print('#include "main/imports.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 bd14bff4f27..0309ae58465 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -89,7 +89,7 @@ header = """/**
#include "main/genmipmap.h"
#include "main/hint.h"
#include "main/histogram.h"
-#include "main/imports.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 4b89ef8a856..e9fc0538cbe 100644
--- a/src/mapi/glapi/gen/gl_table.py
+++ b/src/mapi/glapi/gen/gl_table.py
@@ -100,6 +100,8 @@ class PrintRemapTable(gl_XML.gl_print_base):
* can SET_FuncName, are used to get and set the dispatch pointer for the
* named function in the specified dispatch table.
*/
+
+#include "main/glheader.h"
""")
return