refactor: reorganize display/ and render/ into unified render/ module

Merge the display/ and render/ sibling modules into a single render/
module with display/, sprite/, and ddraw/ sub-modules. Pure mechanical
refactor — file moves and import rewrites only, zero logic changes.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

crates/openwa-core/src/address.rs

@@ -75,23 +75,23 @@ pub mod va {
         BIT_GRID_COLLISION_VTABLE, BIT_GRID_DISPLAY_VTABLE, BIT_GRID_INIT, BLIT_SPRITE_RECT,
         DRAW_LINE_CLIPPED, DRAW_LINE_TWO_COLOR,
     };
-    pub use crate::display::base::DISPLAY_BASE_VTABLE;
-    pub use crate::display::compat_renderer::{
-        CompatRendererVtable, COMPAT_RENDERER_VTABLE, DDRAW8_RENDERER_VTABLE,
-    };
-    pub use crate::display::display_vtable::DISPLAY_GFX_VTABLE;
-    pub use crate::display::palette::PALETTE_VTABLE;
-    pub use crate::display::render_context::{RenderContextVtable, RENDER_CONTEXT_VTABLE};
     pub use crate::frontend::map_view::MAP_VIEW_VTABLE;
     pub use crate::input::controller::INPUT_CTRL_VTABLE;
+    pub use crate::render::ddraw::compat_renderer::{
+        CompatRendererVtable, COMPAT_RENDERER_VTABLE, DDRAW8_RENDERER_VTABLE,
+    };
+    pub use crate::render::display::base::DISPLAY_BASE_VTABLE;
+    pub use crate::render::display::context::{RenderContextVtable, RENDER_CONTEXT_VTABLE};
+    pub use crate::render::display::palette::PALETTE_VTABLE;
+    pub use crate::render::display::vtable::DISPLAY_GFX_VTABLE;
     pub use crate::task::game_task::SOUND_EMITTER_VTABLE;
 
     // Sprite, SpriteBank, PaletteContext — defined alongside their structs
     pub use crate::render::palette::{
         PALETTE_CONTEXT_INIT, PALETTE_CONTEXT_INIT_RANGE, PALETTE_CONTEXT_MAP_COLOR,
     };
