build: move imgui out of src/intel/tools to be reused

Signed-off-by: Lionel Landwerlin <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
+1-by: Mike Lothian <[email protected]>
+1-by: Tapani Pälli <[email protected]>
+1-by: Eric Engestrom <[email protected]>
+1-by: Yurii Kolesnykov <[email protected]>
+1-by: myfreeweb <[email protected]>
+1-by: Kenneth Graunke <[email protected]>

22 files changed, 37 insertions, 28 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 79c2a543fdc..1eda3e581ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,3 +136,18 @@ libglsl_util_la_SOURCES = \
 	mesa/program/prog_parameter.c \
 	mesa/program/symbol_table.c \
 	mesa/program/dummy_errors.c
+
+EXTRA_DIST += \
+	tools/imgui/imconfig.h \
+	tools/imgui/imgui.cpp \
+	tools/imgui/imgui.h \
+	tools/imgui/imgui_draw.cpp \
+	tools/imgui/imgui_demo.cpp \
+	tools/imgui/imgui_internal.h \
+	tools/imgui/imgui_memory_editor.h \
+	tools/imgui/stb_rect_pack.h \
+	tools/imgui/stb_textedit.h \
+	tools/imgui/stb_truetype.h \
+	tools/imgui/README \
+	tools/imgui/LICENSE.txt \
+	tools/imgui/meson.build
diff --git a/src/intel/tools/imgui/LICENSE.txt b/src/imgui/LICENSE.txt
index 21b6ee7e2a4..21b6ee7e2a4 100644
--- a/src/intel/tools/imgui/LICENSE.txt
+++ b/src/imgui/LICENSE.txt
diff --git a/src/intel/tools/imgui/README b/src/imgui/README
index 138b7620c65..138b7620c65 100644
--- a/src/intel/tools/imgui/README
+++ b/src/imgui/README
diff --git a/src/intel/tools/imgui/imconfig.h b/src/imgui/imconfig.h
index 50b7f471ce3..50b7f471ce3 100644
--- a/src/intel/tools/imgui/imconfig.h
+++ b/src/imgui/imconfig.h
diff --git a/src/intel/tools/imgui/imgui.cpp b/src/imgui/imgui.cpp
index 0498f1e98b8..0498f1e98b8 100644
--- a/src/intel/tools/imgui/imgui.cpp
+++ b/src/imgui/imgui.cpp
diff --git a/src/intel/tools/imgui/imgui.h b/src/imgui/imgui.h
index 0b963c13d33..0b963c13d33 100644
--- a/src/intel/tools/imgui/imgui.h
+++ b/src/imgui/imgui.h
diff --git a/src/intel/tools/imgui/imgui_demo.cpp b/src/imgui/imgui_demo.cpp
index c37a4506da0..c37a4506da0 100644
--- a/src/intel/tools/imgui/imgui_demo.cpp
+++ b/src/imgui/imgui_demo.cpp
diff --git a/src/intel/tools/imgui/imgui_draw.cpp b/src/imgui/imgui_draw.cpp
index ad93de2f7e1..ad93de2f7e1 100644
--- a/src/intel/tools/imgui/imgui_draw.cpp
+++ b/src/imgui/imgui_draw.cpp
diff --git a/src/intel/tools/imgui/imgui_internal.h b/src/imgui/imgui_internal.h
index 18302826f0e..18302826f0e 100644
--- a/src/intel/tools/imgui/imgui_internal.h
+++ b/src/imgui/imgui_internal.h
diff --git a/src/intel/tools/imgui/imgui_memory_editor.h b/src/imgui/imgui_memory_editor.h
index d1e54f0f4f0..d1e54f0f4f0 100644
--- a/src/intel/tools/imgui/imgui_memory_editor.h
+++ b/src/imgui/imgui_memory_editor.h
diff --git a/src/imgui/meson.build b/src/imgui/meson.build
new file mode 100644
index 00000000000..a5c02839be2
--- /dev/null
+++ b/src/imgui/meson.build
@@ -0,0 +1,11 @@
+libimgui_core = static_library(
+  'intel_imgui_core',
+  files('imgui.cpp', 'imgui_demo.cpp', 'imgui_draw.cpp'),
+  cpp_args : ['-w'],
+  install: false
+)
+
+libimgui_core_dep = declare_dependency(
+  link_with: libimgui_core,
+  include_directories: include_directories('.')
+)
diff --git a/src/intel/tools/imgui/stb_rect_pack.h b/src/imgui/stb_rect_pack.h
index bedcdbe9334..bedcdbe9334 100644
--- a/src/intel/tools/imgui/stb_rect_pack.h
+++ b/src/imgui/stb_rect_pack.h
diff --git a/src/intel/tools/imgui/stb_textedit.h b/src/imgui/stb_textedit.h
index 75eba307377..75eba307377 100644
--- a/src/intel/tools/imgui/stb_textedit.h
+++ b/src/imgui/stb_textedit.h
diff --git a/src/intel/tools/imgui/stb_truetype.h b/src/imgui/stb_truetype.h
index c421e3e9d90..c421e3e9d90 100644
--- a/src/intel/tools/imgui/stb_truetype.h
+++ b/src/imgui/stb_truetype.h
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index a6df653adef..b4d6a978a85 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -72,23 +72,11 @@ EXTRA_DIST = \
 	tools/aubinator_viewer.h \
 	tools/aubinator_viewer_decoder.cpp \
 	tools/aubinator_viewer_urb.h \
