From 2cecf2945cb459e38aa31a9f156d69fb100d3e08 Mon Sep 17 00:00:00 2001 From: Anthony Pesch Date: Sun, 7 May 2017 12:38:07 -0400 Subject: [PATCH] merged ui / video folders --- CMakeLists.txt | 6 +++--- src/emulator.c | 6 +++--- src/hw/aica/aica.c | 2 +- src/hw/holly/holly.c | 2 +- src/hw/pvr/ta.c | 2 +- src/hw/pvr/tr.h | 2 +- src/hw/sh4/sh4.c | 2 +- src/{video => render}/gl_backend.c | 8 ++++---- src/{ui => render}/microprofile.cc | 6 +++--- src/{ui => render}/microprofile.h | 0 src/{ui => render}/microprofile_font.inc | 0 src/{ui => render}/nuklear.c | 2 +- src/{ui => render}/nuklear.h | 2 +- src/{video => render}/render_backend.h | 0 src/{video => render}/ta.glsl | 0 src/{video => render}/ui.glsl | 0 src/tracer.c | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) rename src/{video => render}/gl_backend.c (99%) rename src/{ui => render}/microprofile.cc (98%) rename src/{ui => render}/microprofile.h (100%) rename src/{ui => render}/microprofile_font.inc (100%) rename src/{ui => render}/nuklear.c (99%) rename src/{ui => render}/nuklear.h (97%) rename src/{video => render}/render_backend.h (100%) rename src/{video => render}/ta.glsl (100%) rename src/{video => render}/ui.glsl (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index df8df609..91de58ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,12 +205,12 @@ set(REDREAM_SOURCES src/jit/emit_stats.c src/jit/jit.c src/jit/pass_stats.c + src/render/gl_backend.c + src/render/microprofile.cc + src/render/nuklear.c src/sys/exception_handler.c src/sys/filesystem.c src/sys/memory.c - src/ui/microprofile.cc - src/ui/nuklear.c - src/video/gl_backend.c src/emulator.c src/keycode.c src/tracer.c diff --git a/src/emulator.c b/src/emulator.c index 64cec794..8d3263e1 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -13,11 +13,11 @@ #include "hw/pvr/tr.h" #include "hw/scheduler.h" #include "hw/sh4/sh4.h" +#include "render/microprofile.h" +#include "render/nuklear.h" +#include "render/render_backend.h" #include "sys/thread.h" #include "sys/time.h" -#include "ui/microprofile.h" -#include "ui/nuklear.h" -#include "video/render_backend.h" DEFINE_AGGREGATE_COUNTER(frames); diff --git a/src/hw/aica/aica.c b/src/hw/aica/aica.c index da64314b..7e6b7086 100644 --- a/src/hw/aica/aica.c +++ b/src/hw/aica/aica.c @@ -9,8 +9,8 @@ #include "hw/memory.h" #include "hw/scheduler.h" #include "hw/sh4/sh4.h" +#include "render/nuklear.h" #include "sys/filesystem.h" -#include "ui/nuklear.h" DEFINE_OPTION_INT(rtc, 0, OPTION_HIDDEN); DEFINE_AGGREGATE_COUNTER(aica_samples); diff --git a/src/hw/holly/holly.c b/src/hw/holly/holly.c index da32b906..1fdb39b4 100644 --- a/src/hw/holly/holly.c +++ b/src/hw/holly/holly.c @@ -3,7 +3,7 @@ #include "hw/gdrom/gdrom.h" #include "hw/maple/maple.h" #include "hw/sh4/sh4.h" -#include "ui/nuklear.h" +#include "render/nuklear.h" struct reg_cb holly_cb[NUM_HOLLY_REGS]; diff --git a/src/hw/pvr/ta.c b/src/hw/pvr/ta.c index 40835338..12d6a3fa 100644 --- a/src/hw/pvr/ta.c +++ b/src/hw/pvr/ta.c @@ -8,9 +8,9 @@ #include "hw/pvr/trace.h" #include "hw/scheduler.h" #include "hw/sh4/sh4.h" +#include "render/nuklear.h" #include "sys/exception_handler.h" #include "sys/filesystem.h" -#include "ui/nuklear.h" DEFINE_AGGREGATE_COUNTER(ta_data); DEFINE_AGGREGATE_COUNTER(ta_renders); diff --git a/src/hw/pvr/tr.h b/src/hw/pvr/tr.h index 3f291c58..76feac3a 100644 --- a/src/hw/pvr/tr.h +++ b/src/hw/pvr/tr.h @@ -6,7 +6,7 @@ #include "core/rb_tree.h" #include "hw/pvr/ta_types.h" -#include "video/render_backend.h" +#include "render/render_backend.h" struct tr; diff --git a/src/hw/sh4/sh4.c b/src/hw/sh4/sh4.c index 4b5b450c..daf853d9 100644 --- a/src/hw/sh4/sh4.c +++ b/src/hw/sh4/sh4.c @@ -19,8 +19,8 @@ #include "jit/frontend/sh4/sh4_translate.h" #include "jit/ir/ir.h" #include "jit/jit.h" +#include "render/nuklear.h" #include "sys/time.h" -#include "ui/nuklear.h" DEFINE_AGGREGATE_COUNTER(sh4_instrs); DEFINE_AGGREGATE_COUNTER(sh4_sr_updates); diff --git a/src/video/gl_backend.c b/src/render/gl_backend.c similarity index 99% rename from src/video/gl_backend.c rename to src/render/gl_backend.c index 9f61c958..d5c7f9e3 100644 --- a/src/video/gl_backend.c +++ b/src/render/gl_backend.c @@ -3,9 +3,9 @@ #include "core/profiler.h" #include "core/string.h" #include "host.h" +#include "render/nuklear.h" +#include "render/render_backend.h" #include "sys/thread.h" -#include "ui/nuklear.h" -#include "video/render_backend.h" #define MAX_FRAMEBUFFERS 8 #define MAX_TEXTURES 8192 @@ -98,8 +98,8 @@ struct render_backend { const float *uniform_mvp; }; -#include "video/ta.glsl" -#include "video/ui.glsl" +#include "render/ta.glsl" +#include "render/ui.glsl" static GLenum filter_funcs[] = { GL_NEAREST, /* FILTER_NEAREST */ diff --git a/src/ui/microprofile.cc b/src/render/microprofile.cc similarity index 98% rename from src/ui/microprofile.cc rename to src/render/microprofile.cc index 32b7c306..c02565af 100644 --- a/src/ui/microprofile.cc +++ b/src/render/microprofile.cc @@ -13,13 +13,13 @@ extern "C" { #include "core/assert.h" #include "core/math.h" #include "keycode.h" -#include "ui/microprofile.h" -#include "video/render_backend.h" +#include "render/microprofile.h" +#include "render/render_backend.h" } static const int FONT_WIDTH = 1024; static const int FONT_HEIGHT = 9; -#include "ui/microprofile_font.inc" +#include "render/microprofile_font.inc" static const int MAX_2D_VERTICES = 32768; static const int MAX_2D_SURFACES = 256; diff --git a/src/ui/microprofile.h b/src/render/microprofile.h similarity index 100% rename from src/ui/microprofile.h rename to src/render/microprofile.h diff --git a/src/ui/microprofile_font.inc b/src/render/microprofile_font.inc similarity index 100% rename from src/ui/microprofile_font.inc rename to src/render/microprofile_font.inc diff --git a/src/ui/nuklear.c b/src/render/nuklear.c similarity index 99% rename from src/ui/nuklear.c rename to src/render/nuklear.c index 0956dc32..36b074b1 100644 --- a/src/ui/nuklear.c +++ b/src/render/nuklear.c @@ -1,5 +1,5 @@ #include -#include "ui/nuklear.h" +#include "render/nuklear.h" #include "core/core.h" #include "core/log.h" #include "core/string.h" diff --git a/src/ui/nuklear.h b/src/render/nuklear.h similarity index 97% rename from src/ui/nuklear.h rename to src/render/nuklear.h index 41f7f376..62a51ecc 100644 --- a/src/ui/nuklear.h +++ b/src/render/nuklear.h @@ -11,7 +11,7 @@ #include #include "keycode.h" -#include "video/render_backend.h" +#include "render/render_backend.h" #define NK_MAX_VERTICES 16384 #define NK_MAX_ELEMENTS (NK_MAX_VERTICES * 4) diff --git a/src/video/render_backend.h b/src/render/render_backend.h similarity index 100% rename from src/video/render_backend.h rename to src/render/render_backend.h diff --git a/src/video/ta.glsl b/src/render/ta.glsl similarity index 100% rename from src/video/ta.glsl rename to src/render/ta.glsl diff --git a/src/video/ui.glsl b/src/render/ui.glsl similarity index 100% rename from src/video/ui.glsl rename to src/render/ui.glsl diff --git a/src/tracer.c b/src/tracer.c index 676e7198..06c81118 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -4,7 +4,7 @@ #include "hw/pvr/ta.h" #include "hw/pvr/tr.h" #include "hw/pvr/trace.h" -#include "ui/nuklear.h" +#include "render/nuklear.h" static const char *param_names[] = { "TA_PARAM_END_OF_LIST", "TA_PARAM_USER_TILE_CLIP", "TA_PARAM_OBJ_LIST_SET",