-    pub use crate::render::sprite::SPRITE_BANK_VTABLE;
-    pub use crate::render::sprite::{
+    pub use crate::render::sprite::sprite::SPRITE_BANK_VTABLE;
+    pub use crate::render::sprite::sprite::{
         CONSTRUCT_SPRITE, DESTROY_SPRITE, LOAD_SPRITE_FROM_VFS, PROCESS_SPRITE,
         SPRITE_BANK_GET_INFO, SPRITE_GET_INFO, SPRITE_VTABLE,
     };

crates/openwa-core/src/engine/ddgame.rs

@@ -4,13 +4,13 @@ use crate::audio::music::Music;
 use crate::audio::speech::SpeechSlotTable;
 use crate::audio::SoundQueueEntry;
 use crate::bitgrid::{CollisionBitGrid, DisplayBitGrid};
-use crate::display::gfx::DisplayGfx;
-use crate::display::palette::Palette;
 use crate::engine::game_info::GameInfo;
 use crate::engine::{CoordEntry, CoordList, TeamArena, TeamIndexMap};
 use crate::fixed::Fixed;
 use crate::game::weapon::WeaponTable;
 use crate::input::keyboard::DDKeyboard;
+use crate::render::display::gfx::DisplayGfx;
+use crate::render::display::palette::Palette;
 use crate::render::landscape::PCLandscape;
 use crate::render::queue::RenderQueue;
 use crate::render::turn_order::TurnOrderWidget;
@@ -580,7 +580,7 @@ impl DDGame {
 // DDGame constructor code (create_ddgame, init helpers, usercall bridges)
 // has been moved to ddgame_constructor.rs.
 
-// BitGrid__Init lives in crate::display::bitgrid
+// BitGrid__Init lives in crate::bitgrid
 // Re-exported via ddgame_constructor.rs
 /// Well-known byte offsets into DDGame, for use with raw pointer access.
 ///

crates/openwa-core/src/engine/ddgame_constructor.rs

@@ -13,20 +13,20 @@ use crate::audio::active_sound::ActiveSoundTable;
 use crate::audio::dssound::DSSound;
 use crate::audio::music::Music;
 use crate::bitgrid::{BitGrid, BitGridBaseVtable, CollisionBitGrid, DisplayBitGrid};
-use crate::display::gfx::DisplayGfx;
-use crate::display::gradient::compute_complex_gradient;
-use crate::display::palette::Palette;
 use crate::engine::coord::{CoordList, CoordListEntry};
 use crate::engine::ddgame_wrapper::DDGameWrapper;
 use crate::engine::game_info::GameInfo;
 use crate::engine::net_bridge::NetBridge;
 use crate::input::keyboard::DDKeyboard;
 use crate::rebase::rb;
-use crate::render::gfx_dir::{
+use crate::render::display::gfx::DisplayGfx;
+use crate::render::display::gradient::compute_complex_gradient;
+use crate::render::display::palette::Palette;
+use crate::render::landscape::PCLandscape;
+use crate::render::sprite::gfx_dir::{
     call_gfx_find_and_load, call_gfx_load_and_wrap, call_gfx_load_dir, GfxDir,
 };
-pub use crate::render::gfx_dir::{gfx_dir_find_entry, gfx_resource_create};
-use crate::render::landscape::PCLandscape;
+pub use crate::render::sprite::gfx_dir::{gfx_dir_find_entry, gfx_resource_create};
 use crate::wa_alloc::{wa_malloc, wa_malloc_zeroed};
 
 // ============================================================
@@ -155,7 +155,7 @@ pub fn init_constructor_addrs() {
         LOADING_PROGRESS_TICK_ADDR = rb(va::DDGAME_WRAPPER_LOADING_PROGRESS_TICK);
         GFX_LOAD_SPRITES_ADDR = rb(va::GFX_DIR_LOAD_SPRITES);
     }
-    crate::render::gfx_dir::init_addrs();
+    crate::render::sprite::gfx_dir::init_addrs();
 }
 
 // ── Typed wrappers for WA stdcall functions ────────────────────────────────
@@ -475,7 +475,10 @@ unsafe fn init_graphics_and_resources(
         let fp = fopen(path.as_ptr(), c"rb".as_ptr());
         (*gfx1).file_handle = fp;
         if !fp.is_null()
-            && call_gfx_load_dir(gfx1 as *mut u8, crate::render::gfx_dir::gfx_load_dir_addr()) != 0
+            && call_gfx_load_dir(
+                gfx1 as *mut u8,
+                crate::render::sprite::gfx_dir::gfx_load_dir_addr(),
+            ) != 0
         {
             gfx_loaded_idx = i as u32;
             break;
@@ -505,7 +508,7 @@ unsafe fn init_graphics_and_resources(
 
         let fp = fopen(gfx_c_path.as_ptr().cast(), c"rb".as_ptr());
         (*gfx2).file_handle = fp;
-        let load_addr = crate::render::gfx_dir::gfx_load_dir_addr();
+        let load_addr = crate::render::sprite::gfx_dir::gfx_load_dir_addr();
         if fp.is_null() || call_gfx_load_dir(gfx2 as *mut u8, load_addr) == 0 {
             let fp2 = fopen(c"data\\Gfx\\Gfx.dir".as_ptr(), c"rb".as_ptr());
             (*gfx2).file_handle = fp2;

crates/openwa-core/src/engine/ddgame_load_fonts.rs

@@ -6,8 +6,8 @@
 use core::ffi::c_char;
 use heapless::CString;
 
-use crate::display::gfx::DisplayGfx;
 use crate::engine::ddgame_wrapper::DDGameWrapper;
+use crate::render::display::gfx::DisplayGfx;
 
 /// Total number of font slots loaded (1-based, so slots 1..=28).
 const FONT_COUNT: u32 = 0x1C;

crates/openwa-core/src/engine/ddgame_wrapper.rs

@@ -1,7 +1,7 @@
 use crate::audio::dssound::DSSound;
-use crate::display::gfx::DisplayGfx;
 use crate::engine::ddgame::DDGame;
 use crate::engine::net_bridge::NetBridge;
+use crate::render::display::gfx::DisplayGfx;
 use crate::render::landscape::PCLandscape;
 use crate::FieldRegistry;
 

crates/openwa-core/src/engine/game_session.rs

@@ -1,8 +1,8 @@
 use crate::audio::dssound::DSSound;
 use crate::audio::music::Music;
-use crate::display::palette::Palette;
 use crate::engine::ddgame_wrapper::DDGameWrapper;
 use crate::input::keyboard::DDKeyboard;
+use crate::render::display::palette::Palette;
 use crate::FieldRegistry;
 
 /// Top-level game session context, allocated once per game run.

crates/openwa-core/src/lib.rs

@@ -30,7 +30,6 @@ pub mod macros;
 
 pub mod audio;
 pub mod bitgrid;
-pub mod display;
 pub mod engine;
 pub mod frontend;
 pub mod game;

crates/openwa-core/src/registry.rs

@@ -780,7 +780,7 @@ mod tests {
     fn vtable_size_assertion() {
         // PaletteVtable should be 5 * 4 = 20 bytes
         assert_eq!(
-            core::mem::size_of::<crate::display::palette::PaletteVtable>(),
+            core::mem::size_of::<crate::render::display::palette::PaletteVtable>(),
             5 * core::mem::size_of::<usize>()
         );
     }

crates/openwa-core/src/render/ddraw/mod.rs

@@ -0,0 +1,3 @@
+pub mod compat_renderer;
+
+pub use compat_renderer::CompatRenderer;

crates/openwa-core/src/{display → render/display}/gfx.rs

@@ -1,5 +1,5 @@
 use super::base::DisplayBase;
-use super::display_vtable::DisplayVtable;
+use super::vtable::DisplayVtable;
 use crate::bitgrid::DisplayBitGrid;
 use core::ffi::c_void;
 

crates/openwa-core/src/{display → render/display}/gradient.rs

@@ -9,7 +9,7 @@ use crate::address::va;
 use crate::bitgrid::{BitGrid, BitGridBaseVtable};
 use crate::engine::ddgame::DDGame;
 use crate::rebase::rb;
-use crate::render::gfx_dir::call_gfx_find_and_load;
+use crate::render::sprite::gfx_dir::call_gfx_find_and_load;
 use crate::wa_alloc::{wa_free, wa_malloc};
 
 /// Palette context for gradient color mapping.

crates/openwa-core/src/{display → render/display}/mod.rs

@@ -1,18 +1,14 @@
 pub mod base;
-pub mod compat_renderer;
-pub mod display_vtable;
+pub mod context;
 pub mod gfx;
 pub mod gradient;
 pub mod line_draw;
-pub mod opengl;
 pub mod palette;
-pub mod render_context;
 pub mod sprite_blit;
+pub mod vtable;
 
 pub use base::{DisplayBase, DisplayBaseVtable, SpriteBufferCtrl, SpriteCache};
-pub use compat_renderer::CompatRenderer;
-pub use display_vtable::{DisplayVtable, DrawScaledSpriteResult};
+pub use context::{FastcallResult, RenderContext};
 pub use gfx::DisplayGfx;
-pub use opengl::OpenGLState;
 pub use palette::{Palette, PaletteVtable};
-pub use render_context::{FastcallResult, RenderContext};
+pub use vtable::{DisplayVtable, DrawScaledSpriteResult};

crates/openwa-core/src/{display/display_vtable.rs → render/display/vtable.rs}

@@ -1,5 +1,5 @@
-use crate::display::line_draw::Vertex;
 use crate::fixed::Fixed;
+use crate::render::display::line_draw::Vertex;
 
 /// DisplayVtable — vtable for the display/rendering subsystem (DisplayGfx).
 ///
@@ -310,7 +310,7 @@ pub unsafe extern "thiscall" fn get_dimensions(
     *out_h = (*this).base.display_height;
 }
 
-use super::render_context::{FastcallResult, RenderContext};
+use super::context::{FastcallResult, RenderContext};
 use crate::address::va;
 use crate::rebase::rb;
 

crates/openwa-core/src/render/mod.rs

@@ -1,19 +1,24 @@
-pub mod gfx_dir;
+pub mod ddraw;
+pub mod display;
 pub mod landscape;
+pub mod opengl;
 pub mod palette;
 pub mod queue;
-pub mod spr;
 pub mod sprite;
-pub mod sprite_id;
 pub mod turn_order;
 
+pub use ddraw::CompatRenderer;
+pub use display::{
+    DisplayBase, DisplayBaseVtable, DisplayGfx, DisplayVtable, DrawScaledSpriteResult,
+    FastcallResult, Palette, PaletteVtable, RenderContext, SpriteBufferCtrl, SpriteCache,
+};
 pub use landscape::{DirtyRect, PCLandscape};
+pub use opengl::OpenGLState;
 pub use queue::{
     DrawBitmapGlobalCmd, DrawCrosshairCmd, DrawLineStripHeader, DrawPixelCmd, DrawPolygonHeader,
     DrawRectCmd, DrawSpriteCmd, DrawSpriteOffsetCmd, DrawTextboxLocalCmd, RenderQueue,
 };
-pub use spr::{ParsedSprite, SprError, SprHeader};
-pub use sprite::{Sprite, SpriteFrame, SpriteId};
+pub use sprite::{ParsedSprite, Sprite, SpriteBank, SpriteFrame, SpriteId};
 pub use turn_order::{
     AnimatedItemList, TurnOrderAllianceGroup, TurnOrderTeamEntry, TurnOrderWidget,
 };

crates/openwa-core/src/render/sprite/mod.rs

@@ -0,0 +1,7 @@
+pub mod gfx_dir;
+pub mod spr;
+pub mod sprite;
+pub mod sprite_id;
+
+pub use spr::{ParsedSprite, SprError, SprHeader};
+pub use sprite::{Sprite, SpriteBank, SpriteFrame, SpriteId};