merged ui / video folders

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

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

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

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];
 

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

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;
 

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

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 */

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;

src/render/nuklear.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include "ui/nuklear.h"
+#include "render/nuklear.h"
 #include "core/core.h"
 #include "core/log.h"
 #include "core/string.h"

src/render/nuklear.h

@@ -11,7 +11,7 @@
 #include <nuklear.h>
 
 #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)

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