-	tools/imgui/README \
-	tools/imgui/stb_textedit.h \
-	tools/imgui/meson.build \
-	tools/imgui/imconfig.h \
-	tools/imgui/imgui.cpp \
-	tools/imgui/imgui.h \
-	tools/imgui/imgui_draw.cpp \
-	tools/imgui/imgui_demo.cpp \
-	tools/imgui/imgui_internal.h \
 	tools/imgui/imgui_impl_gtk3.cpp \
 	tools/imgui/imgui_impl_gtk3.h \
 	tools/imgui/imgui_impl_opengl3.cpp \
 	tools/imgui/imgui_impl_opengl3.h \
-	tools/imgui/imgui_memory_editor.h \
-	tools/imgui/stb_truetype.h \
-	tools/imgui/stb_rect_pack.h \
-	tools/imgui/LICENSE.txt \
+	tools/imgui/meson.build \
 	tools/intel_sanitize_gpu.c \
 	tools/intel_sanitize_gpu.in \
 	tools/intel_dump_gpu.c \
diff --git a/src/intel/tools/aubinator_viewer.cpp b/src/intel/tools/aubinator_viewer.cpp
index ef3426b8656..4c11fe4b37d 100644
--- a/src/intel/tools/aubinator_viewer.cpp
+++ b/src/intel/tools/aubinator_viewer.cpp
@@ -221,13 +221,13 @@ update_mem_for_exec(struct aub_mem *mem, struct aub_file *file, int exec_idx)
 
 #include <epoxy/gl.h>
 
-#include "imgui.h"
+#include "imgui/imgui.h"
+#include "imgui/imgui_memory_editor.h"
 #include "imgui_impl_gtk3.h"
 #include "imgui_impl_opengl3.h"
 
 #include "aubinator_viewer.h"
 #include "aubinator_viewer_urb.h"
-#include "imgui_memory_editor.h"
 
 struct window {
    struct list_head link; /* link in the global list of windows */
diff --git a/src/intel/tools/aubinator_viewer.h b/src/intel/tools/aubinator_viewer.h
index f8c2b776fe0..a311b898b95 100644
--- a/src/intel/tools/aubinator_viewer.h
+++ b/src/intel/tools/aubinator_viewer.h
@@ -1,7 +1,7 @@
 #ifndef AUBINATOR_VIEWER_H
 #define AUBINATOR_VIEWER_H
 
-#include "imgui.h"
+#include "imgui/imgui.h"
 
 #include "common/gen_decoder.h"
 #include "common/gen_disasm.h"
diff --git a/src/intel/tools/aubinator_viewer_urb.h b/src/intel/tools/aubinator_viewer_urb.h
index ef7412e540c..f9e7d5e344e 100644
--- a/src/intel/tools/aubinator_viewer_urb.h
+++ b/src/intel/tools/aubinator_viewer_urb.h
@@ -3,7 +3,7 @@
 
 #include "aubinator_viewer.h"
 
-#include "imgui.h"
+#include "imgui/imgui.h"
 
 struct AubinatorViewerUrb {
 
diff --git a/src/intel/tools/imgui/imgui_impl_gtk3.cpp b/src/intel/tools/imgui/imgui_impl_gtk3.cpp
index 0e9eb588472..6a1a5a2484c 100644
--- a/src/intel/tools/imgui/imgui_impl_gtk3.cpp
+++ b/src/intel/tools/imgui/imgui_impl_gtk3.cpp
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 
-#include <imgui.h>
+#include "imgui/imgui.h"
 #include "imgui_impl_gtk3.h"
 
 #include <gtk/gtk.h>
diff --git a/src/intel/tools/imgui/imgui_impl_opengl3.cpp b/src/intel/tools/imgui/imgui_impl_opengl3.cpp
index d5ef89896f5..b918467a796 100644
--- a/src/intel/tools/imgui/imgui_impl_opengl3.cpp
+++ b/src/intel/tools/imgui/imgui_impl_opengl3.cpp
@@ -48,7 +48,7 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "imgui.h"
+#include "imgui/imgui.h"
 #include "imgui_impl_opengl3.h"
 #include <stdio.h>
 #if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
diff --git a/src/intel/tools/imgui/meson.build b/src/intel/tools/imgui/meson.build
index d714d032f67..71f0d13a9a9 100644
--- a/src/intel/tools/imgui/meson.build
+++ b/src/intel/tools/imgui/meson.build
@@ -1,10 +1,3 @@
-libintel_imgui_core = static_library(
-  'intel_imgui_core',
-  files('imgui.cpp', 'imgui_demo.cpp', 'imgui_draw.cpp'),
-  cpp_args : ['-w'],
-  install: false
-)
-
 libintel_imgui_gtk_deps = [
   dependency('epoxy'),
   dependency('gtk+-3.0'),
@@ -13,13 +6,14 @@ libintel_imgui_gtk_deps = [
 libintel_imgui_gtk = static_library(
   'intel_imgui_gtk',
   files('imgui_impl_gtk3.cpp', 'imgui_impl_opengl3.cpp'),
+  include_directories: inc_common,
   dependencies : libintel_imgui_gtk_deps,
   cpp_args : ['-w'],
   install: false
 )
 
 libintel_imgui_gtk_dep = declare_dependency(
-  link_with: [libintel_imgui_core, libintel_imgui_gtk],
-  dependencies: libintel_imgui_gtk_deps,
+  link_with: libintel_imgui_gtk,
+  dependencies: [libimgui_core_dep, libintel_imgui_gtk_deps],
   include_directories: include_directories('.')
 )
diff --git a/src/meson.build b/src/meson.build
index ae094fccf6c..d9fe8daa146 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,6 +51,7 @@ subdir('util')
 subdir('mapi')
 # TODO: opengl
 subdir('compiler')
+subdir('imgui')
 if with_platform_wayland
   subdir('egl/wayland/wayland-drm')
 endif