refactor(gfx): reorganize graphics includes and introduce new types

- Updated include paths for various graphics-related headers to improve organization and clarity.
- Introduced new types for SNES color, palette, and tile management, enhancing the structure of the graphics subsystem.
- Refactored existing code to utilize the new types, ensuring consistency across the codebase.

Benefits:
- Improves maintainability and readability of the graphics code.
- Facilitates future enhancements and optimizations within the graphics subsystem.

src/app/core/controller.cc

@@ -9,7 +9,7 @@
 #include "app/core/window.h"
 #include "app/editor/editor_manager.h"
 #include "app/gui/background_renderer.h"
-#include "app/gfx/arena.h"                  // Add include for Arena
+#include "app/gfx/resource/arena.h"                  // Add include for Arena
 #include "app/gfx/backend/sdl2_renderer.h"  // Add include for new renderer
 #include "app/gui/theme_manager.h"
 #include "app/gui/widgets/widget_id_registry.h"

src/app/core/features.h

@@ -40,6 +40,9 @@ class FeatureFlags {
     // Enable performance monitoring and timing.
     bool kEnablePerformanceMonitoring = true;
 
+    // Enable the new tiered graphics architecture.
+    bool kEnableTieredGfxArchitecture = true;
+
     // Use NFD (Native File Dialog) instead of bespoke file dialog implementation.
 #if defined(YAZE_ENABLE_NFD) && YAZE_ENABLE_NFD
     bool kUseNativeFileDialog = true;
@@ -111,6 +114,8 @@ class FeatureFlags {
               std::to_string(get().overworld.kApplyZSCustomOverworldASM) + "\n";
     result += "kUseNativeFileDialog: " +
               std::to_string(get().kUseNativeFileDialog) + "\n";
+    result += "kEnableTieredGfxArchitecture: " +
+              std::to_string(get().kEnableTieredGfxArchitecture) + "\n";
     return result;
   }
 };

src/app/core/window.cc

@@ -7,7 +7,7 @@
 #include "app/platform/font_loader.h"
 #include "util/sdl_deleter.h"
 #include "util/log.h"
-#include "app/gfx/arena.h"
+#include "app/gfx/resource/arena.h"
 #include "app/gui/style.h"
 #include "imgui/backends/imgui_impl_sdl2.h"
 #include "imgui/backends/imgui_impl_sdlrenderer2.h"

src/app/core/window.h

