summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2020-03-25 21:11:44 -0400
committerMarge Bot <eric+marge@anholt.net>2020-03-27 21:00:09 +0000
commite5339fe4a47c242693962c9f90bbab8b74935cba (patch)
treef625ba8d1d8c073b7b13d07f259da701e6339e4f /src/mesa/drivers/x11
parent6cfe074b8617f92b4538f3006b0c4e55d6681436 (diff)
Move compiler.h and imports.h/c from src/mesa/main into src/util
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4324>
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/fakeglx.c2
-rw-r--r--src/mesa/drivers/x11/xfonts.c2
-rw-r--r--src/mesa/drivers/x11/xm_api.c2
-rw-r--r--src/mesa/drivers/x11/xm_buffer.c2
-rw-r--r--src/mesa/drivers/x11/xm_dd.c2
-rw-r--r--src/mesa/drivers/x11/xm_tri.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 593c8d1f7eb..4201a05df8f 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -47,7 +47,7 @@
#include "main/context.h"
#include "main/config.h"
#include "main/macros.h"
-#include "main/imports.h"
+#include "util/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..04f397bd27d 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include "glxheader.h"
#include "main/context.h"
-#include "main/imports.h"
+#include "util/imports.h"
#include "xfonts.h"
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 88f6630ed6a..c71448750f2 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -69,7 +69,7 @@
#include "main/context.h"
#include "main/extensions.h"
#include "main/framebuffer.h"
-#include "main/imports.h"
+#include "util/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 0da08a6e64d..9e16726535c 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -32,7 +32,7 @@
#include "glxheader.h"
#include "xmesaP.h"
#include "main/errors.h"
-#include "main/imports.h"
+#include "util/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 3c576c7cd8b..790cbccf505 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -37,7 +37,7 @@
#include "main/macros.h"
#include "main/mipmap.h"
#include "main/image.h"
-#include "main/imports.h"
+#include "util/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..d5a27a981dc 100644
--- a/src/mesa/drivers/x11/xm_tri.c
+++ b/src/mesa/drivers/x11/xm_tri.c
@@ -32,7 +32,7 @@
#include <stdio.h>
#include "c99_math.h"
-#include "main/imports.h"
+#include "util/imports.h"
#include "main/mtypes.h"
#include "glxheader.h"
#include "xmesaP.h"