From aaa58d71425818ac07b3f4d5b1257dafe1d2551a Mon Sep 17 00:00:00 2001 From: Anthony Pesch Date: Sun, 10 Sep 2017 20:25:57 -0400 Subject: [PATCH] moved imgui and microprofile --- CMakeLists.txt | 4 ++-- deps/microprofile/{ => microprofile}/microprofile.h | 0 deps/microprofile/{ => microprofile}/microprofileui.h | 0 src/core/profiler.cc | 2 +- src/emulator.c | 2 +- src/guest/aica/aica.c | 2 +- src/guest/bios/bios.c | 2 +- src/guest/gdrom/gdrom.c | 2 +- src/guest/gdrom/patch.c | 2 +- src/guest/holly/holly.c | 2 +- src/guest/sh4/sh4.c | 2 +- src/host/sdl_host.c | 4 ++-- src/{render => }/imgui.cc | 0 src/{render => }/imgui.h | 0 src/{render => }/microprofile.cc | 8 ++++---- src/{render => }/microprofile.h | 0 src/{render => }/microprofile_font.inc | 0 src/tracer.c | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename deps/microprofile/{ => microprofile}/microprofile.h (100%) rename deps/microprofile/{ => microprofile}/microprofileui.h (100%) rename src/{render => }/imgui.cc (100%) rename src/{render => }/imgui.h (100%) rename src/{render => }/microprofile.cc (98%) rename src/{render => }/microprofile.h (100%) rename src/{render => }/microprofile_font.inc (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ebf6ae0..221a92b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,8 +249,8 @@ set(RELIB_SOURCES src/jit/jit.c src/jit/pass_stats.c src/render/gl_backend.c - src/render/imgui.cc - src/render/microprofile.cc) + src/imgui.cc + src/microprofile.cc) if(PLATFORM_ANDROID) list(APPEND RELIB_DEFS PLATFORM_ANDROID=1) diff --git a/deps/microprofile/microprofile.h b/deps/microprofile/microprofile/microprofile.h similarity index 100% rename from deps/microprofile/microprofile.h rename to deps/microprofile/microprofile/microprofile.h diff --git a/deps/microprofile/microprofileui.h b/deps/microprofile/microprofile/microprofileui.h similarity index 100% rename from deps/microprofile/microprofileui.h rename to deps/microprofile/microprofile/microprofileui.h diff --git a/src/core/profiler.cc b/src/core/profiler.cc index 7221000e..031fec4a 100644 --- a/src/core/profiler.cc +++ b/src/core/profiler.cc @@ -1,7 +1,7 @@ #include #ifdef HAVE_MICROPROFILE -#include +#include #endif extern "C" { diff --git a/src/emulator.c b/src/emulator.c index 34ce0520..1862bbd4 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -31,7 +31,7 @@ #include "guest/scheduler.h" #include "guest/sh4/sh4.h" #include "host/host.h" -#include "render/imgui.h" +#include "imgui.h" #include "render/render_backend.h" DEFINE_AGGREGATE_COUNTER(frames); diff --git a/src/guest/aica/aica.c b/src/guest/aica/aica.c index e96283c1..b08d4be7 100644 --- a/src/guest/aica/aica.c +++ b/src/guest/aica/aica.c @@ -11,7 +11,7 @@ #include "guest/memory.h" #include "guest/scheduler.h" #include "guest/sh4/sh4.h" -#include "render/imgui.h" +#include "imgui.h" DEFINE_AGGREGATE_COUNTER(aica_samples); diff --git a/src/guest/bios/bios.c b/src/guest/bios/bios.c index 0c6434b9..ae45a26d 100644 --- a/src/guest/bios/bios.c +++ b/src/guest/bios/bios.c @@ -10,7 +10,7 @@ #include "guest/gdrom/gdrom.h" #include "guest/rom/flash.h" #include "guest/sh4/sh4.h" -#include "render/imgui.h" +#include "imgui.h" DEFINE_PERSISTENT_OPTION_STRING(region, "auto", "System region"); DEFINE_PERSISTENT_OPTION_STRING(language, "english", "System language"); diff --git a/src/guest/gdrom/gdrom.c b/src/guest/gdrom/gdrom.c index 4c3d00b9..b63479d8 100644 --- a/src/guest/gdrom/gdrom.c +++ b/src/guest/gdrom/gdrom.c @@ -6,7 +6,7 @@ #include "guest/gdrom/gdrom_types.h" #include "guest/gdrom/patch.h" #include "guest/holly/holly.h" -#include "render/imgui.h" +#include "imgui.h" #if 0 #define LOG_GDROM LOG_INFO diff --git a/src/guest/gdrom/patch.c b/src/guest/gdrom/patch.c index d984cf12..3009e307 100644 --- a/src/guest/gdrom/patch.c +++ b/src/guest/gdrom/patch.c @@ -2,7 +2,7 @@ #include "core/assert.h" #include "core/string.h" #include "guest/memory.h" -#include "render/imgui.h" +#include "imgui.h" DEFINE_PERSISTENT_OPTION_INT(patch_widescreen, 0, "Apply widescreen patches"); diff --git a/src/guest/holly/holly.c b/src/guest/holly/holly.c index fa8f3e52..002cf19a 100644 --- a/src/guest/holly/holly.c +++ b/src/guest/holly/holly.c @@ -4,7 +4,7 @@ #include "guest/maple/maple.h" #include "guest/scheduler.h" #include "guest/sh4/sh4.h" -#include "render/imgui.h" +#include "imgui.h" #if 0 #define LOG_HOLLY LOG_INFO diff --git a/src/guest/sh4/sh4.c b/src/guest/sh4/sh4.c index 30396023..4306e690 100644 --- a/src/guest/sh4/sh4.c +++ b/src/guest/sh4/sh4.c @@ -12,11 +12,11 @@ #include "guest/rom/boot.h" #include "guest/rom/flash.h" #include "guest/scheduler.h" +#include "imgui.h" #include "jit/frontend/sh4/sh4_fallback.h" #include "jit/frontend/sh4/sh4_frontend.h" #include "jit/frontend/sh4/sh4_guest.h" #include "jit/jit.h" -#include "render/imgui.h" #if ARCH_X64 #include "jit/backend/x64/x64_backend.h" diff --git a/src/host/sdl_host.c b/src/host/sdl_host.c index 1a3660df..56b84917 100644 --- a/src/host/sdl_host.c +++ b/src/host/sdl_host.c @@ -9,8 +9,8 @@ #include "core/time.h" #include "emulator.h" #include "host/host.h" -#include "render/imgui.h" -#include "render/microprofile.h" +#include "imgui.h" +#include "microprofile.h" #include "render/render_backend.h" #include "tracer.h" diff --git a/src/render/imgui.cc b/src/imgui.cc similarity index 100% rename from src/render/imgui.cc rename to src/imgui.cc diff --git a/src/render/imgui.h b/src/imgui.h similarity index 100% rename from src/render/imgui.h rename to src/imgui.h diff --git a/src/render/microprofile.cc b/src/microprofile.cc similarity index 98% rename from src/render/microprofile.cc rename to src/microprofile.cc index b1603558..7aaa8b59 100644 --- a/src/render/microprofile.cc +++ b/src/microprofile.cc @@ -7,20 +7,20 @@ #define MICROPROFILEUI_IMPL 1 #define MICROPROFILE_PER_THREAD_BUFFER_SIZE (1024 * 1024 * 20) #define MICROPROFILE_CONTEXT_SWITCH_TRACE 0 -#include -#include +#include +#include #endif extern "C" { #include "core/assert.h" #include "core/math.h" -#include "render/microprofile.h" +#include "microprofile.h" #include "render/render_backend.h" } static const int FONT_WIDTH = 1024; static const int FONT_HEIGHT = 9; -#include "render/microprofile_font.inc" +#include "microprofile_font.inc" static const int MAX_2D_VERTICES = 32768; static const int MAX_2D_SURFACES = 256; diff --git a/src/render/microprofile.h b/src/microprofile.h similarity index 100% rename from src/render/microprofile.h rename to src/microprofile.h diff --git a/src/render/microprofile_font.inc b/src/microprofile_font.inc similarity index 100% rename from src/render/microprofile_font.inc rename to src/microprofile_font.inc diff --git a/src/tracer.c b/src/tracer.c index 4a713c66..b8f93981 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -5,7 +5,7 @@ #include "guest/pvr/ta.h" #include "guest/pvr/tr.h" #include "host/host.h" -#include "render/imgui.h" +#include "imgui.h" #define SCRUBBER_WINDOW_HEIGHT 20.0f