@@ -8,7 +8,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "util/sdl_deleter.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gfx/backend/irenderer.h"
 
 namespace yaze {

src/app/editor/dungeon/dungeon_canvas_viewer.cc

@@ -1,8 +1,8 @@
 #include "dungeon_canvas_viewer.h"
 
 #include "absl/strings/str_format.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/input.h"
 #include "app/rom.h"
 #include "zelda3/dungeon/room.h"

src/app/editor/dungeon/dungeon_canvas_viewer.h

@@ -6,7 +6,7 @@
 #include "app/gui/canvas.h"
 #include "app/rom.h"
 #include "zelda3/dungeon/room.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 #include "dungeon_object_interaction.h"
 #include "imgui/imgui.h"
 

src/app/editor/dungeon/dungeon_editor_v2.cc

@@ -4,9 +4,9 @@
 #include <cstdio>
 
 #include "absl/strings/str_format.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/palette_manager.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/util/palette_manager.h"
+#include "app/gfx/types/snes_palette.h"
 #include "zelda3/dungeon/room.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"

src/app/editor/dungeon/dungeon_editor_v2.h

@@ -7,7 +7,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "app/editor/editor.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/rom.h"
 #include "dungeon_room_selector.h"
 #include "dungeon_canvas_viewer.h"

src/app/editor/dungeon/dungeon_object_selector.cc

@@ -5,8 +5,8 @@
 #include <cstring>
 
 #include "app/core/window.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/canvas.h"
 #include "app/gui/modules/asset_browser.h"
 #include "app/rom.h"

src/app/editor/dungeon/dungeon_object_selector.h

@@ -6,7 +6,7 @@
 // object_renderer.h removed - using ObjectDrawer for production rendering
 #include "zelda3/dungeon/dungeon_object_editor.h"
 #include "zelda3/dungeon/dungeon_editor_system.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/dungeon/dungeon_room_loader.cc

@@ -6,8 +6,8 @@
 #include <thread>
 #include <mutex>
 
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/types/snes_palette.h"
 #include "zelda3/dungeon/room.h"
 #include "util/log.h"
 

src/app/editor/editor_manager.cc

@@ -28,8 +28,8 @@
 #include "app/editor/sprite/sprite_editor.h"
 #include "app/editor/ui/editor_selection_dialog.h"
 #include "app/emu/emulator.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gui/background_renderer.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
@@ -51,7 +51,7 @@
 #include "app/editor/system/settings_editor.h"
 #include "app/editor/system/toast_manager.h"
 #include "app/emu/emulator.h"
-#include "app/gfx/performance/performance_dashboard.h"
+#include "app/gfx/debug/performance/performance_dashboard.h"
 #include "app/editor/editor.h"
 
 #ifdef YAZE_WITH_GRPC

src/app/editor/editor_manager.h

@@ -38,7 +38,7 @@
 #include "app/editor/ui/editor_selection_dialog.h"
 #include "app/editor/ui/welcome_screen.h"
 #include "app/emu/emulator.h"
-#include "app/gfx/performance/performance_dashboard.h"
+#include "app/gfx/debug/performance/performance_dashboard.h"
 #include "app/rom.h"
 #include "yaze_config.h"
 

src/app/editor/graphics/gfx_group_editor.cc

@@ -2,8 +2,8 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/canvas.h"
 #include "app/gui/color.h"
 #include "app/gui/input.h"

src/app/editor/graphics/gfx_group_editor.h

@@ -2,7 +2,7 @@
 #define YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
 
 #include "absl/status/status.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/canvas.h"
 #include "app/rom.h"
 

src/app/editor/graphics/graphics_editor.cc

@@ -8,12 +8,12 @@
 #include "app/gui/ui_helpers.h"
 #include "util/file_util.h"
 #include "app/core/window.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/compression.h"
-#include "app/gfx/scad_format.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/util/compression.h"
+#include "app/gfx/util/scad_format.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/types/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/color.h"
 #include "app/gui/icons.h"
@@ -21,7 +21,7 @@
 #include "app/gui/modules/asset_browser.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "imgui/imgui.h"
 #include "imgui/misc/cpp/imgui_stdlib.h"
 #include "imgui_memory_editor.h"

src/app/editor/graphics/graphics_editor.h

@@ -6,9 +6,9 @@
 #include "absl/status/status.h"
 #include "app/editor/editor.h"
 #include "app/editor/palette/palette_editor.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gui/editor_card_manager.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/types/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/editor_layout.h"
 #include "app/gui/modules/asset_browser.h"

src/app/editor/graphics/screen_editor.cc

@@ -5,15 +5,14 @@
 #include <string>
 
 #include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "util/file_util.h"
 #include "app/core/window.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/atlas_renderer.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/render/atlas_renderer.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/types/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/color.h"
 #include "app/gui/icons.h"

src/app/editor/graphics/screen_editor.h

@@ -5,10 +5,10 @@
 
 #include "absl/status/status.h"
 #include "app/editor/editor.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/editor_card_manager.h"
-#include "app/gfx/tilemap.h"
+#include "app/gfx/render/tilemap.h"
 #include "app/gui/canvas.h"
 #include "app/rom.h"
 #include "zelda3/screen/dungeon_map.h"

src/app/editor/message/message_editor.cc

@@ -6,12 +6,12 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "util/file_util.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/types/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/style.h"
 #include "app/gui/icons.h"

src/app/editor/message/message_editor.h

@@ -11,7 +11,7 @@
 #include "app/editor/message/message_preview.h"
 #include "app/gui/editor_card_manager.h"
 #include "app/gui/editor_layout.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gui/canvas.h"
 #include "app/gui/style.h"
 #include "app/rom.h"

src/app/editor/music/music_editor.cc

@@ -1,7 +1,7 @@
 #include "music_editor.h"
 
 #include "absl/strings/str_format.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/editor/code/assembly_editor.h"
 #include "app/emu/emulator.h"
 #include "app/gui/icons.h"

src/app/editor/overworld/map_properties.cc

@@ -1,6 +1,6 @@
 #include "app/editor/overworld/map_properties.h"
 
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/editor/overworld/overworld_editor.h"
 #include "app/editor/overworld/ui_constants.h"
 #include "app/gui/canvas.h"

src/app/editor/overworld/overworld_editor.cc

@@ -18,12 +18,12 @@
 #include "app/editor/overworld/map_properties.h"
 #include "app/editor/overworld/entity.h"
 #include "app/editor/overworld/tile16_editor.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gui/widgets/tile_selector_widget.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/tilemap.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/render/tilemap.h"
 #include "app/gui/canvas.h"
 #include "app/gui/canvas/canvas_automation_api.h"
 #include "app/gui/editor_layout.h"

src/app/editor/overworld/overworld_editor.h

@@ -9,9 +9,9 @@
 #include "app/editor/overworld/tile16_editor.h"
 #include "app/editor/overworld/map_properties.h"
 #include "app/editor/overworld/overworld_entity_renderer.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/tilemap.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/render/tilemap.h"
 #include "app/gui/canvas.h"
 #include "app/gui/widgets/tile_selector_widget.h"
 #include "app/gui/input.h"

src/app/editor/overworld/overworld_entity_renderer.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gui/canvas.h"
 #include "zelda3/common.h"
 #include "zelda3/overworld/overworld.h"

src/app/editor/overworld/scratch_space.cc

@@ -11,17 +11,16 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "app/core/asar_wrapper.h"
-#include "app/core/features.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/core/window.h"
 #include "app/editor/overworld/entity.h"
 #include "app/editor/overworld/map_properties.h"
 #include "app/editor/overworld/tile16_editor.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/tilemap.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/render/tilemap.h"
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"

src/app/editor/overworld/tile16_editor.cc

@@ -3,11 +3,11 @@
 #include <array>
 
 #include "absl/status/status.h"
-#include "app/gfx/arena.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gfx/backend/irenderer.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/canvas.h"
 #include "app/gui/input.h"
 #include "app/gui/style.h"

src/app/editor/overworld/tile16_editor.h

@@ -8,9 +8,9 @@
 
 #include "absl/status/status.h"
 #include "app/editor/palette/palette_editor.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/types/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/input.h"
 #include "util/log.h"

src/app/editor/palette/palette_editor.cc

@@ -2,9 +2,9 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-#include "app/gfx/palette_manager.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/util/palette_manager.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/color.h"
 #include "app/gui/editor_card_manager.h"
 #include "app/gui/editor_layout.h"

src/app/editor/palette/palette_editor.h

@@ -9,8 +9,8 @@
 #include "app/editor/editor.h"
 #include "app/editor/graphics/gfx_group_editor.h"
 #include "app/editor/palette/palette_group_card.h"
-#include "app/gfx/snes_color.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_color.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 

src/app/editor/palette/palette_group_card.cc

@@ -3,8 +3,8 @@
 #include <chrono>
 
 #include "absl/strings/str_format.h"
-#include "app/gfx/palette_manager.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/util/palette_manager.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/color.h"
 #include "app/gui/icons.h"
 #include "app/gui/layout_helpers.h"

src/app/editor/palette/palette_group_card.h

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "absl/status/status.h"
-#include "app/gfx/snes_color.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_color.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/editor_card_manager.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"

src/app/editor/sprite/sprite_editor.cc

@@ -1,10 +1,10 @@
 #include "sprite_editor.h"
 
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gui/ui_helpers.h"
 #include "util/file_util.h"
 #include "app/editor/sprite/zsprite.h"
-#include "app/gfx/arena.h"
+#include "app/gfx/resource/arena.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
 #include "zelda3/sprite/sprite.h"

src/app/editor/system/settings_editor.cc

@@ -3,7 +3,7 @@
 
 #include "absl/status/status.h"
 #include "app/gui/feature_flags_menu.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gui/style.h"
 #include "app/gui/icons.h"
 #include "app/gui/theme_manager.h"

src/app/emu/debug/disassembly_viewer.h

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "app/emu/cpu/cpu.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gui/icons.h"
 #include "imgui/imgui.h"
 

src/app/emu/snes.cc

@@ -151,13 +151,24 @@ void Snes::HandleInput() {
   input_latch(&input2, true);
   input_latch(&input1, false);
   input_latch(&input2, false);
+  // Read 16 bits serially for both controllers, LSB-first, packing bits as BYSTudlr
+  port_auto_read_[0] = 0; // input1 low 8 bits (B, Y, Select, Start, Up, Down, Left, Right)
+  port_auto_read_[2] = 0; // input1 high 8 bits (A, X, L, R, unused, unused, unused, unused)
+  port_auto_read_[1] = 0; // input2 low 8 bits
+  port_auto_read_[3] = 0; // input2 high 8 bits
+
   for (int i = 0; i < 16; i++) {
-    uint8_t val = input_read(&input1);
-    port_auto_read_[0] |= ((val & 1) << (15 - i));  // Bits are read LSB first, stored MSB first
-    port_auto_read_[2] |= (((val >> 1) & 1) << (15 - i));
-    val = input_read(&input2);
-    port_auto_read_[1] |= ((val & 1) << (15 - i));
-    port_auto_read_[3] |= (((val >> 1) & 1) << (15 - i));
+    uint8_t val1 = input_read(&input1);
+    uint8_t val2 = input_read(&input2);
+
+    if (i < 8) {
+      port_auto_read_[0] |= ((val1 & 1) << i);           // input1 low (BYSTudlr pattern)
+      port_auto_read_[1] |= ((val2 & 1) << i);           // input2 low
+      port_auto_read_[2] |= (((val1 >> 1) & 1) << i);    // input1 high (A, X, L, R...)
+      port_auto_read_[3] |= (((val2 >> 1) & 1) << i);    // input2 high
+    }
+    // Optional: for i >= 8, you can skip; 16-bits are clocked out, but SNES only expects the first 16
+    // If needed for other pads or 4 player, adapt here
   }
   
   // Debug: Log auto-read result when A button was active

src/app/gfx/backend/sdl2_renderer.cc

@@ -1,6 +1,6 @@
 #include "app/gfx/backend/sdl2_renderer.h"
 #include "absl/strings/str_format.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/core/bitmap.cc

@@ -7,9 +7,9 @@
 #include <span>
 #include <stdexcept>
 
-#include "app/gfx/arena.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/types/snes_palette.h"
 #include "util/log.h"
 
 namespace yaze {

src/app/gfx/core/bitmap.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "app/gfx/backend/irenderer.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 
 namespace yaze {
 

src/app/gfx/debug/graphics_optimizer.cc

@@ -1,11 +1,11 @@
-#include "app/gfx/graphics_optimizer.h"
+#include "app/gfx/debug/graphics_optimizer.h"
 
 #include <algorithm>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 
-#include "app/gfx/bpp_format_manager.h"
+#include "app/gfx/util/bpp_format_manager.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/debug/graphics_optimizer.h

@@ -5,8 +5,8 @@
 #include <unordered_map>
 #include <string>
 
-#include "app/gfx/bpp_format_manager.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/util/bpp_format_manager.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/debug/performance/performance_dashboard.cc

@@ -1,12 +1,12 @@
-#include "app/gfx/performance/performance_dashboard.h"
+#include "app/gfx/debug/performance/performance_dashboard.h"
 
 #include <algorithm>
 #include <iomanip>
 #include <sstream>
 
-#include "app/gfx/atlas_renderer.h"
-#include "app/gfx/memory_pool.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/render/atlas_renderer.h"
+#include "app/gfx/resource/memory_pool.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/gfx/debug/performance/performance_dashboard.h

@@ -6,9 +6,9 @@
 #include <memory>
 #include <chrono>
 
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/memory_pool.h"
-#include "app/gfx/atlas_renderer.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/resource/memory_pool.h"
+#include "app/gfx/render/atlas_renderer.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/debug/performance/performance_profiler.cc

@@ -1,4 +1,4 @@
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 
 #include <algorithm>
 #include <iomanip>
@@ -6,7 +6,7 @@
 #include <numeric>
 #include <sstream>
 
-#include "app/gfx/memory_pool.h"
+#include "app/gfx/resource/memory_pool.h"
 #include "util/log.h"
 
 namespace yaze {

src/app/gfx/gfx_library.cmake

@@ -1,79 +1,177 @@
-set(
-  YAZE_APP_GFX_SRC
-  app/gfx/arena.cc
-  app/gfx/atlas_renderer.cc
-  app/gfx/background_buffer.cc
-  app/gfx/bitmap.cc
-  app/gfx/compression.cc
-  app/gfx/memory_pool.cc
-  app/gfx/performance/performance_dashboard.cc
-  app/gfx/performance/performance_profiler.cc
-  app/gfx/scad_format.cc
-  app/gfx/snes_palette.cc
-  app/gfx/snes_tile.cc
-  app/gfx/snes_color.cc
-  app/gfx/texture_atlas.cc
-  app/gfx/tilemap.cc
-  app/gfx/graphics_optimizer.cc
-  app/gfx/bpp_format_manager.cc
-  app/gfx/palette_manager.cc
+# ==============================================================================
+# YAZE GFX Library Refactoring: Tiered Graphics Architecture
+#
+# This file implements the tiered graphics architecture as proposed in
+# docs/gfx-refactor.md. The monolithic yaze_gfx library is decomposed
+# into smaller, layered static libraries to improve build times and clarify
+# dependencies.
+# ==============================================================================
+
+# ==============================================================================
+# Helper Macro to Configure a GFX Library
+# ==============================================================================
+macro(configure_gfx_library name)
+  target_precompile_headers(${name} PRIVATE
+    "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/src/yaze_pch.h>"
+  )
+  target_include_directories(${name} PUBLIC
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/src/lib
+    ${CMAKE_SOURCE_DIR}/incl
+    ${SDL2_INCLUDE_DIR}
+    ${PROJECT_BINARY_DIR}
+  )
+  target_link_libraries(${name} PUBLIC
+    yaze_util
+    yaze_common
+    ${ABSL_TARGETS}
+  )
+  set_target_properties(${name} PROPERTIES
+    POSITION_INDEPENDENT_CODE ON
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+  )
+  if(UNIX AND NOT APPLE)
+    target_compile_definitions(${name} PRIVATE linux stricmp=strcasecmp)
+  elseif(APPLE)
+    target_compile_definitions(${name} PRIVATE MACOS)
+  elseif(WIN32)
+    target_compile_definitions(${name} PRIVATE WINDOWS)
+  endif()
+endmacro()
+
+# ==============================================================================
+# 3.1. gfx_types (Foundation)
+# Responsibility: Pure data structures for SNES graphics primitives.
+# Dependencies: None
+# ==============================================================================
+set(GFX_TYPES_SRC
+  app/gfx/types/snes_color.cc
+  app/gfx/types/snes_palette.cc
+  app/gfx/types/snes_tile.cc
+)
+add_library(yaze_gfx_types STATIC ${GFX_TYPES_SRC})
+configure_gfx_library(yaze_gfx_types)
+message(STATUS "  - GFX Tier: gfx_types configured")
+
+# ==============================================================================
+# 3.2. gfx_backend (Rendering Abstraction)
+# Responsibility: Low-level rendering interface and SDL2 implementation.
+# Dependencies: SDL2
+# ==============================================================================
+set(GFX_BACKEND_SRC
   app/gfx/backend/sdl2_renderer.cc
 )
+add_library(yaze_gfx_backend STATIC ${GFX_BACKEND_SRC})
+configure_gfx_library(yaze_gfx_backend)
+target_link_libraries(yaze_gfx_backend PUBLIC ${SDL_TARGETS})
+message(STATUS "  - GFX Tier: gfx_backend configured")
 
 # ==============================================================================
-# Yaze Graphics Library
+# 3.3. gfx_resource (Resource Management)
+# Responsibility: Manages memory and GPU resources.
+# Dependencies: gfx_backend
 # ==============================================================================
-# This library contains all graphics-related functionality:
-# - Bitmap manipulation
-# - SNES tile/palette handling
-# - Compression/decompression
-# - Arena memory management
-# - Atlas rendering
-# - Performance profiling
-#
-# Dependencies: yaze_util, SDL2, Abseil
-# ==============================================================================
-
-add_library(yaze_gfx STATIC ${YAZE_APP_GFX_SRC})
-
-target_precompile_headers(yaze_gfx PRIVATE
-  "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/src/yaze_pch.h>"
+set(GFX_RESOURCE_SRC
+  app/gfx/resource/arena.cc
+  app/gfx/resource/memory_pool.cc
 )
+add_library(yaze_gfx_resource STATIC ${GFX_RESOURCE_SRC})
+configure_gfx_library(yaze_gfx_resource)
+target_link_libraries(yaze_gfx_resource PUBLIC yaze_gfx_backend)
+message(STATUS "  - GFX Tier: gfx_resource configured")
 
-target_include_directories(yaze_gfx PUBLIC
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/lib
-  ${CMAKE_SOURCE_DIR}/incl
-  ${SDL2_INCLUDE_DIR}
-  ${PROJECT_BINARY_DIR}
+# ==============================================================================
+# 3.4. gfx_core (Core Graphics Object)
+# Responsibility: The central Bitmap class.
+# Dependencies: gfx_types, gfx_resource
+# ==============================================================================
+set(GFX_CORE_SRC
+  app/gfx/core/bitmap.cc
 )
+add_library(yaze_gfx_core STATIC ${GFX_CORE_SRC})
+configure_gfx_library(yaze_gfx_core)
+target_link_libraries(yaze_gfx_core PUBLIC
+  yaze_gfx_types
+  yaze_gfx_resource
+)
+message(STATUS "  - GFX Tier: gfx_core configured")
 
-target_link_libraries(yaze_gfx PUBLIC
+# ==============================================================================
+# 3.5. gfx_util (Utilities)
+# Responsibility: Standalone graphics data conversion and compression.
+# Dependencies: gfx_core
+# ==============================================================================
+set(GFX_UTIL_SRC
+  app/gfx/util/bpp_format_manager.cc
+  app/gfx/util/compression.cc
+  app/gfx/util/scad_format.cc
+  app/gfx/util/palette_manager.cc
+)
+add_library(yaze_gfx_util STATIC ${GFX_UTIL_SRC})
+configure_gfx_library(yaze_gfx_util)
+target_link_libraries(yaze_gfx_util PUBLIC yaze_gfx_core)
+message(STATUS "  - GFX Tier: gfx_util configured")
+
+# ==============================================================================
+# 3.6. gfx_render (High-Level Rendering)
+# Responsibility: Advanced rendering strategies.
+# Dependencies: gfx_core, gfx_backend
+# ==============================================================================
+set(GFX_RENDER_SRC
+  app/gfx/render/atlas_renderer.cc
+  app/gfx/render/texture_atlas.cc
+  app/gfx/render/tilemap.cc
+  app/gfx/render/background_buffer.cc
+)
+add_library(yaze_gfx_render STATIC ${GFX_RENDER_SRC})
+configure_gfx_library(yaze_gfx_render)
+target_link_libraries(yaze_gfx_render PUBLIC
+  yaze_gfx_core
+  yaze_gfx_backend
+)
+message(STATUS "  - GFX Tier: gfx_render configured")
+
+# ==============================================================================
+# 3.7. gfx_debug (Performance & Analysis)
+# Responsibility: Profiling, debugging, and optimization tools.
+# Dependencies: gfx_util, gfx_render
+# ==============================================================================
+set(GFX_DEBUG_SRC
+  app/gfx/debug/performance/performance_dashboard.cc
+  app/gfx/debug/performance/performance_profiler.cc
+  app/gfx/debug/graphics_optimizer.cc
+)
+add_library(yaze_gfx_debug STATIC ${GFX_DEBUG_SRC})
+configure_gfx_library(yaze_gfx_debug)
+target_link_libraries(yaze_gfx_debug PUBLIC
+  yaze_gfx_util
+  yaze_gfx_render
+)
+message(STATUS "  - GFX Tier: gfx_debug configured")
+
+# ==============================================================================
+# Aggregate INTERFACE Library (yaze_gfx)
+# Provides a single link target for external consumers (e.g., yaze_gui).
+# ==============================================================================
+add_library(yaze_gfx INTERFACE)
+target_link_libraries(yaze_gfx INTERFACE
+  yaze_gfx_types
+  yaze_gfx_backend
+  yaze_gfx_resource
+  yaze_gfx_core
+  yaze_gfx_util
+  yaze_gfx_render
+  yaze_gfx_debug
   yaze_util
   yaze_common
   ${ABSL_TARGETS}
-  ${SDL_TARGETS}
 )
 
 # Conditionally add PNG support
 if(PNG_FOUND)
-  target_include_directories(yaze_gfx PUBLIC ${PNG_INCLUDE_DIRS})
-  target_link_libraries(yaze_gfx PUBLIC ${PNG_LIBRARIES})
+  target_include_directories(yaze_gfx INTERFACE ${PNG_INCLUDE_DIRS})
+  target_link_libraries(yaze_gfx INTERFACE ${PNG_LIBRARIES})
 endif()
 
-set_target_properties(yaze_gfx PROPERTIES
-  POSITION_INDEPENDENT_CODE ON
-  ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-)
-
-# Platform-specific compile definitions
-if(UNIX AND NOT APPLE)
-  target_compile_definitions(yaze_gfx PRIVATE linux stricmp=strcasecmp)
-elseif(APPLE)
-  target_compile_definitions(yaze_gfx PRIVATE MACOS)
-elseif(WIN32)
-  target_compile_definitions(yaze_gfx PRIVATE WINDOWS)
-endif()
-
-message(STATUS "✓ yaze_gfx library configured")
+message(STATUS "✓ yaze_gfx library configured with tiered architecture")

src/app/gfx/render/atlas_renderer.cc

@@ -1,8 +1,8 @@
-#include "app/gfx/atlas_renderer.h"
+#include "app/gfx/render/atlas_renderer.h"
 
 #include <algorithm>
 #include <cmath>
-#include "app/gfx/bpp_format_manager.h"
+#include "app/gfx/util/bpp_format_manager.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/render/atlas_renderer.h

@@ -6,9 +6,9 @@
 #include <unordered_map>
 #include <memory>
 
-#include "app/gfx/bitmap.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/bpp_format_manager.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/util/bpp_format_manager.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/render/background_buffer.cc

@@ -1,11 +1,11 @@
-#include "app/gfx/background_buffer.h"
+#include "app/gfx/render/background_buffer.h"
 
 #include <algorithm>
 #include <cstdint>
 #include <vector>
 
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_tile.h"
 #include "util/log.h"
 
 namespace yaze::gfx {

src/app/gfx/render/background_buffer.h

@@ -4,8 +4,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_tile.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/render/texture_atlas.h

@@ -5,7 +5,7 @@
 #include <memory>
 #include <vector>
 
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "absl/status/status.h"
 
 namespace yaze {

src/app/gfx/render/tilemap.cc

@@ -1,12 +1,12 @@
-#include "app/gfx/tilemap.h"
+#include "app/gfx/render/tilemap.h"
 
 #include <vector>
 
-#include "app/gfx/arena.h"
-#include "app/gfx/atlas_renderer.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/render/atlas_renderer.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/types/snes_tile.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/render/tilemap.h

@@ -3,8 +3,8 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "app/gfx/backend/irenderer.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_tile.h"
 
 #include <list>
 #include <unordered_map>

src/app/gfx/resource/arena.cc

@@ -1,4 +1,4 @@
-#include "app/gfx/arena.h"
+#include "app/gfx/resource/arena.h"
 
 #include <SDL.h>
 #include <algorithm>

src/app/gfx/resource/arena.h

@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "util/sdl_deleter.h"
-#include "app/gfx/background_buffer.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/render/background_buffer.h"
+#include "app/gfx/core/bitmap.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/resource/memory_pool.cc

@@ -1,4 +1,4 @@
-#include "app/gfx/memory_pool.h"
+#include "app/gfx/resource/memory_pool.h"
 
 #include <algorithm>
 #include <cstdlib>

src/app/gfx/types/snes_color.cc

@@ -1,5 +1,5 @@
 
-#include "app/gfx/snes_color.h"
+#include "app/gfx/types/snes_color.h"
 
 #include <cstdint>
 #include <vector>

src/app/gfx/types/snes_palette.cc

@@ -1,4 +1,4 @@
-#include "snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 
 #include <SDL.h>
 
@@ -10,7 +10,7 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "app/gfx/snes_color.h"
+#include "app/gfx/types/snes_color.h"
 #include "imgui/imgui.h"
 #include "util/macro.h"
 

src/app/gfx/types/snes_palette.h

@@ -11,7 +11,7 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "app/gfx/snes_color.h"
+#include "app/gfx/types/snes_color.h"
 #include "imgui/imgui.h"
 #include "snes_color.h"
 #include "util/macro.h"

src/app/gfx/util/bpp_format_manager.cc

@@ -1,11 +1,11 @@
-#include "app/gfx/bpp_format_manager.h"
+#include "app/gfx/util/bpp_format_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <sstream>
 
-#include "app/gfx/memory_pool.h"
+#include "app/gfx/resource/memory_pool.h"
 #include "util/log.h"
 
 namespace yaze {

src/app/gfx/util/bpp_format_manager.h

@@ -7,9 +7,9 @@
 #include <memory>
 #include <string>
 
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 
 namespace yaze {
 namespace gfx {

src/app/gfx/util/palette_manager.cc

@@ -3,7 +3,7 @@
 #include <chrono>
 
 #include "absl/strings/str_format.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 #include "util/macro.h"
 
 namespace yaze {

src/app/gfx/util/palette_manager.h

@@ -11,8 +11,8 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "app/gfx/snes_color.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_color.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/rom.h"
 
 namespace yaze {

src/app/gfx/util/scad_format.cc

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "absl/status/status.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/types/snes_tile.h"
 #include "util/macro.h"
 
 namespace yaze {

src/app/gui/canvas.cc

@@ -2,9 +2,9 @@
 
 #include <cmath>
 #include <string>
-#include "app/gfx/bpp_format_manager.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/performance/performance_profiler.h"
+#include "app/gfx/util/bpp_format_manager.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gui/style.h"
 #include "canvas/canvas_utils.h"
 #include "canvas/canvas_automation_api.h"

src/app/gui/canvas.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_GUI_CANVAS_H
 #define YAZE_GUI_CANVAS_H
 
-#include "app/gfx/tilemap.h"
+#include "app/gfx/render/tilemap.h"
 #define IMGUI_DEFINE_MATH_OPERATORS
 
 #include <cstdint>
@@ -9,11 +9,11 @@
 #include <functional>
 #include <memory>
 
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/rom.h"
 #include "canvas/canvas_utils.h"
 #include "app/gui/widgets/palette_widget.h"
-#include "app/gfx/bpp_format_manager.h"
+#include "app/gfx/util/bpp_format_manager.h"
 #include "canvas/bpp_format_ui.h"
 #include "app/gui/canvas/canvas_modals.h"
 #include "app/gui/canvas/canvas_context_menu.h"

src/app/gui/canvas/bpp_format_ui.cc

@@ -3,8 +3,8 @@
 #include <algorithm>
 #include <sstream>
 
-#include "app/gfx/bpp_format_manager.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/util/bpp_format_manager.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gui/ui_helpers.h"
 #include "imgui/imgui.h"
 

src/app/gui/canvas/bpp_format_ui.h

@@ -5,9 +5,9 @@
 #include <vector>
 #include <functional>
 
-#include "app/gfx/bpp_format_manager.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/util/bpp_format_manager.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
 
 namespace yaze {
 namespace gui {

src/app/gui/canvas/canvas_context_menu.cc

@@ -1,8 +1,8 @@
 #include "canvas_context_menu.h"
 
-#include "app/gfx/arena.h"
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/performance/performance_dashboard.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_dashboard.h"
 #include "app/gui/widgets/palette_widget.h"
 #include "app/gui/icons.h"
 #include "app/gui/color.h"

src/app/gui/canvas/canvas_context_menu.h

@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/gui/icons.h"
 #include "app/gui/canvas/canvas_modals.h"
 #include "canvas_usage_tracker.h"

src/app/gui/canvas/canvas_interaction_handler.h

@@ -2,8 +2,8 @@
 #define YAZE_APP_GUI_CANVAS_CANVAS_INTERACTION_HANDLER_H
 
 #include <vector>
-#include "app/gfx/bitmap.h"
-#include "app/gfx/tilemap.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/render/tilemap.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/gui/canvas/canvas_modals.cc

@@ -4,8 +4,8 @@
 #include <sstream>
 #include <iomanip>
 
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/performance/performance_dashboard.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_dashboard.h"
 #include "app/gui/widgets/palette_widget.h"
 #include "app/gui/canvas/bpp_format_ui.h"
 #include "app/gui/icons.h"

src/app/gui/canvas/canvas_modals.h

@@ -4,9 +4,9 @@
 #include <string>
 #include <functional>
 #include <utility>
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/bpp_format_manager.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/util/bpp_format_manager.h"
 #include "app/gui/canvas/canvas_utils.h"
 #include "imgui/imgui.h"
 

src/app/gui/canvas/canvas_performance_integration.cc

@@ -5,8 +5,8 @@
 #include <iomanip>
 #include <chrono>
 
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/performance/performance_dashboard.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_dashboard.h"
 #include "util/log.h"
 #include "imgui/imgui.h"
 

src/app/gui/canvas/canvas_performance_integration.h

@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <memory>
 #include <functional>
-#include "app/gfx/performance/performance_profiler.h"
-#include "app/gfx/performance/performance_dashboard.h"
+#include "app/gfx/debug/performance/performance_profiler.h"
+#include "app/gfx/debug/performance/performance_dashboard.h"
 #include "canvas_usage_tracker.h"
 #include "imgui/imgui.h"
 

src/app/gui/canvas/canvas_utils.cc

@@ -1,8 +1,8 @@
 #include "canvas_utils.h"
 
 #include <cmath>
-#include "app/gfx/arena.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/resource/arena.h"
+#include "app/gfx/types/snes_palette.h"
 #include "util/log.h"
 
 namespace yaze {

src/app/gui/canvas/canvas_utils.h

@@ -3,7 +3,7 @@
 
 #include <string>
 #include <vector>
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 

src/app/gui/color.cc

@@ -1,7 +1,7 @@
 #include "color.h"
 
-#include "app/gfx/snes_color.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_color.h"
+#include "app/gfx/types/snes_palette.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/gui/color.h

@@ -5,7 +5,7 @@
 #include <string>
 
 #include "absl/status/status.h"
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/gui/feature_flags_menu.h

@@ -59,6 +59,8 @@ struct FlagsMenu {
     Checkbox("Enable Console Logging", &core::FeatureFlags::get().kLogToConsole);
     Checkbox("Enable Performance Monitoring",
              &core::FeatureFlags::get().kEnablePerformanceMonitoring);
+    Checkbox("Enable Tiered GFX Architecture",
+             &core::FeatureFlags::get().kEnableTieredGfxArchitecture);
     // REMOVED: "Log Instructions" - DisassemblyViewer is always active
     // Use the viewer's UI controls to enable/disable recording if needed
     Checkbox("Use Native File Dialog (NFD)",

src/app/gui/input.cc

@@ -5,7 +5,7 @@
 #include <variant>
 
 #include "absl/strings/string_view.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/types/snes_tile.h"
 #include "imgui/imgui.h"
 #include "imgui/imgui_internal.h"
 #include "imgui_memory_editor.h"

src/app/gui/input.h

@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/types/snes_tile.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/gui/modules/asset_browser.h

@@ -4,7 +4,7 @@
 #include <array>
 #include <string>
 
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 

src/app/gui/style.h

@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gui/color.h"
 #include "app/gui/modules/text_editor.h"
 #include "imgui/imgui.h"

src/app/gui/themed_widgets.cc

@@ -1,7 +1,7 @@
 #include "app/gui/themed_widgets.h"
 
 #include "app/gui/color.h"
-#include "app/gfx/snes_color.h"
+#include "app/gfx/types/snes_color.h"
 
 namespace yaze {
 namespace gui {

src/app/gui/widgets/palette_editor_widget.h

@@ -4,7 +4,7 @@
 #include <functional>
 #include <vector>
 
-#include "app/gfx/snes_palette.h"
+#include "app/gfx/types/snes_palette.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 

src/app/gui/widgets/palette_widget.cc

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 #include <map>
-#include "app/gfx/arena.h"
+#include "app/gfx/resource/arena.h"
 #include "app/gui/color.h"
 #include "util/log.h"
 

src/app/gui/widgets/palette_widget.h

@@ -3,8 +3,8 @@
 
 #include <vector>
 #include <map>
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 

src/app/gui/widgets/tile_selector_widget.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "app/gfx/bitmap.h"
+#include "app/gfx/core/bitmap.h"
 #include "app/gui/canvas.h"
 #include "imgui/imgui.h"
 

src/app/rom.cc

@@ -18,10 +18,10 @@
 #include "absl/strings/string_view.h"
 #include "app/core/features.h"
 #include "app/core/window.h"
-#include "app/gfx/compression.h"
-#include "app/gfx/snes_color.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/util/compression.h"
+#include "app/gfx/types/snes_color.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/types/snes_tile.h"
 #include "app/snes.h"
 #include "util/log.h"
 #include "util/hex.h"

src/app/rom.h

@@ -18,9 +18,9 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "app/core/project.h"
-#include "app/gfx/bitmap.h"
-#include "app/gfx/snes_palette.h"
-#include "app/gfx/snes_tile.h"
+#include "app/gfx/core/bitmap.h"
+#include "app/gfx/types/snes_palette.h"
+#include "app/gfx/types/snes_tile.h"
 #include "util/macro.h"
 
 namespace yaze {