From 220fd51b27d05993579b91b1582f667077986621 Mon Sep 17 00:00:00 2001 From: scribam Date: Wed, 3 May 2023 09:50:37 +0200 Subject: [PATCH] deps: gather backends under imgui/backends directory stay consistent with upstream --- CMakeLists.txt | 16 ++++++++-------- .../imgui/backends}/imgui_impl_dx11.cpp | 0 .../imgui/backends}/imgui_impl_dx11.h | 0 .../imgui/backends}/imgui_impl_dx9.cpp | 0 .../dx9 => deps/imgui/backends}/imgui_impl_dx9.h | 0 .../imgui/backends}/imgui_impl_opengl3.cpp | 2 +- .../imgui/backends}/imgui_impl_opengl3.h | 0 .../imgui/backends}/imgui_impl_vulkan.cpp | 0 .../imgui/backends}/imgui_impl_vulkan.h | 0 core/rend/dx11/dx11_driver.h | 2 +- core/rend/dx11/dx11context.cpp | 2 +- core/rend/dx9/dx9_driver.h | 2 +- core/rend/dx9/dxcontext.cpp | 2 +- core/rend/gles/opengl_driver.cpp | 2 +- core/rend/gui.cpp | 2 +- core/{deps/imgui => rend}/roboto_medium.h | 0 core/rend/vulkan/vulkan_context.cpp | 2 +- core/rend/vulkan/vulkan_driver.h | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename core/{rend/dx11 => deps/imgui/backends}/imgui_impl_dx11.cpp (100%) rename core/{rend/dx11 => deps/imgui/backends}/imgui_impl_dx11.h (100%) rename core/{rend/dx9 => deps/imgui/backends}/imgui_impl_dx9.cpp (100%) rename core/{rend/dx9 => deps/imgui/backends}/imgui_impl_dx9.h (100%) rename core/{rend/gles => deps/imgui/backends}/imgui_impl_opengl3.cpp (99%) rename core/{rend/gles => deps/imgui/backends}/imgui_impl_opengl3.h (100%) rename core/{rend/vulkan => deps/imgui/backends}/imgui_impl_vulkan.cpp (100%) rename core/{rend/vulkan => deps/imgui/backends}/imgui_impl_vulkan.h (100%) rename core/{deps/imgui => rend}/roboto_medium.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd95ea3b6..bc7e113d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1147,8 +1147,8 @@ if(USE_OPENGL) if(NOT LIBRETRO) target_sources(${PROJECT_NAME} PRIVATE - core/rend/gles/imgui_impl_opengl3.cpp - core/rend/gles/imgui_impl_opengl3.h + core/deps/imgui/backends/imgui_impl_opengl3.cpp + core/deps/imgui/backends/imgui_impl_opengl3.h core/rend/gles/opengl_driver.cpp core/rend/gles/opengl_driver.h) endif() @@ -1282,8 +1282,8 @@ if(USE_VULKAN) target_sources(${PROJECT_NAME} PRIVATE core/rend/vulkan/vulkan_driver.h core/rend/vulkan/vulkan_context.cpp - core/rend/vulkan/imgui_impl_vulkan.cpp - core/rend/vulkan/imgui_impl_vulkan.h) + core/deps/imgui/backends/imgui_impl_vulkan.cpp + core/deps/imgui/backends/imgui_impl_vulkan.h) if(CMAKE_SIZEOF_VOID_P EQUAL 4) target_compile_definitions(${PROJECT_NAME} PRIVATE ImTextureID=ImU64) endif() @@ -1303,8 +1303,8 @@ if(WIN32 AND USE_DX9 AND NOT LIBRETRO AND NOT WINDOWS_STORE AND ("x86" IN_LIST A core/rend/dx9/dx9_driver.h core/rend/dx9/dxcontext.cpp core/rend/dx9/dxcontext.h - core/rend/dx9/imgui_impl_dx9.h - core/rend/dx9/imgui_impl_dx9.cpp) + core/deps/imgui/backends/imgui_impl_dx9.h + core/deps/imgui/backends/imgui_impl_dx9.cpp) target_sources(${PROJECT_NAME} PRIVATE ${REND_DX9_FILES}) if(NOT MINGW) @@ -1323,8 +1323,8 @@ endif() if(WIN32 AND USE_DX11) if(NOT LIBRETRO) target_sources(${PROJECT_NAME} PRIVATE - core/rend/dx11/imgui_impl_dx11.cpp - core/rend/dx11/imgui_impl_dx11.h) + core/deps/imgui/backends/imgui_impl_dx11.cpp + core/deps/imgui/backends/imgui_impl_dx11.h) endif() target_sources(${PROJECT_NAME} PRIVATE core/rend/dx11/dx11_driver.h diff --git a/core/rend/dx11/imgui_impl_dx11.cpp b/core/deps/imgui/backends/imgui_impl_dx11.cpp similarity index 100% rename from core/rend/dx11/imgui_impl_dx11.cpp rename to core/deps/imgui/backends/imgui_impl_dx11.cpp diff --git a/core/rend/dx11/imgui_impl_dx11.h b/core/deps/imgui/backends/imgui_impl_dx11.h similarity index 100% rename from core/rend/dx11/imgui_impl_dx11.h rename to core/deps/imgui/backends/imgui_impl_dx11.h diff --git a/core/rend/dx9/imgui_impl_dx9.cpp b/core/deps/imgui/backends/imgui_impl_dx9.cpp similarity index 100% rename from core/rend/dx9/imgui_impl_dx9.cpp rename to core/deps/imgui/backends/imgui_impl_dx9.cpp diff --git a/core/rend/dx9/imgui_impl_dx9.h b/core/deps/imgui/backends/imgui_impl_dx9.h similarity index 100% rename from core/rend/dx9/imgui_impl_dx9.h rename to core/deps/imgui/backends/imgui_impl_dx9.h diff --git a/core/rend/gles/imgui_impl_opengl3.cpp b/core/deps/imgui/backends/imgui_impl_opengl3.cpp similarity index 99% rename from core/rend/gles/imgui_impl_opengl3.cpp rename to core/deps/imgui/backends/imgui_impl_opengl3.cpp index b5fb092e5..815182988 100644 --- a/core/rend/gles/imgui_impl_opengl3.cpp +++ b/core/deps/imgui/backends/imgui_impl_opengl3.cpp @@ -67,7 +67,7 @@ #endif #include "wsi/gl_context.h" -#include "glcache.h" +#include "rend/gles/glcache.h" #include "hw/pvr/Renderer_if.h" // OpenGL Data diff --git a/core/rend/gles/imgui_impl_opengl3.h b/core/deps/imgui/backends/imgui_impl_opengl3.h similarity index 100% rename from core/rend/gles/imgui_impl_opengl3.h rename to core/deps/imgui/backends/imgui_impl_opengl3.h diff --git a/core/rend/vulkan/imgui_impl_vulkan.cpp b/core/deps/imgui/backends/imgui_impl_vulkan.cpp similarity index 100% rename from core/rend/vulkan/imgui_impl_vulkan.cpp rename to core/deps/imgui/backends/imgui_impl_vulkan.cpp diff --git a/core/rend/vulkan/imgui_impl_vulkan.h b/core/deps/imgui/backends/imgui_impl_vulkan.h similarity index 100% rename from core/rend/vulkan/imgui_impl_vulkan.h rename to core/deps/imgui/backends/imgui_impl_vulkan.h diff --git a/core/rend/dx11/dx11_driver.h b/core/rend/dx11/dx11_driver.h index 697d7f373..419919ae5 100644 --- a/core/rend/dx11/dx11_driver.h +++ b/core/rend/dx11/dx11_driver.h @@ -18,7 +18,7 @@ */ #pragma once #include "rend/imgui_driver.h" -#include "imgui_impl_dx11.h" +#include "imgui/backends/imgui_impl_dx11.h" #include "dx11context.h" #include "rend/gui.h" #include diff --git a/core/rend/dx11/dx11context.cpp b/core/rend/dx11/dx11context.cpp index 07776fde5..a8879f759 100644 --- a/core/rend/dx11/dx11context.cpp +++ b/core/rend/dx11/dx11context.cpp @@ -25,7 +25,7 @@ #include "hw/pvr/Renderer_if.h" #include "emulator.h" #include "dx11_driver.h" -#include "imgui_impl_dx11.h" +#include "imgui/backends/imgui_impl_dx11.h" #ifdef TARGET_UWP #include #include diff --git a/core/rend/dx9/dx9_driver.h b/core/rend/dx9/dx9_driver.h index cfbc5ab62..82d4c88af 100644 --- a/core/rend/dx9/dx9_driver.h +++ b/core/rend/dx9/dx9_driver.h @@ -18,7 +18,7 @@ */ #pragma once #include "rend/imgui_driver.h" -#include "imgui_impl_dx9.h" +#include "imgui/backends/imgui_impl_dx9.h" #include "dxcontext.h" #include diff --git a/core/rend/dx9/dxcontext.cpp b/core/rend/dx9/dxcontext.cpp index 7b94a9d0f..84ba8d96d 100644 --- a/core/rend/dx9/dxcontext.cpp +++ b/core/rend/dx9/dxcontext.cpp @@ -25,7 +25,7 @@ #include "hw/pvr/Renderer_if.h" #include "emulator.h" #include "dx9_driver.h" -#include "imgui_impl_dx9.h" +#include "imgui/backends/imgui_impl_dx9.h" DXContext theDXContext; diff --git a/core/rend/gles/opengl_driver.cpp b/core/rend/gles/opengl_driver.cpp index 55b77900c..8705b661f 100644 --- a/core/rend/gles/opengl_driver.cpp +++ b/core/rend/gles/opengl_driver.cpp @@ -17,7 +17,7 @@ along with Flycast. If not, see . */ #include "opengl_driver.h" -#include "imgui_impl_opengl3.h" +#include "imgui/backends/imgui_impl_opengl3.h" #include "wsi/gl_context.h" #include "rend/osd.h" #include "rend/gui.h" diff --git a/core/rend/gui.cpp b/core/rend/gui.cpp index 48587e860..990403b01 100644 --- a/core/rend/gui.cpp +++ b/core/rend/gui.cpp @@ -22,7 +22,7 @@ #include "hw/maple/maple_if.h" #include "hw/maple/maple_devs.h" #include "imgui/imgui.h" -#include "imgui/roboto_medium.h" +#include "roboto_medium.h" #include "network/net_handshake.h" #include "network/ggpo.h" #include "wsi/context.h" diff --git a/core/deps/imgui/roboto_medium.h b/core/rend/roboto_medium.h similarity index 100% rename from core/deps/imgui/roboto_medium.h rename to core/rend/roboto_medium.h diff --git a/core/rend/vulkan/vulkan_context.cpp b/core/rend/vulkan/vulkan_context.cpp index 99318e4cb..97476cab8 100644 --- a/core/rend/vulkan/vulkan_context.cpp +++ b/core/rend/vulkan/vulkan_context.cpp @@ -20,7 +20,7 @@ */ #include "vulkan_context.h" #include "imgui/imgui.h" -#include "imgui_impl_vulkan.h" +#include "imgui/backends/imgui_impl_vulkan.h" #include "../gui.h" #ifdef USE_SDL #include diff --git a/core/rend/vulkan/vulkan_driver.h b/core/rend/vulkan/vulkan_driver.h index e659863ae..6628ce937 100644 --- a/core/rend/vulkan/vulkan_driver.h +++ b/core/rend/vulkan/vulkan_driver.h @@ -18,7 +18,7 @@ */ #pragma once #include "rend/imgui_driver.h" -#include "imgui_impl_vulkan.h" +#include "imgui/backends/imgui_impl_vulkan.h" #include "vulkan_context.h" #include "texture.h" #include