moved imgui and microprofile

This commit is contained in:
Anthony Pesch 2017-09-10 20:25:57 -04:00
parent ed76f10761
commit aaa58d7142
18 changed files with 17 additions and 17 deletions

View File

@ -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)

View File

@ -1,7 +1,7 @@
#include <atomic>
#ifdef HAVE_MICROPROFILE
#include <microprofile.h>
#include <microprofile/microprofile.h>
#endif
extern "C" {

View File

@ -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);

View File

@ -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);

View File

@ -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");

View File

@ -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

View File

@ -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");

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -7,20 +7,20 @@
#define MICROPROFILEUI_IMPL 1
#define MICROPROFILE_PER_THREAD_BUFFER_SIZE (1024 * 1024 * 20)
#define MICROPROFILE_CONTEXT_SWITCH_TRACE 0
#include <microprofile.h>
#include <microprofileui.h>
#include <microprofile/microprofile.h>
#include <microprofile/microprofileui.h>
#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;

View File

@ -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