From 645880655ad5535e6e72ceabe98317f1adb640d9 Mon Sep 17 00:00:00 2001 From: AR Date: Tue, 7 Apr 2026 20:20:21 +0500 Subject: [PATCH 01/41] Start workin' on RHI Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .gitmodules | 3 + CMakeLists.txt | 42 +++- CMakePresets.json | 1 - cmake/Compiler.cmake | 6 - engine/native/CMakeLists.txt | 4 +- engine/native/core/CMakeLists.txt | 4 +- engine/native/core/filesystem/filesystem.cpp | 36 ++++ engine/native/core/filesystem/filesystem.cppm | 9 + engine/native/main/main.cpp | 133 ++++++++++++ engine/native/rendering/CMakeLists.txt | 3 + engine/native/rendering/rhi/rhi.cppm | 46 ++++ engine/native/rendering/rhi/rhi_bgfx.cpp | 196 ++++++++++++++++++ engine/native/rendering/rhi/vertex.cppm | 16 ++ engine/native/rendering/shaders/fs.sc | 8 + .../native/rendering/shaders/fs_triangle.bin | Bin 0 -> 406 bytes .../native/rendering/shaders/varying.def.sc | 4 + engine/native/rendering/shaders/vs.sc | 12 ++ .../native/rendering/shaders/vs_triangle.bin | Bin 0 -> 1060 bytes engine/native/thirdparty/CMakeLists.txt | 24 ++- engine/native/thirdparty/bx | 2 +- engine/native/thirdparty/sdl | 1 + 21 files changed, 536 insertions(+), 14 deletions(-) create mode 100644 engine/native/core/filesystem/filesystem.cpp create mode 100644 engine/native/core/filesystem/filesystem.cppm create mode 100644 engine/native/main/main.cpp create mode 100644 engine/native/rendering/CMakeLists.txt create mode 100644 engine/native/rendering/rhi/rhi.cppm create mode 100644 engine/native/rendering/rhi/rhi_bgfx.cpp create mode 100644 engine/native/rendering/rhi/vertex.cppm create mode 100644 engine/native/rendering/shaders/fs.sc create mode 100644 engine/native/rendering/shaders/fs_triangle.bin create mode 100644 engine/native/rendering/shaders/varying.def.sc create mode 100644 engine/native/rendering/shaders/vs.sc create mode 100644 engine/native/rendering/shaders/vs_triangle.bin create mode 160000 engine/native/thirdparty/sdl diff --git a/.gitmodules b/.gitmodules index 5a54242..8886501 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "engine/native/thirdparty/bgfx"] path = engine/native/thirdparty/bgfx url = https://github.com/bkaradzic/bgfx +[submodule "engine/native/thirdparty/sdl"] + path = engine/native/thirdparty/sdl + url = https://github.com/libsdl-org/SDL diff --git a/CMakeLists.txt b/CMakeLists.txt index 2394fcf..06ddf1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,13 +25,53 @@ endif() project(DraconicEngine LANGUAGES C CXX) +# Ensure that everyone is on the same page hardware wise or else we get errors +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + add_compile_options(-mavx2 -mfma) +endif() + # Only have safe global rules here set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_MODULE_STD ON) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) # bgfx & deps give error if this isn't set, this is a temp workaround +# Force all to use Clang or else a mismatch occurs +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi") list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") include(CTest) -add_subdirectory(engine/native) \ No newline at end of file +add_subdirectory(engine/native) + +find_package(PkgConfig REQUIRED) +pkg_check_modules(X11_LIBS REQUIRED IMPORTED_TARGET x11 xext xcursor xrandr xrender xi xfixes) + +add_executable(draconic engine/native/main/main.cpp) +enable_modules(draconic) +target_link_libraries(draconic + PRIVATE + rhi + core + bgfx + bx + bimg + -Wl,--whole-archive SDL3::SDL3-static -Wl,--no-whole-archive + c++ + c++abi + PkgConfig::X11_LIBS + dl + pthread + m +) + +# Shader copying +set(ENGINE_SHADER_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") +add_custom_command( + TARGET draconic POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + "${ENGINE_SHADER_DIR}" + "$" + COMMENT "Copying shaders to build directory..." +) \ No newline at end of file diff --git a/CMakePresets.json b/CMakePresets.json index a705021..2e862ad 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -21,7 +21,6 @@ "CMAKE_CXX_STANDARD": "23", "CMAKE_CXX_STANDARD_REQUIRED": "ON", "CMAKE_CXX_EXTENSIONS": "OFF", - "CMAKE_CXX_MODULE_STD": "1", "CMAKE_CXX_FLAGS_INIT": "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" } }, diff --git a/cmake/Compiler.cmake b/cmake/Compiler.cmake index e79ec50..4525885 100644 --- a/cmake/Compiler.cmake +++ b/cmake/Compiler.cmake @@ -15,12 +15,6 @@ else() add_compile_definitions(DEBUG) endif() -# Force Clang to use libc++ -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-stdlib=libc++) - add_link_options(-stdlib=libc++) -endif() - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64") # TODO: Make SIMD level configurable or detect at runtime diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index ea1c43b..029922d 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -4,4 +4,6 @@ include(Modules) add_subdirectory(thirdparty) add_modules_library(core SHARED) -target_link_libraries(core PUBLIC definitions math) +target_link_libraries(core PUBLIC definitions math filesystem) + +add_subdirectory(rendering) \ No newline at end of file diff --git a/engine/native/core/CMakeLists.txt b/engine/native/core/CMakeLists.txt index 4474e10..10b5b52 100644 --- a/engine/native/core/CMakeLists.txt +++ b/engine/native/core/CMakeLists.txt @@ -1,3 +1,5 @@ add_modules_library(definitions) add_modules_library(math) -target_link_libraries(math PUBLIC definitions) \ No newline at end of file +add_modules_library(filesystem) +target_link_libraries(math PUBLIC definitions) +target_link_libraries(filesystem PUBLIC definitions) \ No newline at end of file diff --git a/engine/native/core/filesystem/filesystem.cpp b/engine/native/core/filesystem/filesystem.cpp new file mode 100644 index 0000000..acc7ce5 --- /dev/null +++ b/engine/native/core/filesystem/filesystem.cpp @@ -0,0 +1,36 @@ +module; + +import std; + +module core.filesystem; + +namespace draco::filesystem +{ + std::vector load_binary(const std::string& path) + { + // Open at the end (ate) to get size and in binary mode + std::ifstream file(path, std::ios::binary | std::ios::ate); + + if (!file.is_open()) { + std::println("Error: Could not open file at: {}", path); + // Return an empty vector + return {}; + } + + std::streamsize size = file.tellg(); + if (size <= 0) { + std::println("Error: File is empty or unreadable: {}", path); + return {}; + } + + file.seekg(0, std::ios::beg); + + std::vector buffer(static_cast(size)); + if (file.read(reinterpret_cast(buffer.data()), size)) { + return buffer; + } + + std::println("Error: Failed to read file contents: {}", path); + return {}; + } +} \ No newline at end of file diff --git a/engine/native/core/filesystem/filesystem.cppm b/engine/native/core/filesystem/filesystem.cppm new file mode 100644 index 0000000..2b07eff --- /dev/null +++ b/engine/native/core/filesystem/filesystem.cppm @@ -0,0 +1,9 @@ +export module core.filesystem; + +import std; + +export namespace draco::filesystem +{ + // Returns a buffer of the file data + std::vector load_binary(const std::string& path); +} diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp new file mode 100644 index 0000000..254b800 --- /dev/null +++ b/engine/native/main/main.cpp @@ -0,0 +1,133 @@ +import std; + +#include +#include +#include + +import core.filesystem; + +import rendering.rhi; +import rendering.rhi.vertex; + +int main(int argc, char* argv[]) +{ + if (!SDL_Init(SDL_INIT_VIDEO)) { + std::println("SDL init failed: {}", SDL_GetError()); + return -1; + } + + SDL_Window* window = SDL_CreateWindow( + "Draconic Engine", + 1280, 720, + SDL_WINDOW_RESIZABLE + ); + + if (!window) { + std::println("Failed to create window: {}", SDL_GetError()); + return -1; + } + + const char* driver = SDL_GetCurrentVideoDriver(); + std::println("Driver: {}", driver ? driver : "Unknown"); + + void* nwh = nullptr; // Native window handle + void* ndt = nullptr; // Native display type + +#if defined(__linux__) + + SDL_PropertiesID props = SDL_GetWindowProperties(window); + + if (driver && std::string_view(driver) == "x11") + { + ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_X11_DISPLAY_POINTER, nullptr); // Get the X11 display pointer + nwh = (void*)(uintptr_t)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0); // Get the X11 window number and cast it to a pointer + } + +#endif + + if (!nwh) { + std::println("Failed to get native window handle"); + return -1; + } + + if(!ndt) { + std::println("Failed to get native display type"); + return -1; + } + + // Init the RHI with the native window handle and initial size + if (!draco::rhi::init(ndt, nwh, 1280, 720)) { + std::println("Failed to initialize RHI"); + SDL_DestroyWindow(window); + SDL_Quit(); + return -1; + } + + // Geometry data for a triangle to test rendering + // It includes both positions & colors + draco::rhi::PosColorVertex triangle[] = { + { 0.0f, 0.5f, 0.0f, 0xff0000ff }, + { 0.5f, -0.5f, 0.0f, 0xff00ff00 }, + { -0.5f, -0.5f, 0.0f, 0xffff0000} + }; + + auto vbh = draco::rhi::create_vertex_buffer(triangle, sizeof(triangle)); + + // Load the vertex & fragment shaders + auto vs_data = draco::filesystem::load_binary("vs_triangle.bin"); + auto fs_data = draco::filesystem::load_binary("fs_triangle.bin"); + + // If the path is empty, return an error + if (vs_data.empty() || fs_data.empty()) { + std::println("Failed to load shaders"); + std::println("Workin' dir: {}", std::filesystem::current_path().string()); + return -1; + } + + auto vsh = draco::rhi::create_shader(vs_data.data(), (uint32_t)vs_data.size()); + auto fsh = draco::rhi::create_shader(fs_data.data(), (uint32_t)fs_data.size()); + + + // TODO: Expose our own macros for the state flags instead of using bgfx's directly, tis is just for testin' + auto pipeline = draco::rhi::create_pipeline({vsh, fsh, (0 + | BGFX_STATE_WRITE_RGB + | BGFX_STATE_WRITE_A + | BGFX_STATE_MSAA + | BGFX_STATE_PT_TRISTRIP)}); + + bool running = true; + + while (running) + { + SDL_Event event; + while (SDL_PollEvent(&event)) + { + if (event.type == SDL_EVENT_QUIT) + running = false; + } + + int w, h; + SDL_GetWindowSize(window, &w, &h); + + draco::rhi::resize(uint16_t(w), uint16_t(h)); + + draco::rhi::begin_frame(); + + draco::rhi::RenderPacket packet{}; + packet.vertex_buffer = vbh; + packet.pipeline = pipeline; + bx::mtxIdentity(packet.model); + + draco::rhi::submit(packet, 0); + + draco::rhi::end_frame(); + } + + draco::rhi::shutdown(); + + SDL_DestroyWindow(window); + SDL_Quit(); + return 0; +} + +// Fun fact: AR literally went mad & tis is the result \ No newline at end of file diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt new file mode 100644 index 0000000..ff421b0 --- /dev/null +++ b/engine/native/rendering/CMakeLists.txt @@ -0,0 +1,3 @@ +add_modules_library(rhi SHARED) +target_sources(rhi PRIVATE rhi/rhi_bgfx.cpp rhi/vertex.cppm) +target_link_libraries(rhi PUBLIC core bgfx bx) diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm new file mode 100644 index 0000000..faeb3e3 --- /dev/null +++ b/engine/native/rendering/rhi/rhi.cppm @@ -0,0 +1,46 @@ +export module rendering.rhi; + +#include + +export namespace draco::rhi +{ + using BufferHandle = uint16_t; + using PipelineHandle = uint16_t; + using ShaderHandle = uint16_t; + using ViewID = uint16_t; + + struct RenderPacket + { + uint64_t sort_key; + + BufferHandle vertex_buffer; + BufferHandle index_buffer; + PipelineHandle pipeline; + + float model[16]; + uint32_t draw_tags; + }; + + struct PipelineDesc + { + ShaderHandle vs; + ShaderHandle fs; + uint64_t state; + }; + + bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height); + void shutdown(); + + void resize(uint16_t width, uint16_t height); + + ShaderHandle create_shader(const void* data, uint32_t size); + PipelineHandle create_pipeline(const PipelineDesc&); + + BufferHandle create_vertex_buffer(const void* data, uint32_t size); + BufferHandle create_index_buffer(const void* data, uint32_t size); + + void submit(const RenderPacket&, ViewID); + + void begin_frame(); + void end_frame(); +} \ No newline at end of file diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp new file mode 100644 index 0000000..2eb614b --- /dev/null +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -0,0 +1,196 @@ +module; + +import std; + +#include +#include +#include + +module rendering.rhi; + +namespace draco::rhi +{ + struct Buffer + { + bgfx::VertexBufferHandle vbh = BGFX_INVALID_HANDLE; // Stores vertex data, but it can be null if this buffer is an index buffer + bgfx::IndexBufferHandle ibh = BGFX_INVALID_HANDLE; // Stores index data, but it can be null if this buffer is a vertex buffer + bool is_index = false; // Allows us to know which type of buffer this is without needing to check the handles + }; + + struct Pipeline + { + bgfx::ProgramHandle program = BGFX_INVALID_HANDLE; + uint64_t state = 0; + }; + + static std::vector g_buffers; + static std::vector g_pipelines; + + static uint16_t g_width = 0; + static uint16_t g_height = 0; + + bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height) + { + g_width = width; + g_height = height; + + bgfx::Init init{}; + // TODO: Replace this + init.type = bgfx::RendererType::Count; // Auto-selects the renderer + + // Pass the handles directly into the init struct + // So, ndt is the native display type & nwh is the native window handle + init.platformData.ndt = display_type; + init.platformData.nwh = window_handle; + + init.resolution.width = width; + init.resolution.height = height; + init.resolution.reset = BGFX_RESET_VSYNC; + + if (!bgfx::init(init)) { + std::println("bgfx failed to init!"); + return false; + } + + bgfx::setDebug(BGFX_DEBUG_TEXT); + bgfx::setViewClear(0, + BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, + 0x303030ff, 1.0f, 0); + + return true; + } + + void shutdown() + { + for (auto& b : g_buffers) + { + // Destroy the buffers + if (bgfx::isValid(b.vbh)) bgfx::destroy(b.vbh); + if (bgfx::isValid(b.ibh)) bgfx::destroy(b.ibh); + } + + for (auto& p : g_pipelines) + { + // Destroy the pipeline + if (bgfx::isValid(p.program)) bgfx::destroy(p.program); + } + + // Clear everything so we don't have dangling handles + g_buffers.clear(); + g_pipelines.clear(); + + // Have bgfx destroy the context and everything it holds internally + bgfx::shutdown(); + } + + void resize(uint16_t width, uint16_t height) + { + if(width == 0 || height == 0) + return; // Minimized window safety + + if(width == g_width && height == g_height) + return; // No need to resize + + g_width = width; + g_height = height; + + bgfx::reset(width, height, BGFX_RESET_VSYNC); + } + + ShaderHandle create_shader(const void* data, uint32_t size) + { + const bgfx::Memory* mem = bgfx::copy(data, size); + return bgfx::createShader(mem).idx; + } + + PipelineHandle create_pipeline(const PipelineDesc& desc) + { + bgfx::ShaderHandle vs{ desc.vs }; + bgfx::ShaderHandle fs{ desc.fs }; + + bgfx::ProgramHandle prog = bgfx::createProgram(vs, fs, true); + + g_pipelines.push_back({ prog, desc.state }); + return (PipelineHandle)(g_pipelines.size() - 1); + } + + BufferHandle create_vertex_buffer(const void* data, uint32_t size) + { + bgfx::VertexLayout layout; + layout.begin() + .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) + .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) + .end(); + + bgfx::VertexBufferHandle vbh = bgfx::createVertexBuffer( + bgfx::copy(data, size), + layout + ); + + g_buffers.push_back({ vbh, BGFX_INVALID_HANDLE, false }); + return (BufferHandle)(g_buffers.size() - 1); + } + + BufferHandle create_index_buffer(const void* data, uint32_t size) + { + bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer( + bgfx::copy(data, size) + ); + + g_buffers.push_back({ BGFX_INVALID_HANDLE, ibh, true }); + return (BufferHandle)(g_buffers.size() - 1); + } + + void submit(const RenderPacket& p, ViewID view) + { + if (p.pipeline >= g_pipelines.size() || p.vertex_buffer >= g_buffers.size()) { + std::println("Error: Invalid handle in RenderPacket"); + return; + } + Pipeline& pipe = g_pipelines[p.pipeline]; + Buffer& vb = g_buffers[p.vertex_buffer]; + + bgfx::setTransform(p.model); + bgfx::setVertexBuffer(0, vb.vbh); + + if (p.index_buffer != UINT16_MAX) + { + if (p.index_buffer >= g_buffers.size()) { + std::println("Error: Invalid index buffer handle in RenderPacket"); + return; + } + Buffer& ib = g_buffers[p.index_buffer]; + if (ib.is_index) + bgfx::setIndexBuffer(ib.ibh); + } + + bgfx::setState(pipe.state); + bgfx::submit(view, pipe.program); + } + + void begin_frame() + { + bgfx::setViewRect(0, 0, 0, g_width, g_height); + + float view[16]; + bx::mtxIdentity(view); + + float proj[16]; + bx::mtxOrtho( + proj, + -1.0f, 1.0f, + -1.0f, 1.0f, + 0.0f, 100.0f, + 0.0f, + false + ); + + bgfx::setViewTransform(0, view, proj); + bgfx::touch(0); + } + + void end_frame() + { + bgfx::frame(); + } +} \ No newline at end of file diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/native/rendering/rhi/vertex.cppm new file mode 100644 index 0000000..d2a7169 --- /dev/null +++ b/engine/native/rendering/rhi/vertex.cppm @@ -0,0 +1,16 @@ +module; +#include + +export module rendering.rhi.vertex; + +import std; + + +export namespace draco::rhi +{ + struct PosColorVertex + { + float x, y, z; // Position + uint32_t agbr; // Color, stored as AGBR + }; +} \ No newline at end of file diff --git a/engine/native/rendering/shaders/fs.sc b/engine/native/rendering/shaders/fs.sc new file mode 100644 index 0000000..bd617f6 --- /dev/null +++ b/engine/native/rendering/shaders/fs.sc @@ -0,0 +1,8 @@ +// This is only for testing purposes + +$input v_color0 +#include + +void main() { + gl_FragColor = v_color0; +} \ No newline at end of file diff --git a/engine/native/rendering/shaders/fs_triangle.bin b/engine/native/rendering/shaders/fs_triangle.bin new file mode 100644 index 0000000000000000000000000000000000000000..c431f50497b9a536b7c272bcdadcbee7052d6871 GIT binary patch literal 406 zcmYjMO$z~06g_5)nNmJd?Brw1WPy}e$w%4E56~b|J_^aw-rw;5Y%FY)a~{g8`|dsG zo_o)G{a_fsUGF29bBO@9Rd#_0;_%>qXry700lApTgK;qS568J*Z`347z&1*0l5i1a zR&2u6R*e#)%1BWso(8OJILr?YIb{F!4jIjyCbQjow>KURy|rVyT%0HUeYos}$B>-? zC#B6ZbcCh*;SAqy5f_akOr2#NBUfPLsP~wK^@aj(&FU}W+g~gXaq3r?_2XY(Sf1jV ge7pR#OGn(3jQ-jotC=!G`?~CEPWZ*`E#m;Z0bz0+u>b%7 literal 0 HcmV?d00001 diff --git a/engine/native/rendering/shaders/varying.def.sc b/engine/native/rendering/shaders/varying.def.sc new file mode 100644 index 0000000..daefc49 --- /dev/null +++ b/engine/native/rendering/shaders/varying.def.sc @@ -0,0 +1,4 @@ +vec3 a_position : POSITION; +vec4 a_color0 : COLOR0; + +vec4 v_color0 : COLOR0; \ No newline at end of file diff --git a/engine/native/rendering/shaders/vs.sc b/engine/native/rendering/shaders/vs.sc new file mode 100644 index 0000000..99ee80a --- /dev/null +++ b/engine/native/rendering/shaders/vs.sc @@ -0,0 +1,12 @@ +// This is only for testing purposes + +$input a_position, a_color0 +$output v_color0 + +#include + +void main() +{ + gl_Position = mul(u_modelViewProj, vec4(a_position, 1.0)); + v_color0 = a_color0; +} \ No newline at end of file diff --git a/engine/native/rendering/shaders/vs_triangle.bin b/engine/native/rendering/shaders/vs_triangle.bin new file mode 100644 index 0000000000000000000000000000000000000000..0d610ec8fe807767f4d3ed354021d7eea82b1c90 GIT binary patch literal 1060 zcmZXSPft@(5XGl04+Ii{5QGKbLzY0nL=8qnaMO~ISVJg(G-(!-_FYWH_7BAD&;)|DSggiD~)FNighP_Y5Ry}D0 zmSqIKmTkxi`XcRrbsa`1ZnWTx6s>nvXo~=eZ?Oat{(oR2g(~E9eJa5)2y)eZMd(98yzV#}U zR3FWGSy|oSv*@d=3>ns7ZTud$D9kD;njRKB`j4OWVfvcy!}J7Z?%Zd-{-FbA)>-_d z)S+*|Pye6RC-Miy#jrM$zYL8{qTMBqeJ_}6jv`5$PW`t+ulaqY& zVMcJV7<8eB*}Msu{^2-}gP+AO2~(GR#Dkd!9Pz8cM>FSO=98VT%cqa*KA3sI5f5fw z;8%JxbfB9BcO!=X>|3$qSdmd5OwH#q>U~rcbJ!1@wjNgv9GbGYgTPU*qRiwzlyRSU y&Y9`9^2XYaWXy@VQ=9o5%iw=1hWnpn Date: Fri, 10 Apr 2026 17:51:19 +0500 Subject: [PATCH 02/41] Idk how I missed these, they coulda been major security vulnerabilities Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- engine/native/main/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 254b800..3c93da8 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -81,6 +81,9 @@ int main(int argc, char* argv[]) if (vs_data.empty() || fs_data.empty()) { std::println("Failed to load shaders"); std::println("Workin' dir: {}", std::filesystem::current_path().string()); + draco::rhi::shutdown(); + SDL_DestroyWindow(window); + SDL_Quit(); return -1; } @@ -115,6 +118,7 @@ int main(int argc, char* argv[]) draco::rhi::RenderPacket packet{}; packet.vertex_buffer = vbh; + packet.index_buffer = UINT16_MAX; // No index buffer packet.pipeline = pipeline; bx::mtxIdentity(packet.model); From 7b92c6b0ad973ce945bd96cc283b2a5a83add4cc Mon Sep 17 00:00:00 2001 From: AR Date: Mon, 13 Apr 2026 13:51:23 +0500 Subject: [PATCH 03/41] Do what CodeRabbit said & add Wayland support (still doesn't work) --- engine/native/main/main.cpp | 40 +++++++++---- engine/native/rendering/rhi/rhi.cppm | 39 ++++++++++++- engine/native/rendering/rhi/rhi_bgfx.cpp | 71 +++++++++++++++++++++--- 3 files changed, 130 insertions(+), 20 deletions(-) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 3c93da8..08f4a50 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -24,6 +24,8 @@ int main(int argc, char* argv[]) if (!window) { std::println("Failed to create window: {}", SDL_GetError()); + SDL_DestroyWindow(window); + SDL_Quit(); return -1; } @@ -42,16 +44,31 @@ int main(int argc, char* argv[]) ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_X11_DISPLAY_POINTER, nullptr); // Get the X11 display pointer nwh = (void*)(uintptr_t)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0); // Get the X11 window number and cast it to a pointer } + else if (driver && std::string_view(driver) == "wayland") + { + ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_DISPLAY_POINTER, nullptr); // Get the Wayland display pointer + nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_SURFACE_POINTER, nullptr); // Get the Wayland surface pointer + } + else { + std::println("Unsupported video driver: {}", driver); + SDL_DestroyWindow(window); + SDL_Quit(); + return -1; + } #endif if (!nwh) { std::println("Failed to get native window handle"); + SDL_DestroyWindow(window); + SDL_Quit(); return -1; } if(!ndt) { std::println("Failed to get native display type"); + SDL_DestroyWindow(window); + SDL_Quit(); return -1; } @@ -80,7 +97,7 @@ int main(int argc, char* argv[]) // If the path is empty, return an error if (vs_data.empty() || fs_data.empty()) { std::println("Failed to load shaders"); - std::println("Workin' dir: {}", std::filesystem::current_path().string()); + std::println("Working dir: {}", std::filesystem::current_path().string()); draco::rhi::shutdown(); SDL_DestroyWindow(window); SDL_Quit(); @@ -90,13 +107,14 @@ int main(int argc, char* argv[]) auto vsh = draco::rhi::create_shader(vs_data.data(), (uint32_t)vs_data.size()); auto fsh = draco::rhi::create_shader(fs_data.data(), (uint32_t)fs_data.size()); - - // TODO: Expose our own macros for the state flags instead of using bgfx's directly, tis is just for testin' - auto pipeline = draco::rhi::create_pipeline({vsh, fsh, (0 - | BGFX_STATE_WRITE_RGB - | BGFX_STATE_WRITE_A - | BGFX_STATE_MSAA - | BGFX_STATE_PT_TRISTRIP)}); + auto pipeline = draco::rhi::create_pipeline({ + vsh, + fsh, + draco::rhi::PipelineState::WriteRGB | + draco::rhi::PipelineState::WriteAlpha | + draco::rhi::PipelineState::MSAA | + draco::rhi::PipelineState::PrimitiveTriStrip + }); bool running = true; @@ -118,10 +136,12 @@ int main(int argc, char* argv[]) draco::rhi::RenderPacket packet{}; packet.vertex_buffer = vbh; - packet.index_buffer = UINT16_MAX; // No index buffer + packet.index_buffer = draco::rhi::InvalidBuffer; // No index buffer packet.pipeline = pipeline; bx::mtxIdentity(packet.model); + draco::rhi::identity_matrix(packet.model); + draco::rhi::submit(packet, 0); draco::rhi::end_frame(); @@ -133,5 +153,3 @@ int main(int argc, char* argv[]) SDL_Quit(); return 0; } - -// Fun fact: AR literally went mad & tis is the result \ No newline at end of file diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index faeb3e3..4d3212e 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -1,7 +1,11 @@ -export module rendering.rhi; +module; #include +export module rendering.rhi; + +import rendering.rhi.vertex; // For the vertex layout + export namespace draco::rhi { using BufferHandle = uint16_t; @@ -9,6 +13,14 @@ export namespace draco::rhi using ShaderHandle = uint16_t; using ViewID = uint16_t; + enum class PipelineState : uint64_t { + Default = 0, + WriteRGB = 1 << 0, + WriteAlpha = 1 << 1, + MSAA = 1 << 2, + PrimitiveTriStrip = 1 << 3, + }; + struct RenderPacket { uint64_t sort_key; @@ -25,22 +37,45 @@ export namespace draco::rhi { ShaderHandle vs; ShaderHandle fs; - uint64_t state; + PipelineState state; }; + inline constexpr BufferHandle InvalidBuffer = 0xFFFF; + inline constexpr PipelineHandle InvalidPipeline = 0xFFFF; + inline constexpr ShaderHandle InvalidShader = 0xFFFF; + inline constexpr ViewID InvalidView = 0xFFFF; + bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height); void shutdown(); void resize(uint16_t width, uint16_t height); + // Create the shader from the given data & size + // Note: The data should be in the format expected by the underlying graphics API ShaderHandle create_shader(const void* data, uint32_t size); + + // Create a pipeline from the give description PipelineHandle create_pipeline(const PipelineDesc&); + // Create a vertex or index buffer from the given data & size BufferHandle create_vertex_buffer(const void* data, uint32_t size); BufferHandle create_index_buffer(const void* data, uint32_t size); + // Helper function to set a 4x4 matrix to the identity matrix + void identity_matrix(float* _mtx); + + // Submit a render packet to the given view for rendering void submit(const RenderPacket&, ViewID); + // Begin and end the rendering of a frame void begin_frame(); void end_frame(); + + constexpr PipelineState operator|(PipelineState a, PipelineState b) { + return static_cast(static_cast(a) | static_cast(b)); + } + + constexpr bool operator&(PipelineState a, PipelineState b) { + return static_cast(static_cast(a) & static_cast(b)); + } } \ No newline at end of file diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 2eb614b..d5d4e5a 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -20,7 +20,7 @@ namespace draco::rhi struct Pipeline { bgfx::ProgramHandle program = BGFX_INVALID_HANDLE; - uint64_t state = 0; + uint64_t state = 0; // Stored as raw bgfx bitmask }; static std::vector g_buffers; @@ -35,6 +35,7 @@ namespace draco::rhi g_height = height; bgfx::Init init{}; + // TODO: Replace this init.type = bgfx::RendererType::Count; // Auto-selects the renderer @@ -97,25 +98,60 @@ namespace draco::rhi bgfx::reset(width, height, BGFX_RESET_VSYNC); } + uint64_t map_state(PipelineState state) + { + uint64_t bgfx_state = BGFX_STATE_NONE; + if (state & PipelineState::WriteRGB) bgfx_state |= BGFX_STATE_WRITE_RGB; + if (state & PipelineState::WriteAlpha) bgfx_state |= BGFX_STATE_WRITE_A; + if (state & PipelineState::MSAA) bgfx_state |= BGFX_STATE_MSAA; + if (state & PipelineState::PrimitiveTriStrip) bgfx_state |= BGFX_STATE_PT_TRISTRIP; + return bgfx_state; + } + ShaderHandle create_shader(const void* data, uint32_t size) { + // Check the input data before trying to create the shader + // If it's invalid, print an error & return an invalid handle except for crashing + if(!data || size == 0) + { + std::println("Error: Invalid shader data or size"); + return InvalidShader; + } + const bgfx::Memory* mem = bgfx::copy(data, size); return bgfx::createShader(mem).idx; } PipelineHandle create_pipeline(const PipelineDesc& desc) { + // Check the input data before trying to create the pipeline + // If it's invalid, print an error & return an invalid handle except for crashing + if(!desc.vs || !desc.fs) + { + std::println("Error: Invalid shader handles in PipelineDesc"); + return InvalidPipeline; + } + + bgfx::ShaderHandle vs{ desc.vs }; bgfx::ShaderHandle fs{ desc.fs }; bgfx::ProgramHandle prog = bgfx::createProgram(vs, fs, true); - g_pipelines.push_back({ prog, desc.state }); + g_pipelines.push_back({ prog, map_state(desc.state) }); return (PipelineHandle)(g_pipelines.size() - 1); } BufferHandle create_vertex_buffer(const void* data, uint32_t size) { + // Check the input data before trying to create the buffer + // If it's invalid, print an error & return an invalid handle except for crashing + if(!data || size == 0) + { + std::println("Error: Invalid vertex buffer data or size"); + return InvalidBuffer; + } + bgfx::VertexLayout layout; layout.begin() .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) @@ -133,6 +169,14 @@ namespace draco::rhi BufferHandle create_index_buffer(const void* data, uint32_t size) { + // Check the input data before trying to create the buffer + // If it's invalid, print an error & return an invalid handle except for crashing + if(!data || size == 0) + { + std::println("Error: Invalid index buffer data or size"); + return InvalidBuffer; + } + bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer( bgfx::copy(data, size) ); @@ -141,19 +185,32 @@ namespace draco::rhi return (BufferHandle)(g_buffers.size() - 1); } + void identity_matrix(float* _mtx) + { + bx::mtxIdentity(_mtx); + } + void submit(const RenderPacket& p, ViewID view) { + // Check for null/invalid handles + if (p.pipeline == InvalidPipeline || p.vertex_buffer == InvalidBuffer) { + std::println("Error: Attempted to submit RenderPacket with unitialized handles."); + return; + } + + // Check for out of bounds handles if (p.pipeline >= g_pipelines.size() || p.vertex_buffer >= g_buffers.size()) { - std::println("Error: Invalid handle in RenderPacket"); + std::println("Error: Handle out of bounds! The resource may have been destroyed already or it was never created. Pipeline Handle: {}, Vertex Buffer Handle: {}", p.pipeline, p.vertex_buffer); return; } - Pipeline& pipe = g_pipelines[p.pipeline]; + + Pipeline& pipeline = g_pipelines[p.pipeline]; Buffer& vb = g_buffers[p.vertex_buffer]; bgfx::setTransform(p.model); bgfx::setVertexBuffer(0, vb.vbh); - if (p.index_buffer != UINT16_MAX) + if (p.index_buffer != InvalidBuffer) { if (p.index_buffer >= g_buffers.size()) { std::println("Error: Invalid index buffer handle in RenderPacket"); @@ -164,8 +221,8 @@ namespace draco::rhi bgfx::setIndexBuffer(ib.ibh); } - bgfx::setState(pipe.state); - bgfx::submit(view, pipe.program); + bgfx::setState(pipeline.state); + bgfx::submit(view, pipeline.program); } void begin_frame() From 64c0d2f465348cfee06885ff2c892c6de8079c91 Mon Sep 17 00:00:00 2001 From: AR Date: Mon, 13 Apr 2026 14:02:36 +0500 Subject: [PATCH 04/41] Fix includes --- engine/native/main/main.cpp | 3 --- engine/native/thirdparty/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 08f4a50..7ab4925 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -1,8 +1,6 @@ import std; #include -#include -#include import core.filesystem; @@ -138,7 +136,6 @@ int main(int argc, char* argv[]) packet.vertex_buffer = vbh; packet.index_buffer = draco::rhi::InvalidBuffer; // No index buffer packet.pipeline = pipeline; - bx::mtxIdentity(packet.model); draco::rhi::identity_matrix(packet.model); diff --git a/engine/native/thirdparty/CMakeLists.txt b/engine/native/thirdparty/CMakeLists.txt index b12eaba..4852058 100644 --- a/engine/native/thirdparty/CMakeLists.txt +++ b/engine/native/thirdparty/CMakeLists.txt @@ -19,7 +19,7 @@ set(SDL_STATIC_PIC ON CACHE BOOL "" FORCE) set(SDL_SHARED OFF CACHE BOOL "" FORCE) set(SDL_STATIC ON CACHE BOOL "" FORCE) set(SDL_TEST OFF CACHE BOOL "" FORCE) -set(SDL_WAYLAND OFF CACHE BOOL "" FORCE) +set(SDL_WAYLAND ON CACHE BOOL "" FORCE) set(SDL_LIBDECOR OFF CACHE BOOL "" FORCE) set(SDL_X11 ON CACHE BOOL "" FORCE) set(SDL_X11_XSCRNSAVER OFF CACHE BOOL "" FORCE) From c955c7deebd5e5ca6cc74e9238d46fff9f2d4516 Mon Sep 17 00:00:00 2001 From: AR Date: Mon, 13 Apr 2026 21:52:42 +0500 Subject: [PATCH 05/41] Add uniform management --- engine/native/main/main.cpp | 21 +++++- engine/native/rendering/rhi/rhi.cppm | 34 ++++++++-- engine/native/rendering/rhi/rhi_bgfx.cpp | 61 ++++++++++++++++-- engine/native/rendering/shaders/fs.sc | 7 +- .../native/rendering/shaders/fs_triangle.bin | Bin 406 -> 691 bytes engine/native/rendering/shaders/vs.sc | 9 ++- .../native/rendering/shaders/vs_triangle.bin | Bin 1060 -> 1247 bytes 7 files changed, 114 insertions(+), 18 deletions(-) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 7ab4925..65b1c78 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -114,8 +114,16 @@ int main(int argc, char* argv[]) draco::rhi::PipelineState::PrimitiveTriStrip }); + // Create a uniform for a color tint + auto u_tint = draco::rhi::create_uniform("u_tint", draco::rhi::UniformType::Vec4); + + // Create a uniform for an offset + auto u_offset = draco::rhi::create_uniform("u_offset", draco::rhi::UniformType::Vec4); + bool running = true; + float time = 0.0f; + while (running) { SDL_Event event; @@ -130,15 +138,26 @@ int main(int argc, char* argv[]) draco::rhi::resize(uint16_t(w), uint16_t(h)); + time += 0.01f; + draco::rhi::begin_frame(); + // Prepare uniform data (Must be float arrays for Vec4) + float tint[4] = { 1.0f, 0.5f, 0.2f, 1.0f }; // Warm orange + float offset[4] = { std::sin(time), std::cos(time), 0.0f, 0.0f }; // Circular motion + + // Upload to the RHI (This prepares the state for the next submit) + draco::rhi::set_uniform(u_tint, tint); + draco::rhi::set_uniform(u_offset, offset); + draco::rhi::RenderPacket packet{}; packet.vertex_buffer = vbh; - packet.index_buffer = draco::rhi::InvalidBuffer; // No index buffer + packet.index_buffer = draco::rhi::InvalidBuffer; packet.pipeline = pipeline; draco::rhi::identity_matrix(packet.model); + // Submit uses the currently bound uniforms draco::rhi::submit(packet, 0); draco::rhi::end_frame(); diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 4d3212e..ea40b72 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -11,8 +11,15 @@ export namespace draco::rhi using BufferHandle = uint16_t; using PipelineHandle = uint16_t; using ShaderHandle = uint16_t; + using UniformHandle = uint16_t; using ViewID = uint16_t; + inline constexpr BufferHandle InvalidBuffer = 0xFFFF; + inline constexpr PipelineHandle InvalidPipeline = 0xFFFF; + inline constexpr ShaderHandle InvalidShader = 0xFFFF; + inline constexpr UniformHandle InvalidUniform = 0xFFFF; + inline constexpr ViewID InvalidView = 0xFFFF; + enum class PipelineState : uint64_t { Default = 0, WriteRGB = 1 << 0, @@ -21,6 +28,14 @@ export namespace draco::rhi PrimitiveTriStrip = 1 << 3, }; + enum class UniformType + { + Sampler, // For textures + Vec4, // For colors or simple data + Mat3, // For normal matrices + Mat4, // For transform matrices + }; + struct RenderPacket { uint64_t sort_key; @@ -28,6 +43,9 @@ export namespace draco::rhi BufferHandle vertex_buffer; BufferHandle index_buffer; PipelineHandle pipeline; + UniformHandle uniform_handle = InvalidUniform; + + const void* uniform_data = nullptr; float model[16]; uint32_t draw_tags; @@ -40,11 +58,6 @@ export namespace draco::rhi PipelineState state; }; - inline constexpr BufferHandle InvalidBuffer = 0xFFFF; - inline constexpr PipelineHandle InvalidPipeline = 0xFFFF; - inline constexpr ShaderHandle InvalidShader = 0xFFFF; - inline constexpr ViewID InvalidView = 0xFFFF; - bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height); void shutdown(); @@ -61,6 +74,13 @@ export namespace draco::rhi BufferHandle create_vertex_buffer(const void* data, uint32_t size); BufferHandle create_index_buffer(const void* data, uint32_t size); + // Create a uniform with the given name, type & count + UniformHandle create_uniform(const char* name, UniformType type, uint16_t num = 1); + void destroy_uniform(UniformHandle handle); + + // Set the value of a uniform with the given handle, value & count + void set_uniform(UniformHandle handle, const void* value, uint16_t num = 1); + // Helper function to set a 4x4 matrix to the identity matrix void identity_matrix(float* _mtx); @@ -75,7 +95,7 @@ export namespace draco::rhi return static_cast(static_cast(a) | static_cast(b)); } - constexpr bool operator&(PipelineState a, PipelineState b) { - return static_cast(static_cast(a) & static_cast(b)); + constexpr PipelineState operator&(PipelineState a, PipelineState b) { + return static_cast(static_cast(a) & static_cast(b)); } } \ No newline at end of file diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index d5d4e5a..c7eddc6 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -25,6 +25,7 @@ namespace draco::rhi static std::vector g_buffers; static std::vector g_pipelines; + static std::vector g_uniforms; static uint16_t g_width = 0; static uint16_t g_height = 0; @@ -76,9 +77,16 @@ namespace draco::rhi if (bgfx::isValid(p.program)) bgfx::destroy(p.program); } + for (auto& u : g_uniforms) + { + // Destroy the uniforms + if (bgfx::isValid(u)) bgfx::destroy(u); + } + // Clear everything so we don't have dangling handles g_buffers.clear(); g_pipelines.clear(); + g_uniforms.clear(); // Have bgfx destroy the context and everything it holds internally bgfx::shutdown(); @@ -101,10 +109,12 @@ namespace draco::rhi uint64_t map_state(PipelineState state) { uint64_t bgfx_state = BGFX_STATE_NONE; - if (state & PipelineState::WriteRGB) bgfx_state |= BGFX_STATE_WRITE_RGB; - if (state & PipelineState::WriteAlpha) bgfx_state |= BGFX_STATE_WRITE_A; - if (state & PipelineState::MSAA) bgfx_state |= BGFX_STATE_MSAA; - if (state & PipelineState::PrimitiveTriStrip) bgfx_state |= BGFX_STATE_PT_TRISTRIP; + // Cast to uint64_t so the 'if' can treat it as a boolean check + // Otherwise, the bitwise check would fail since PipelineState is an enum class and doesn't implicitly convert to uint64_t + if (static_cast(state & PipelineState::WriteRGB)) bgfx_state |= BGFX_STATE_WRITE_RGB; + if (static_cast(state & PipelineState::WriteAlpha)) bgfx_state |= BGFX_STATE_WRITE_A; + if (static_cast(state & PipelineState::MSAA)) bgfx_state |= BGFX_STATE_MSAA; + if (static_cast(state & PipelineState::PrimitiveTriStrip)) bgfx_state |= BGFX_STATE_PT_TRISTRIP; return bgfx_state; } @@ -185,6 +195,44 @@ namespace draco::rhi return (BufferHandle)(g_buffers.size() - 1); } + static bgfx::UniformType::Enum map_uniform_type(UniformType type) { + switch (type) { + case UniformType::Sampler: return bgfx::UniformType::Sampler; + case UniformType::Vec4: return bgfx::UniformType::Vec4; + case UniformType::Mat3: return bgfx::UniformType::Mat3; + case UniformType::Mat4: return bgfx::UniformType::Mat4; + } + return bgfx::UniformType::Count; + } + + UniformHandle create_uniform(const char* name, UniformType type, uint16_t num) { + bgfx::UniformHandle handle = bgfx::createUniform(name, map_uniform_type(type), num); + g_uniforms.push_back(handle); + return static_cast(g_uniforms.size() - 1); + } + + void set_uniform(UniformHandle handle, const void* value, uint16_t num) { + // Check for null/invalid handles + if (handle == InvalidUniform) return; + + // Check for out of bound handles + if (handle >= g_uniforms.size()) { + std::println("Error: Uniform handle out of bounds!"); + return; + } + + bgfx::setUniform(g_uniforms[handle], value, num); + } + + void destroy_uniform(UniformHandle handle) { + if (handle < g_uniforms.size() && bgfx::isValid(g_uniforms[handle])) { + bgfx::destroy(g_uniforms[handle]); + // We don't remove from vector to keep indices stable, + // just invalidate the handle + g_uniforms[handle] = BGFX_INVALID_HANDLE; + } + } + void identity_matrix(float* _mtx) { bx::mtxIdentity(_mtx); @@ -221,6 +269,11 @@ namespace draco::rhi bgfx::setIndexBuffer(ib.ibh); } + if (p.uniform_handle != InvalidUniform && p.uniform_handle < g_uniforms.size()) + { + bgfx::setUniform(g_uniforms[p.uniform_handle], p.uniform_data, 1); + } + bgfx::setState(pipeline.state); bgfx::submit(view, pipeline.program); } diff --git a/engine/native/rendering/shaders/fs.sc b/engine/native/rendering/shaders/fs.sc index bd617f6..60a0724 100644 --- a/engine/native/rendering/shaders/fs.sc +++ b/engine/native/rendering/shaders/fs.sc @@ -1,8 +1,9 @@ -// This is only for testing purposes - $input v_color0 #include +uniform vec4 u_tint; + void main() { - gl_FragColor = v_color0; + // Multiply the vertex color by our uniform tint + gl_FragColor = v_color0 * u_tint; } \ No newline at end of file diff --git a/engine/native/rendering/shaders/fs_triangle.bin b/engine/native/rendering/shaders/fs_triangle.bin index c431f50497b9a536b7c272bcdadcbee7052d6871..20f642eaf45cd651417ce0862bd9de127b88c795 100644 GIT binary patch literal 691 zcmYk3K}!N*5Qay$RY52#s#B(U=wL{PlpqRtGm8!^rK17PBA5qqjjj3dUDK9O$H@ zK4$33)?L!A31b~?gl<*Ny;8id90N0}?9c);C&immM!V{6x|p-AJSVOq-%)=-5zO7o z$v$uuG3e0Gj;9G`AGj^yiXxto*ArY-j?vGa)TVj|%BcmT2WEdb>YIwZVtNkdK5#Al zAGFvLgZmZ3`<;oU=TMH`g;-|a$kYFq*4!riyK3m^%jttZmn!q%{ +// Note: For bgfx, uniforms are always vec4 or mat4. +uniform vec4 u_offset; + void main() { - gl_Position = mul(u_modelViewProj, vec4(a_position, 1.0)); + // Add the offset to the local position before transforming + vec3 pos = a_position + u_offset.xyz; + gl_Position = mul(u_modelViewProj, vec4(pos, 1.0)); v_color0 = a_color0; } \ No newline at end of file diff --git a/engine/native/rendering/shaders/vs_triangle.bin b/engine/native/rendering/shaders/vs_triangle.bin index 0d610ec8fe807767f4d3ed354021d7eea82b1c90..a62c9dc976c0c2acca129a1e51a74aa6da0093bb 100644 GIT binary patch literal 1247 zcmZXT%}*0S7{-S!%ZE)wg9>UwmU7@=(ilV}G0G~3)`WyLL~gn*?G_i?4r#X5>s4SDCaLZ9##s@}#AXKFEKSmZ z?PmSsJo}W4?Afg3S$Fb7TP4_-H}b5S1(Q3~n42bWu~jqY_Qt`{L490w>)VeX;&RvzWK344&)4&5bMChB(XnF&kPeG?an4 z)&-X5wJCL+S=TOc=7f_6|5&^GpOl>U;{BJ^F+H!lH#P15j_f&Uk+7n8dWJI#oVO0I z2)D(TwMPQ=9+do6$ydc!WRrvVH9fftuSMc_#pwb4X~~%xjr04ZO%9(wlFfqCOUb+DLy-T*VJZK7TO;v zd;`y0&}kQcw#(zv4& zp(U`q){)&3i1%8z)X0~pV|va6;_>IaCeZJu_MSk$kwCxP`>BBbT|UIW7s!GBT(=Ty UN5kIN&Yk>K7rS&4gnB0CA5z?CPXGV_ literal 1060 zcmZXSPft@(5XGl04+Ii{5QGKbLzY0nL=8qnaMO~ISVJg(G-(!-_FYWH_7BAD&;)|DSggiD~)FNighP_Y5Ry}D0 zmSqIKmTkxi`XcRrbsa`1ZnWTx6s>nvXo~=eZ?Oat{(oR2g(~E9eJa5)2y)eZMd(98yzV#}U zR3FWGSy|oSv*@d=3>ns7ZTud$D9kD;njRKB`j4OWVfvcy!}J7Z?%Zd-{-FbA)>-_d z)S+*|Pye6RC-Miy#jrM$zYL8{qTMBqeJ_}6jv`5$PW`t+ulaqY& zVMcJV7<8eB*}Msu{^2-}gP+AO2~(GR#Dkd!9Pz8cM>FSO=98VT%cqa*KA3sI5f5fw z;8%JxbfB9BcO!=X>|3$qSdmd5OwH#q>U~rcbJ!1@wjNgv9GbGYgTPU*qRiwzlyRSU y&Y9`9^2XYaWXy@VQ=9o5%iw=1hWnpn Date: Wed, 15 Apr 2026 15:24:59 +0500 Subject: [PATCH 06/41] Add texture loadin' support --- CMakeLists.txt | 2 + engine/native/CMakeLists.txt | 2 +- engine/native/core/CMakeLists.txt | 23 +- .../core/{filesystem => io}/filesystem.cpp | 4 +- .../core/{filesystem => io}/filesystem.cppm | 4 +- engine/native/core/io/image_loader.cpp | 46 + engine/native/core/io/image_loader.cppm | 23 + engine/native/main/main.cpp | 46 +- engine/native/rendering/rhi/rhi.cppm | 15 +- engine/native/rendering/rhi/rhi_bgfx.cpp | 54 +- engine/native/rendering/rhi/vertex.cppm | 7 + engine/native/rendering/shaders/fs.sc | 8 +- .../native/rendering/shaders/fs_triangle.bin | Bin 691 -> 1148 bytes .../native/rendering/shaders/varying.def.sc | 4 +- engine/native/rendering/shaders/vs.sc | 8 +- .../native/rendering/shaders/vs_triangle.bin | Bin 1247 -> 1457 bytes engine/native/thirdparty/CMakeLists.txt | 4 +- engine/native/thirdparty/bgfx | 2 +- engine/native/thirdparty/sdl | 2 +- engine/native/thirdparty/stb/CMakeLists.txt | 2 + engine/native/thirdparty/stb/stb_image.h | 7988 +++++++++++++++++ 21 files changed, 8204 insertions(+), 40 deletions(-) rename engine/native/core/{filesystem => io}/filesystem.cpp (93%) rename engine/native/core/{filesystem => io}/filesystem.cppm (61%) create mode 100644 engine/native/core/io/image_loader.cpp create mode 100644 engine/native/core/io/image_loader.cppm create mode 100644 engine/native/thirdparty/stb/CMakeLists.txt create mode 100644 engine/native/thirdparty/stb/stb_image.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 06ddf1f..66a3c95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,8 @@ target_link_libraries(draconic PRIVATE rhi core + io + image_loader bgfx bx bimg diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index 029922d..f9abc9a 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -4,6 +4,6 @@ include(Modules) add_subdirectory(thirdparty) add_modules_library(core SHARED) -target_link_libraries(core PUBLIC definitions math filesystem) +target_link_libraries(core PUBLIC definitions math io) add_subdirectory(rendering) \ No newline at end of file diff --git a/engine/native/core/CMakeLists.txt b/engine/native/core/CMakeLists.txt index 10b5b52..83e45a6 100644 --- a/engine/native/core/CMakeLists.txt +++ b/engine/native/core/CMakeLists.txt @@ -1,5 +1,24 @@ add_modules_library(definitions) add_modules_library(math) -add_modules_library(filesystem) +add_modules_library(io) + target_link_libraries(math PUBLIC definitions) -target_link_libraries(filesystem PUBLIC definitions) \ No newline at end of file +target_link_libraries(io PUBLIC definitions stb_image) + +add_library(image_loader SHARED) + +target_sources(image_loader + PUBLIC + FILE_SET CXX_MODULES FILES + io/image_loader.cppm +) + +target_sources(image_loader + PRIVATE + io/image_loader.cpp +) + +target_link_libraries(image_loader + PRIVATE + stb_image +) \ No newline at end of file diff --git a/engine/native/core/filesystem/filesystem.cpp b/engine/native/core/io/filesystem.cpp similarity index 93% rename from engine/native/core/filesystem/filesystem.cpp rename to engine/native/core/io/filesystem.cpp index acc7ce5..427fcb3 100644 --- a/engine/native/core/filesystem/filesystem.cpp +++ b/engine/native/core/io/filesystem.cpp @@ -2,9 +2,9 @@ module; import std; -module core.filesystem; +module core.io.filesystem; -namespace draco::filesystem +namespace draco::core::io::filesystem { std::vector load_binary(const std::string& path) { diff --git a/engine/native/core/filesystem/filesystem.cppm b/engine/native/core/io/filesystem.cppm similarity index 61% rename from engine/native/core/filesystem/filesystem.cppm rename to engine/native/core/io/filesystem.cppm index 2b07eff..7814695 100644 --- a/engine/native/core/filesystem/filesystem.cppm +++ b/engine/native/core/io/filesystem.cppm @@ -1,8 +1,8 @@ -export module core.filesystem; +export module core.io.filesystem; import std; -export namespace draco::filesystem +export namespace draco::core::io::filesystem { // Returns a buffer of the file data std::vector load_binary(const std::string& path); diff --git a/engine/native/core/io/image_loader.cpp b/engine/native/core/io/image_loader.cpp new file mode 100644 index 0000000..9345ce7 --- /dev/null +++ b/engine/native/core/io/image_loader.cpp @@ -0,0 +1,46 @@ +module; + +#define STB_IMAGE_IMPLEMENTATION +#include + +#include + +module core.io.image_loader; + +// TODO: I'm too lazy to write code so we need somethin' better + +namespace draco::core::io::image_loader +{ + ImageData load_image(const std::filesystem::path& path) + { + ImageData result; + + if (!std::filesystem::exists(path)) { + std::println("Error: Image path does not exist: {}", path.string()); + return result; + } + + int width, height, channels; + // STBI_rgb_alpha forces the output to be 4 bytes per pixel (RGBA) + unsigned char* data = stbi_load(path.string().c_str(), &width, &height, &channels, STBI_rgb_alpha); + + if (!data) { + std::println("Error: Failed to decode image: {}", path.string()); + return result; + } + + // Calculate the total size: width * height * 4 (RGBA) + size_t size = static_cast(width) * height * 4; + + result.pixels.assign(data, data + size); + result.width = static_cast(width); + result.height = static_cast(height); + result.channels = 4; + result.is_valid = true; + + // Free the memory allocated by stb + stbi_image_free(data); + + return result; + } +} \ No newline at end of file diff --git a/engine/native/core/io/image_loader.cppm b/engine/native/core/io/image_loader.cppm new file mode 100644 index 0000000..6f72dd7 --- /dev/null +++ b/engine/native/core/io/image_loader.cppm @@ -0,0 +1,23 @@ +module; + +#include +#include + +export module core.io.image_loader; + +import std; + +export namespace draco::core::io::image_loader +{ + struct ImageData + { + std::vector pixels; + uint16_t width = 0; + uint16_t height = 0; + uint8_t channels = 0; + bool is_valid = false; + }; + + // Load an image file (PNG, JPG, etc) & decode it to raw RGBA8 + ImageData load_image(const std::filesystem::path& path); +} \ No newline at end of file diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 65b1c78..950ac67 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -2,7 +2,8 @@ import std; #include -import core.filesystem; +import core.io.filesystem; +import core.io.image_loader; import rendering.rhi; import rendering.rhi.vertex; @@ -78,19 +79,35 @@ int main(int argc, char* argv[]) return -1; } - // Geometry data for a triangle to test rendering - // It includes both positions & colors - draco::rhi::PosColorVertex triangle[] = { - { 0.0f, 0.5f, 0.0f, 0xff0000ff }, - { 0.5f, -0.5f, 0.0f, 0xff00ff00 }, - { -0.5f, -0.5f, 0.0f, 0xffff0000} + draco::rhi::TexturedVertex quad[] = { + { -0.5f, 0.5f, 0.0f, 0xffffffff, 0.0f, 0.0f }, + { 0.5f, 0.5f, 0.0f, 0xffffffff, 1.0f, 0.0f }, + { 0.5f, -0.5f, 0.0f, 0xffffffff, 1.0f, 1.0f }, + { -0.5f, -0.5f, 0.0f, 0xffffffff, 0.0f, 1.0f } }; - auto vbh = draco::rhi::create_vertex_buffer(triangle, sizeof(triangle)); + uint16_t indices[] = { + 0, 1, 2, + 2, 3, 0 + }; + + auto vbh = draco::rhi::create_vertex_buffer(quad, sizeof(quad)); + auto ibh = draco::rhi::create_index_buffer(indices, sizeof(indices)); + + auto img = draco::core::io::image_loader::load_image("test.png"); + draco::rhi::TextureHandle tex = draco::rhi::InvalidTexture; + + if (img.is_valid) { + tex = draco::rhi::create_texture(img.pixels.data(), img.width, img.height); + } else { + std::println("Failed to load texture!"); + } + + auto s_texColor = draco::rhi::create_uniform("s_texColor", draco::rhi::UniformType::Sampler); // Load the vertex & fragment shaders - auto vs_data = draco::filesystem::load_binary("vs_triangle.bin"); - auto fs_data = draco::filesystem::load_binary("fs_triangle.bin"); + auto vs_data = draco::core::io::filesystem::load_binary("vs_triangle.bin"); + auto fs_data = draco::core::io::filesystem::load_binary("fs_triangle.bin"); // If the path is empty, return an error if (vs_data.empty() || fs_data.empty()) { @@ -110,8 +127,7 @@ int main(int argc, char* argv[]) fsh, draco::rhi::PipelineState::WriteRGB | draco::rhi::PipelineState::WriteAlpha | - draco::rhi::PipelineState::MSAA | - draco::rhi::PipelineState::PrimitiveTriStrip + draco::rhi::PipelineState::MSAA }); // Create a uniform for a color tint @@ -152,8 +168,12 @@ int main(int argc, char* argv[]) draco::rhi::RenderPacket packet{}; packet.vertex_buffer = vbh; - packet.index_buffer = draco::rhi::InvalidBuffer; + packet.index_buffer = ibh; packet.pipeline = pipeline; + + packet.texture_handle = tex; + packet.uniform_handle = s_texColor; + packet.texture_unit = 0; // Standard slot 0 draco::rhi::identity_matrix(packet.model); diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index ea40b72..72d0789 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -12,12 +12,14 @@ export namespace draco::rhi using PipelineHandle = uint16_t; using ShaderHandle = uint16_t; using UniformHandle = uint16_t; + using TextureHandle = uint16_t; using ViewID = uint16_t; inline constexpr BufferHandle InvalidBuffer = 0xFFFF; inline constexpr PipelineHandle InvalidPipeline = 0xFFFF; inline constexpr ShaderHandle InvalidShader = 0xFFFF; inline constexpr UniformHandle InvalidUniform = 0xFFFF; + inline constexpr TextureHandle InvalidTexture = 0xFFFF; inline constexpr ViewID InvalidView = 0xFFFF; enum class PipelineState : uint64_t { @@ -40,13 +42,16 @@ export namespace draco::rhi { uint64_t sort_key; - BufferHandle vertex_buffer; - BufferHandle index_buffer; - PipelineHandle pipeline; + BufferHandle vertex_buffer = InvalidBuffer; + BufferHandle index_buffer = InvalidBuffer; + PipelineHandle pipeline = InvalidPipeline; UniformHandle uniform_handle = InvalidUniform; + TextureHandle texture_handle = InvalidTexture; const void* uniform_data = nullptr; + uint8_t texture_unit = 0; // Which slot the texture goes into + float model[16]; uint32_t draw_tags; }; @@ -81,6 +86,10 @@ export namespace draco::rhi // Set the value of a uniform with the given handle, value & count void set_uniform(UniformHandle handle, const void* value, uint16_t num = 1); + // Create a texture from the given data, width, height & flags + TextureHandle create_texture(const void* data, uint16_t width, uint16_t height, uint32_t flags = 0); + void destroy_texture(TextureHandle handle); + // Helper function to set a 4x4 matrix to the identity matrix void identity_matrix(float* _mtx); diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index c7eddc6..07f015d 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -23,9 +23,12 @@ namespace draco::rhi uint64_t state = 0; // Stored as raw bgfx bitmask }; + // Static globals + // Note: We need to replace it with a more robust resource management system later, but this'll work for now static std::vector g_buffers; static std::vector g_pipelines; static std::vector g_uniforms; + static std::vector g_textures; static uint16_t g_width = 0; static uint16_t g_height = 0; @@ -83,10 +86,17 @@ namespace draco::rhi if (bgfx::isValid(u)) bgfx::destroy(u); } + for (auto& t : g_textures) + { + // Destroy the textures + if (bgfx::isValid(t)) bgfx::destroy(t); + } + // Clear everything so we don't have dangling handles g_buffers.clear(); g_pipelines.clear(); g_uniforms.clear(); + g_textures.clear(); // Have bgfx destroy the context and everything it holds internally bgfx::shutdown(); @@ -164,9 +174,10 @@ namespace draco::rhi bgfx::VertexLayout layout; layout.begin() - .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) - .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) - .end(); + .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) + .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) // normalized + .add(bgfx::Attrib::TexCoord0, 2, bgfx::AttribType::Float) + .end(); bgfx::VertexBufferHandle vbh = bgfx::createVertexBuffer( bgfx::copy(data, size), @@ -233,6 +244,27 @@ namespace draco::rhi } } + TextureHandle create_texture(const void* data, uint16_t width, uint16_t height, uint32_t flags) + { + if (!data || width == 0 || height == 0) { + std::println("Error: Invalid texture data or dimensions"); + return InvalidTexture; + } + + // Default flags are linear filtering & clamp to edge + uint64_t bgfx_flags = BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP | BGFX_SAMPLER_MIN_POINT | BGFX_SAMPLER_MAG_POINT; + + const bgfx::Memory* mem = bgfx::copy(data, width * height * 4); // Assuming RGBA8, but this should be calculated based on the actual format + bgfx::TextureHandle handle = bgfx::createTexture2D( + width, height, false, 1, + bgfx::TextureFormat::RGBA8, + bgfx_flags, mem + ); + + g_textures.push_back(handle); + return static_cast(g_textures.size() - 1); + } + void identity_matrix(float* _mtx) { bx::mtxIdentity(_mtx); @@ -256,7 +288,7 @@ namespace draco::rhi Buffer& vb = g_buffers[p.vertex_buffer]; bgfx::setTransform(p.model); - bgfx::setVertexBuffer(0, vb.vbh); + bgfx::setVertexBuffer(0, g_buffers[p.vertex_buffer].vbh); if (p.index_buffer != InvalidBuffer) { @@ -269,11 +301,21 @@ namespace draco::rhi bgfx::setIndexBuffer(ib.ibh); } - if (p.uniform_handle != InvalidUniform && p.uniform_handle < g_uniforms.size()) + if (p.uniform_handle != InvalidUniform && p.uniform_data != nullptr) { bgfx::setUniform(g_uniforms[p.uniform_handle], p.uniform_data, 1); } + // Bind Texture if valid + if (p.texture_handle != InvalidTexture && p.texture_handle < g_textures.size()) + { + // TODO: Use a dedicated sampler handle later + // For now, we'll assume the uniform_handle passed is the sampler. + if (p.uniform_handle != InvalidUniform) { + bgfx::setTexture(p.texture_unit, g_uniforms[p.uniform_handle], g_textures[p.texture_handle]); + } + } + bgfx::setState(pipeline.state); bgfx::submit(view, pipeline.program); } @@ -303,4 +345,4 @@ namespace draco::rhi { bgfx::frame(); } -} \ No newline at end of file +} diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/native/rendering/rhi/vertex.cppm index d2a7169..82c5629 100644 --- a/engine/native/rendering/rhi/vertex.cppm +++ b/engine/native/rendering/rhi/vertex.cppm @@ -13,4 +13,11 @@ export namespace draco::rhi float x, y, z; // Position uint32_t agbr; // Color, stored as AGBR }; + + struct TexturedVertex + { + float x, y, z; // Position + uint32_t agbr; // Color, stored as AGBR + float u, v; // Texture coordinates + }; } \ No newline at end of file diff --git a/engine/native/rendering/shaders/fs.sc b/engine/native/rendering/shaders/fs.sc index 60a0724..7e9354c 100644 --- a/engine/native/rendering/shaders/fs.sc +++ b/engine/native/rendering/shaders/fs.sc @@ -1,9 +1,11 @@ -$input v_color0 +$input v_color0, v_texcoord0 #include +SAMPLER2D(s_texColor, 0); uniform vec4 u_tint; void main() { - // Multiply the vertex color by our uniform tint - gl_FragColor = v_color0 * u_tint; + // Sample the texture and multiply by vertex color and the tint + vec4 texColor = texture2D(s_texColor, v_texcoord0); + gl_FragColor = texColor * v_color0 * u_tint; } \ No newline at end of file diff --git a/engine/native/rendering/shaders/fs_triangle.bin b/engine/native/rendering/shaders/fs_triangle.bin index 20f642eaf45cd651417ce0862bd9de127b88c795..7eba2267cd0424562c01e9616e346f352f2518a5 100644 GIT binary patch literal 1148 zcmY+CT}vB57=_2IyH!J5t7xeOiS?tDLI|QFl$L6XTFp&KwY4{48xsjlva+s{dnxqe zzUa^MFNhc36ndV?Ok-btnK|eEoU_@eY~=^et}cx%XQGp8*6d_s1IFlIHga6e>fJX< zD@jX=%W@0m^`J39ZuSmIc{5}#;AIb#L0R5J_S`I2%EjaCpt!VLB7V;V95!}eb!ub1 z9XC7hyYhW`Lq4ip;u@k`U_zbOY95M(_cft1W`+BER^s+itDcG@w(wu`+7 zY;>y|X?*xL&SI&ssqNW!Mm{F@_=)Zqn4O8Ex5xc>VD}@or764tqbEi_yHYQ?{^5T8 zpxu93F^qh62m5^V_wjLU!K@kk6?!{OiHXEbisSnfj4=m4hYo}7Ka?C@F6{5^F+gWqy$=<`t=HRp18a=$t5yW{D%CJr5b g$k7H}{k)%!_jSL7sfB-~7w|T?KT=@TsxWH)0(n1Or2qf` literal 691 zcmYk3K}!N*5Qay$RY52#s#B(U=wL{PlpqRtGm8!^rK17PBA5qqjjj3dUDK9O$H@ zK4$33)?L!A31b~?gl<*Ny;8id90N0}?9c);C&immM!V{6x|p-AJSVOq-%)=-5zO7o z$v$uuG3e0Gj;9G`AGj^yiXxto*ArY-j?vGa)TVj|%BcmT2WEdb>YIwZVtNkdK5#Al zAGFvLgZmZ3`<;oU=TMH`g;-|a$kYFq*4!riyK3m^%jttZmn!q%{ -// Note: For bgfx, uniforms are always vec4 or mat4. uniform vec4 u_offset; void main() { - // Add the offset to the local position before transforming vec3 pos = a_position + u_offset.xyz; gl_Position = mul(u_modelViewProj, vec4(pos, 1.0)); + v_color0 = a_color0; + v_texcoord0 = a_texcoord0; } \ No newline at end of file diff --git a/engine/native/rendering/shaders/vs_triangle.bin b/engine/native/rendering/shaders/vs_triangle.bin index a62c9dc976c0c2acca129a1e51a74aa6da0093bb..01dcedfb0234195c4d33c5770f5143d04b64550f 100644 GIT binary patch literal 1457 zcmZvcU2hUW6ov=r_Cpd|V{A>-O0DsRg!Dp9{b+^WKq3h!v9}uni>?AgmZcwe8vlTQ z(Z684@W#aVncb;Pb;x1P`<{R6pc5R*xYmcAo;d0%S zoG1C$70Dvwq#sYwpGgiR4M|(lk@O@b{dA=HslY%Hmtz8*byv1`(|BZ)$>NQHW}`T zx#sGxN7FPp@7j2pb{6Suk=EXi!|p|>{MKBL|N5O=oJuZc@IRlwCmPdK?aZMlX=y^} zEN0cxNgnIc%*GXNSD5AfmUwmU7@=(ilV}G0G~3)`WyLL~gn*?G_i?4r#X5>s4SDCaLZ9##s@}#AXKFEKSmZ z?PmSsJo}W4?Afg3S$Fb7TP4_-H}b5S1(Q3~n42bWu~jqY_Qt`{L490w>)VeX;&RvzWK344&)4&5bMChB(XnF&kPeG?an4 z)&-X5wJCL+S=TOc=7f_6|5&^GpOl>U;{BJ^F+H!lH#P15j_f&Uk+7n8dWJI#oVO0I z2)D(TwMPQ=9+do6$ydc!WRrvVH9fftuSMc_#pwb4X~~%xjr04ZO%9(wlFfqCOUb+DLy-T*VJZK7TO;v zd;`y0&}kQcw#(zv4& zp(U`q){)&3i1%8z)X0~pV|va6;_>IaCeZJu_MSk$kwCxP`>BBbT|UIW7s!GBT(=Ty UN5kIN&Yk>K7rS&4gnB0CA5z?CPXGV_ diff --git a/engine/native/thirdparty/CMakeLists.txt b/engine/native/thirdparty/CMakeLists.txt index 4852058..d0a506c 100644 --- a/engine/native/thirdparty/CMakeLists.txt +++ b/engine/native/thirdparty/CMakeLists.txt @@ -28,4 +28,6 @@ set(SDL_X11_SHARED OFF) set(SDL_ALSA_SHARED OFF) set(SDL_PULSEAUDIO_SHARED OFF) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdl sdl-build) \ No newline at end of file +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdl sdl-build) + +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/stb) \ No newline at end of file diff --git a/engine/native/thirdparty/bgfx b/engine/native/thirdparty/bgfx index 8532b2c..e9a4f67 160000 --- a/engine/native/thirdparty/bgfx +++ b/engine/native/thirdparty/bgfx @@ -1 +1 @@ -Subproject commit 8532b2c45d2f4332a9ac9734b85c2ea2253cb8d5 +Subproject commit e9a4f671bc2862be58233dff3c16a92a971a8c59 diff --git a/engine/native/thirdparty/sdl b/engine/native/thirdparty/sdl index 682da4e..59267ed 160000 --- a/engine/native/thirdparty/sdl +++ b/engine/native/thirdparty/sdl @@ -1 +1 @@ -Subproject commit 682da4ee9885c28bccf0dee832f3089b0abca547 +Subproject commit 59267ed800661f81b7f89b49e88473acde7ce4bb diff --git a/engine/native/thirdparty/stb/CMakeLists.txt b/engine/native/thirdparty/stb/CMakeLists.txt new file mode 100644 index 0000000..7a2385c --- /dev/null +++ b/engine/native/thirdparty/stb/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(stb_image INTERFACE) +target_include_directories(stb_image INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/engine/native/thirdparty/stb/stb_image.h b/engine/native/thirdparty/stb/stb_image.h new file mode 100644 index 0000000..d4b5c87 --- /dev/null +++ b/engine/native/thirdparty/stb/stb_image.h @@ -0,0 +1,7988 @@ +/* stb_image - v2.30 - public domain image loader - http://nothings.org/stb + no warranty implied; use at your own risk + + Do this: + #define STB_IMAGE_IMPLEMENTATION + before you include this file in *one* C or C++ file to create the implementation. + + // i.e. it should look like this: + #include ... + #include ... + #include ... + #define STB_IMAGE_IMPLEMENTATION + #include "stb_image.h" + + You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. + And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free + + + QUICK NOTES: + Primarily of interest to game developers and other people who can + avoid problematic images and only need the trivial interface + + JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) + PNG 1/2/4/8/16-bit-per-channel + + TGA (not sure what subset, if a subset) + BMP non-1bpp, non-RLE + PSD (composited view only, no extra channels, 8/16 bit-per-channel) + + GIF (*comp always reports as 4-channel) + HDR (radiance rgbE format) + PIC (Softimage PIC) + PNM (PPM and PGM binary only) + + Animated GIF still needs a proper API, but here's one way to do it: + http://gist.github.com/urraka/685d9a6340b26b830d49 + + - decode from memory or through FILE (define STBI_NO_STDIO to remove code) + - decode from arbitrary I/O callbacks + - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) + + Full documentation under "DOCUMENTATION" below. + + +LICENSE + + See end of file for license information. + +RECENT REVISION HISTORY: + + 2.30 (2024-05-31) avoid erroneous gcc warning + 2.29 (2023-05-xx) optimizations + 2.28 (2023-01-29) many error fixes, security errors, just tons of stuff + 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes + 2.26 (2020-07-13) many minor fixes + 2.25 (2020-02-02) fix warnings + 2.24 (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically + 2.23 (2019-08-11) fix clang static analysis warning + 2.22 (2019-03-04) gif fixes, fix warnings + 2.21 (2019-02-25) fix typo in comment + 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs + 2.19 (2018-02-11) fix warning + 2.18 (2018-01-30) fix warnings + 2.17 (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings + 2.16 (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes + 2.15 (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC + 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs + 2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes + 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes + 2.11 (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64 + RGB-format JPEG; remove white matting in PSD; + allocate large structures on the stack; + correct channel count for PNG & BMP + 2.10 (2016-01-22) avoid warning introduced in 2.09 + 2.09 (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED + + See end of file for full revision history. + + + ============================ Contributors ========================= + + Image formats Extensions, features + Sean Barrett (jpeg, png, bmp) Jetro Lauha (stbi_info) + Nicolas Schulz (hdr, psd) Martin "SpartanJ" Golini (stbi_info) + Jonathan Dummer (tga) James "moose2000" Brown (iPhone PNG) + Jean-Marc Lienher (gif) Ben "Disch" Wenger (io callbacks) + Tom Seddon (pic) Omar Cornut (1/2/4-bit PNG) + Thatcher Ulrich (psd) Nicolas Guillemot (vertical flip) + Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD) + github:urraka (animated gif) Junggon Kim (PNM comments) + Christopher Forseth (animated gif) Daniel Gibson (16-bit TGA) + socks-the-fox (16-bit PNG) + Jeremy Sawicki (handle all ImageNet JPGs) + Optimizations & bugfixes Mikhail Morozov (1-bit BMP) + Fabian "ryg" Giesen Anael Seghezzi (is-16-bit query) + Arseny Kapoulkine Simon Breuss (16-bit PNM) + John-Mark Allen + Carmelo J Fdez-Aguera + + Bug & warning fixes + Marc LeBlanc David Woo Guillaume George Martins Mozeiko + Christpher Lloyd Jerry Jansson Joseph Thomson Blazej Dariusz Roszkowski + Phil Jordan Dave Moore Roy Eltham + Hayaki Saito Nathan Reed Won Chun + Luke Graham Johan Duparc Nick Verigakis the Horde3D community + Thomas Ruf Ronny Chevalier github:rlyeh + Janez Zemva John Bartholomew Michal Cichon github:romigrou + Jonathan Blow Ken Hamada Tero Hanninen github:svdijk + Eugene Golushkov Laurent Gomila Cort Stratton github:snagar + Aruelien Pocheville Sergio Gonzalez Thibault Reuille github:Zelex + Cass Everitt Ryamond Barbiero github:grim210 + Paul Du Bois Engin Manap Aldo Culquicondor github:sammyhw + Philipp Wiesemann Dale Weiler Oriol Ferrer Mesia github:phprus + Josh Tobin Neil Bickford Matthew Gregan github:poppolopoppo + Julian Raschke Gregory Mullen Christian Floisand github:darealshinji + Baldur Karlsson Kevin Schmidt JR Smith github:Michaelangel007 + Brad Weinberger Matvey Cherevko github:mosra + Luca Sas Alexander Veselov Zack Middleton [reserved] + Ryan C. Gordon [reserved] [reserved] + DO NOT ADD YOUR NAME HERE + + Jacko Dirks + + To add your name to the credits, pick a random blank space in the middle and fill it. + 80% of merge conflicts on stb PRs are due to people adding their name at the end + of the credits. +*/ + +#ifndef STBI_INCLUDE_STB_IMAGE_H +#define STBI_INCLUDE_STB_IMAGE_H + +// DOCUMENTATION +// +// Limitations: +// - no 12-bit-per-channel JPEG +// - no JPEGs with arithmetic coding +// - GIF always returns *comp=4 +// +// Basic usage (see HDR discussion below for HDR usage): +// int x,y,n; +// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); +// // ... process data if not NULL ... +// // ... x = width, y = height, n = # 8-bit components per pixel ... +// // ... replace '0' with '1'..'4' to force that many components per pixel +// // ... but 'n' will always be the number that it would have been if you said 0 +// stbi_image_free(data); +// +// Standard parameters: +// int *x -- outputs image width in pixels +// int *y -- outputs image height in pixels +// int *channels_in_file -- outputs # of image components in image file +// int desired_channels -- if non-zero, # of image components requested in result +// +// The return value from an image loader is an 'unsigned char *' which points +// to the pixel data, or NULL on an allocation failure or if the image is +// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, +// with each pixel consisting of N interleaved 8-bit components; the first +// pixel pointed to is top-left-most in the image. There is no padding between +// image scanlines or between pixels, regardless of format. The number of +// components N is 'desired_channels' if desired_channels is non-zero, or +// *channels_in_file otherwise. If desired_channels is non-zero, +// *channels_in_file has the number of components that _would_ have been +// output otherwise. E.g. if you set desired_channels to 4, you will always +// get RGBA output, but you can check *channels_in_file to see if it's trivially +// opaque because e.g. there were only 3 channels in the source image. +// +// An output image with N components has the following components interleaved +// in this order in each pixel: +// +// N=#comp components +// 1 grey +// 2 grey, alpha +// 3 red, green, blue +// 4 red, green, blue, alpha +// +// If image loading fails for any reason, the return value will be NULL, +// and *x, *y, *channels_in_file will be unchanged. The function +// stbi_failure_reason() can be queried for an extremely brief, end-user +// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS +// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly +// more user-friendly ones. +// +// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. +// +// To query the width, height and component count of an image without having to +// decode the full file, you can use the stbi_info family of functions: +// +// int x,y,n,ok; +// ok = stbi_info(filename, &x, &y, &n); +// // returns ok=1 and sets x, y, n if image is a supported format, +// // 0 otherwise. +// +// Note that stb_image pervasively uses ints in its public API for sizes, +// including sizes of memory buffers. This is now part of the API and thus +// hard to change without causing breakage. As a result, the various image +// loaders all have certain limits on image size; these differ somewhat +// by format but generally boil down to either just under 2GB or just under +// 1GB. When the decoded image would be larger than this, stb_image decoding +// will fail. +// +// Additionally, stb_image will reject image files that have any of their +// dimensions set to a larger value than the configurable STBI_MAX_DIMENSIONS, +// which defaults to 2**24 = 16777216 pixels. Due to the above memory limit, +// the only way to have an image with such dimensions load correctly +// is for it to have a rather extreme aspect ratio. Either way, the +// assumption here is that such larger images are likely to be malformed +// or malicious. If you do need to load an image with individual dimensions +// larger than that, and it still fits in the overall size limit, you can +// #define STBI_MAX_DIMENSIONS on your own to be something larger. +// +// =========================================================================== +// +// UNICODE: +// +// If compiling for Windows and you wish to use Unicode filenames, compile +// with +// #define STBI_WINDOWS_UTF8 +// and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert +// Windows wchar_t filenames to utf8. +// +// =========================================================================== +// +// Philosophy +// +// stb libraries are designed with the following priorities: +// +// 1. easy to use +// 2. easy to maintain +// 3. good performance +// +// Sometimes I let "good performance" creep up in priority over "easy to maintain", +// and for best performance I may provide less-easy-to-use APIs that give higher +// performance, in addition to the easy-to-use ones. Nevertheless, it's important +// to keep in mind that from the standpoint of you, a client of this library, +// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all. +// +// Some secondary priorities arise directly from the first two, some of which +// provide more explicit reasons why performance can't be emphasized. +// +// - Portable ("ease of use") +// - Small source code footprint ("easy to maintain") +// - No dependencies ("ease of use") +// +// =========================================================================== +// +// I/O callbacks +// +// I/O callbacks allow you to read from arbitrary sources, like packaged +// files or some other source. Data read from callbacks are processed +// through a small internal buffer (currently 128 bytes) to try to reduce +// overhead. +// +// The three functions you must define are "read" (reads some bytes of data), +// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). +// +// =========================================================================== +// +// SIMD support +// +// The JPEG decoder will try to automatically use SIMD kernels on x86 when +// supported by the compiler. For ARM Neon support, you must explicitly +// request it. +// +// (The old do-it-yourself SIMD API is no longer supported in the current +// code.) +// +// On x86, SSE2 will automatically be used when available based on a run-time +// test; if not, the generic C versions are used as a fall-back. On ARM targets, +// the typical path is to have separate builds for NEON and non-NEON devices +// (at least this is true for iOS and Android). Therefore, the NEON support is +// toggled by a build flag: define STBI_NEON to get NEON loops. +// +// If for some reason you do not want to use any of SIMD code, or if +// you have issues compiling it, you can disable it entirely by +// defining STBI_NO_SIMD. +// +// =========================================================================== +// +// HDR image support (disable by defining STBI_NO_HDR) +// +// stb_image supports loading HDR images in general, and currently the Radiance +// .HDR file format specifically. You can still load any file through the existing +// interface; if you attempt to load an HDR file, it will be automatically remapped +// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; +// both of these constants can be reconfigured through this interface: +// +// stbi_hdr_to_ldr_gamma(2.2f); +// stbi_hdr_to_ldr_scale(1.0f); +// +// (note, do not use _inverse_ constants; stbi_image will invert them +// appropriately). +// +// Additionally, there is a new, parallel interface for loading files as +// (linear) floats to preserve the full dynamic range: +// +// float *data = stbi_loadf(filename, &x, &y, &n, 0); +// +// If you load LDR images through this interface, those images will +// be promoted to floating point values, run through the inverse of +// constants corresponding to the above: +// +// stbi_ldr_to_hdr_scale(1.0f); +// stbi_ldr_to_hdr_gamma(2.2f); +// +// Finally, given a filename (or an open file or memory block--see header +// file for details) containing image data, you can query for the "most +// appropriate" interface to use (that is, whether the image is HDR or +// not), using: +// +// stbi_is_hdr(char *filename); +// +// =========================================================================== +// +// iPhone PNG support: +// +// We optionally support converting iPhone-formatted PNGs (which store +// premultiplied BGRA) back to RGB, even though they're internally encoded +// differently. To enable this conversion, call +// stbi_convert_iphone_png_to_rgb(1). +// +// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per +// pixel to remove any premultiplied alpha *only* if the image file explicitly +// says there's premultiplied data (currently only happens in iPhone images, +// and only if iPhone convert-to-rgb processing is on). +// +// =========================================================================== +// +// ADDITIONAL CONFIGURATION +// +// - You can suppress implementation of any of the decoders to reduce +// your code footprint by #defining one or more of the following +// symbols before creating the implementation. +// +// STBI_NO_JPEG +// STBI_NO_PNG +// STBI_NO_BMP +// STBI_NO_PSD +// STBI_NO_TGA +// STBI_NO_GIF +// STBI_NO_HDR +// STBI_NO_PIC +// STBI_NO_PNM (.ppm and .pgm) +// +// - You can request *only* certain decoders and suppress all other ones +// (this will be more forward-compatible, as addition of new decoders +// doesn't require you to disable them explicitly): +// +// STBI_ONLY_JPEG +// STBI_ONLY_PNG +// STBI_ONLY_BMP +// STBI_ONLY_PSD +// STBI_ONLY_TGA +// STBI_ONLY_GIF +// STBI_ONLY_HDR +// STBI_ONLY_PIC +// STBI_ONLY_PNM (.ppm and .pgm) +// +// - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still +// want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB +// +// - If you define STBI_MAX_DIMENSIONS, stb_image will reject images greater +// than that size (in either width or height) without further processing. +// This is to let programs in the wild set an upper bound to prevent +// denial-of-service attacks on untrusted data, as one could generate a +// valid image of gigantic dimensions and force stb_image to allocate a +// huge block of memory and spend disproportionate time decoding it. By +// default this is set to (1 << 24), which is 16777216, but that's still +// very big. + +#ifndef STBI_NO_STDIO +#include +#endif // STBI_NO_STDIO + +#define STBI_VERSION 1 + +enum +{ + STBI_default = 0, // only used for desired_channels + + STBI_grey = 1, + STBI_grey_alpha = 2, + STBI_rgb = 3, + STBI_rgb_alpha = 4 +}; + +#include +typedef unsigned char stbi_uc; +typedef unsigned short stbi_us; + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef STBIDEF +#ifdef STB_IMAGE_STATIC +#define STBIDEF static +#else +#define STBIDEF extern +#endif +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// PRIMARY API - works on images of any type +// + +// +// load image by filename, open file, or memory buffer +// + +typedef struct +{ + int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read + void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative + int (*eof) (void *user); // returns nonzero if we are at end of file/data +} stbi_io_callbacks; + +//////////////////////////////////// +// +// 8-bits-per-channel interface +// + +STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *channels_in_file, int desired_channels); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); +// for stbi_load_from_file, file pointer is left pointing immediately after image +#endif + +#ifndef STBI_NO_GIF +STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp); +#endif + +#ifdef STBI_WINDOWS_UTF8 +STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input); +#endif + +//////////////////////////////////// +// +// 16-bits-per-channel interface +// + +STBIDEF stbi_us *stbi_load_16_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_us *stbi_load_16 (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); +STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); +#endif + +//////////////////////////////////// +// +// float-per-channel interface +// +#ifndef STBI_NO_LINEAR + STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); + STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); + + #ifndef STBI_NO_STDIO + STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); + STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); + #endif +#endif + +#ifndef STBI_NO_HDR + STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); + STBIDEF void stbi_hdr_to_ldr_scale(float scale); +#endif // STBI_NO_HDR + +#ifndef STBI_NO_LINEAR + STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); + STBIDEF void stbi_ldr_to_hdr_scale(float scale); +#endif // STBI_NO_LINEAR + +// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename); +STBIDEF int stbi_is_hdr_from_file(FILE *f); +#endif // STBI_NO_STDIO + + +// get a VERY brief reason for failure +// on most compilers (and ALL modern mainstream compilers) this is threadsafe +STBIDEF const char *stbi_failure_reason (void); + +// free the loaded image -- this is just free() +STBIDEF void stbi_image_free (void *retval_from_stbi_load); + +// get image dimensions & components without fully decoding +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); +STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len); +STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user); + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); +STBIDEF int stbi_is_16_bit (char const *filename); +STBIDEF int stbi_is_16_bit_from_file(FILE *f); +#endif + + + +// for image formats that explicitly notate that they have premultiplied alpha, +// we just return the colors as stored in the file. set this flag to force +// unpremultiplication. results are undefined if the unpremultiply overflow. +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); + +// indicate whether we should process iphone images back to canonical format, +// or just pass them through "as-is" +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); + +// flip the image vertically, so the first pixel in the output array is the bottom left +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); + +// as above, but only applies to images loaded on the thread that calls the function +// this function is only available if your compiler supports thread-local variables; +// calling it will fail to link if your compiler doesn't +STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply); +STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert); +STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip); + +// ZLIB client - used by PNG, available for other purposes + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); +STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + +STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + + +#ifdef __cplusplus +} +#endif + +// +// +//// end header file ///////////////////////////////////////////////////// +#endif // STBI_INCLUDE_STB_IMAGE_H + +#ifdef STB_IMAGE_IMPLEMENTATION + +#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ + || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ + || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ + || defined(STBI_ONLY_ZLIB) + #ifndef STBI_ONLY_JPEG + #define STBI_NO_JPEG + #endif + #ifndef STBI_ONLY_PNG + #define STBI_NO_PNG + #endif + #ifndef STBI_ONLY_BMP + #define STBI_NO_BMP + #endif + #ifndef STBI_ONLY_PSD + #define STBI_NO_PSD + #endif + #ifndef STBI_ONLY_TGA + #define STBI_NO_TGA + #endif + #ifndef STBI_ONLY_GIF + #define STBI_NO_GIF + #endif + #ifndef STBI_ONLY_HDR + #define STBI_NO_HDR + #endif + #ifndef STBI_ONLY_PIC + #define STBI_NO_PIC + #endif + #ifndef STBI_ONLY_PNM + #define STBI_NO_PNM + #endif +#endif + +#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) +#define STBI_NO_ZLIB +#endif + + +#include +#include // ptrdiff_t on osx +#include +#include +#include + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) +#include // ldexp, pow +#endif + +#ifndef STBI_NO_STDIO +#include +#endif + +#ifndef STBI_ASSERT +#include +#define STBI_ASSERT(x) assert(x) +#endif + +#ifdef __cplusplus +#define STBI_EXTERN extern "C" +#else +#define STBI_EXTERN extern +#endif + + +#ifndef _MSC_VER + #ifdef __cplusplus + #define stbi_inline inline + #else + #define stbi_inline + #endif +#else + #define stbi_inline __forceinline +#endif + +#ifndef STBI_NO_THREAD_LOCALS + #if defined(__cplusplus) && __cplusplus >= 201103L + #define STBI_THREAD_LOCAL thread_local + #elif defined(__GNUC__) && __GNUC__ < 5 + #define STBI_THREAD_LOCAL __thread + #elif defined(_MSC_VER) + #define STBI_THREAD_LOCAL __declspec(thread) + #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__) + #define STBI_THREAD_LOCAL _Thread_local + #endif + + #ifndef STBI_THREAD_LOCAL + #if defined(__GNUC__) + #define STBI_THREAD_LOCAL __thread + #endif + #endif +#endif + +#if defined(_MSC_VER) || defined(__SYMBIAN32__) +typedef unsigned short stbi__uint16; +typedef signed short stbi__int16; +typedef unsigned int stbi__uint32; +typedef signed int stbi__int32; +#else +#include +typedef uint16_t stbi__uint16; +typedef int16_t stbi__int16; +typedef uint32_t stbi__uint32; +typedef int32_t stbi__int32; +#endif + +// should produce compiler error if size is wrong +typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; + +#ifdef _MSC_VER +#define STBI_NOTUSED(v) (void)(v) +#else +#define STBI_NOTUSED(v) (void)sizeof(v) +#endif + +#ifdef _MSC_VER +#define STBI_HAS_LROTL +#endif + +#ifdef STBI_HAS_LROTL + #define stbi_lrot(x,y) _lrotl(x,y) +#else + #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (-(y) & 31))) +#endif + +#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED)) +// ok +#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED) +// ok +#else +#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)." +#endif + +#ifndef STBI_MALLOC +#define STBI_MALLOC(sz) malloc(sz) +#define STBI_REALLOC(p,newsz) realloc(p,newsz) +#define STBI_FREE(p) free(p) +#endif + +#ifndef STBI_REALLOC_SIZED +#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz) +#endif + +// x86/x64 detection +#if defined(__x86_64__) || defined(_M_X64) +#define STBI__X64_TARGET +#elif defined(__i386) || defined(_M_IX86) +#define STBI__X86_TARGET +#endif + +#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) +// gcc doesn't support sse2 intrinsics unless you compile with -msse2, +// which in turn means it gets to use SSE2 everywhere. This is unfortunate, +// but previous attempts to provide the SSE2 functions with runtime +// detection caused numerous issues. The way architecture extensions are +// exposed in GCC/Clang is, sadly, not really suited for one-file libs. +// New behavior: if compiled with -msse2, we use SSE2 without any +// detection; if not, we don't use it at all. +#define STBI_NO_SIMD +#endif + +#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) +// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET +// +// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the +// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. +// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not +// simultaneously enabling "-mstackrealign". +// +// See https://github.com/nothings/stb/issues/81 for more information. +// +// So default to no SSE2 on 32-bit MinGW. If you've read this far and added +// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. +#define STBI_NO_SIMD +#endif + +#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) +#define STBI_SSE2 +#include + +#ifdef _MSC_VER + +#if _MSC_VER >= 1400 // not VC6 +#include // __cpuid +static int stbi__cpuid3(void) +{ + int info[4]; + __cpuid(info,1); + return info[3]; +} +#else +static int stbi__cpuid3(void) +{ + int res; + __asm { + mov eax,1 + cpuid + mov res,edx + } + return res; +} +#endif + +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name + +#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) +static int stbi__sse2_available(void) +{ + int info3 = stbi__cpuid3(); + return ((info3 >> 26) & 1) != 0; +} +#endif + +#else // assume GCC-style if not VC++ +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) + +#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) +static int stbi__sse2_available(void) +{ + // If we're even attempting to compile this on GCC/Clang, that means + // -msse2 is on, which means the compiler is allowed to use SSE2 + // instructions at will, and so are we. + return 1; +} +#endif + +#endif +#endif + +// ARM NEON +#if defined(STBI_NO_SIMD) && defined(STBI_NEON) +#undef STBI_NEON +#endif + +#ifdef STBI_NEON +#include +#ifdef _MSC_VER +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name +#else +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) +#endif +#endif + +#ifndef STBI_SIMD_ALIGN +#define STBI_SIMD_ALIGN(type, name) type name +#endif + +#ifndef STBI_MAX_DIMENSIONS +#define STBI_MAX_DIMENSIONS (1 << 24) +#endif + +/////////////////////////////////////////////// +// +// stbi__context struct and start_xxx functions + +// stbi__context structure is our basic context used by all images, so it +// contains all the IO context, plus some basic image information +typedef struct +{ + stbi__uint32 img_x, img_y; + int img_n, img_out_n; + + stbi_io_callbacks io; + void *io_user_data; + + int read_from_callbacks; + int buflen; + stbi_uc buffer_start[128]; + int callback_already_read; + + stbi_uc *img_buffer, *img_buffer_end; + stbi_uc *img_buffer_original, *img_buffer_original_end; +} stbi__context; + + +static void stbi__refill_buffer(stbi__context *s); + +// initialize a memory-decode context +static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) +{ + s->io.read = NULL; + s->read_from_callbacks = 0; + s->callback_already_read = 0; + s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; + s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; +} + +// initialize a callback-based context +static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) +{ + s->io = *c; + s->io_user_data = user; + s->buflen = sizeof(s->buffer_start); + s->read_from_callbacks = 1; + s->callback_already_read = 0; + s->img_buffer = s->img_buffer_original = s->buffer_start; + stbi__refill_buffer(s); + s->img_buffer_original_end = s->img_buffer_end; +} + +#ifndef STBI_NO_STDIO + +static int stbi__stdio_read(void *user, char *data, int size) +{ + return (int) fread(data,1,size,(FILE*) user); +} + +static void stbi__stdio_skip(void *user, int n) +{ + int ch; + fseek((FILE*) user, n, SEEK_CUR); + ch = fgetc((FILE*) user); /* have to read a byte to reset feof()'s flag */ + if (ch != EOF) { + ungetc(ch, (FILE *) user); /* push byte back onto stream if valid. */ + } +} + +static int stbi__stdio_eof(void *user) +{ + return feof((FILE*) user) || ferror((FILE *) user); +} + +static stbi_io_callbacks stbi__stdio_callbacks = +{ + stbi__stdio_read, + stbi__stdio_skip, + stbi__stdio_eof, +}; + +static void stbi__start_file(stbi__context *s, FILE *f) +{ + stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); +} + +//static void stop_file(stbi__context *s) { } + +#endif // !STBI_NO_STDIO + +static void stbi__rewind(stbi__context *s) +{ + // conceptually rewind SHOULD rewind to the beginning of the stream, + // but we just rewind to the beginning of the initial buffer, because + // we only use it after doing 'test', which only ever looks at at most 92 bytes + s->img_buffer = s->img_buffer_original; + s->img_buffer_end = s->img_buffer_original_end; +} + +enum +{ + STBI_ORDER_RGB, + STBI_ORDER_BGR +}; + +typedef struct +{ + int bits_per_channel; + int num_channels; + int channel_order; +} stbi__result_info; + +#ifndef STBI_NO_JPEG +static int stbi__jpeg_test(stbi__context *s); +static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNG +static int stbi__png_test(stbi__context *s); +static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__png_is16(stbi__context *s); +#endif + +#ifndef STBI_NO_BMP +static int stbi__bmp_test(stbi__context *s); +static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_TGA +static int stbi__tga_test(stbi__context *s); +static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s); +static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc); +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__psd_is16(stbi__context *s); +#endif + +#ifndef STBI_NO_HDR +static int stbi__hdr_test(stbi__context *s); +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_test(stbi__context *s); +static void *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_GIF +static int stbi__gif_test(stbi__context *s); +static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp); +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNM +static int stbi__pnm_test(stbi__context *s); +static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); +static int stbi__pnm_is16(stbi__context *s); +#endif + +static +#ifdef STBI_THREAD_LOCAL +STBI_THREAD_LOCAL +#endif +const char *stbi__g_failure_reason; + +STBIDEF const char *stbi_failure_reason(void) +{ + return stbi__g_failure_reason; +} + +#ifndef STBI_NO_FAILURE_STRINGS +static int stbi__err(const char *str) +{ + stbi__g_failure_reason = str; + return 0; +} +#endif + +static void *stbi__malloc(size_t size) +{ + return STBI_MALLOC(size); +} + +// stb_image uses ints pervasively, including for offset calculations. +// therefore the largest decoded image size we can support with the +// current code, even on 64-bit targets, is INT_MAX. this is not a +// significant limitation for the intended use case. +// +// we do, however, need to make sure our size calculations don't +// overflow. hence a few helper functions for size calculations that +// multiply integers together, making sure that they're non-negative +// and no overflow occurs. + +// return 1 if the sum is valid, 0 on overflow. +// negative terms are considered invalid. +static int stbi__addsizes_valid(int a, int b) +{ + if (b < 0) return 0; + // now 0 <= b <= INT_MAX, hence also + // 0 <= INT_MAX - b <= INTMAX. + // And "a + b <= INT_MAX" (which might overflow) is the + // same as a <= INT_MAX - b (no overflow) + return a <= INT_MAX - b; +} + +// returns 1 if the product is valid, 0 on overflow. +// negative factors are considered invalid. +static int stbi__mul2sizes_valid(int a, int b) +{ + if (a < 0 || b < 0) return 0; + if (b == 0) return 1; // mul-by-0 is always safe + // portable way to check for no overflows in a*b + return a <= INT_MAX/b; +} + +#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) +// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow +static int stbi__mad2sizes_valid(int a, int b, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add); +} +#endif + +// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow +static int stbi__mad3sizes_valid(int a, int b, int c, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && + stbi__addsizes_valid(a*b*c, add); +} + +// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) +static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add) +{ + return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && + stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add); +} +#endif + +#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) +// mallocs with size overflow checking +static void *stbi__malloc_mad2(int a, int b, int add) +{ + if (!stbi__mad2sizes_valid(a, b, add)) return NULL; + return stbi__malloc(a*b + add); +} +#endif + +static void *stbi__malloc_mad3(int a, int b, int c, int add) +{ + if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL; + return stbi__malloc(a*b*c + add); +} + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) +static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) +{ + if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL; + return stbi__malloc(a*b*c*d + add); +} +#endif + +// returns 1 if the sum of two signed ints is valid (between -2^31 and 2^31-1 inclusive), 0 on overflow. +static int stbi__addints_valid(int a, int b) +{ + if ((a >= 0) != (b >= 0)) return 1; // a and b have different signs, so no overflow + if (a < 0 && b < 0) return a >= INT_MIN - b; // same as a + b >= INT_MIN; INT_MIN - b cannot overflow since b < 0. + return a <= INT_MAX - b; +} + +// returns 1 if the product of two ints fits in a signed short, 0 on overflow. +static int stbi__mul2shorts_valid(int a, int b) +{ + if (b == 0 || b == -1) return 1; // multiplication by 0 is always 0; check for -1 so SHRT_MIN/b doesn't overflow + if ((a >= 0) == (b >= 0)) return a <= SHRT_MAX/b; // product is positive, so similar to mul2sizes_valid + if (b < 0) return a <= SHRT_MIN / b; // same as a * b >= SHRT_MIN + return a >= SHRT_MIN / b; +} + +// stbi__err - error +// stbi__errpf - error returning pointer to float +// stbi__errpuc - error returning pointer to unsigned char + +#ifdef STBI_NO_FAILURE_STRINGS + #define stbi__err(x,y) 0 +#elif defined(STBI_FAILURE_USERMSG) + #define stbi__err(x,y) stbi__err(y) +#else + #define stbi__err(x,y) stbi__err(x) +#endif + +#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) +#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) + +STBIDEF void stbi_image_free(void *retval_from_stbi_load) +{ + STBI_FREE(retval_from_stbi_load); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); +#endif + +#ifndef STBI_NO_HDR +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); +#endif + +static int stbi__vertically_flip_on_load_global = 0; + +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load_global = flag_true_if_should_flip; +} + +#ifndef STBI_THREAD_LOCAL +#define stbi__vertically_flip_on_load stbi__vertically_flip_on_load_global +#else +static STBI_THREAD_LOCAL int stbi__vertically_flip_on_load_local, stbi__vertically_flip_on_load_set; + +STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load_local = flag_true_if_should_flip; + stbi__vertically_flip_on_load_set = 1; +} + +#define stbi__vertically_flip_on_load (stbi__vertically_flip_on_load_set \ + ? stbi__vertically_flip_on_load_local \ + : stbi__vertically_flip_on_load_global) +#endif // STBI_THREAD_LOCAL + +static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) +{ + memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields + ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed + ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order + ri->num_channels = 0; + + // test the formats with a very explicit header first (at least a FOURCC + // or distinctive magic number first) + #ifndef STBI_NO_PNG + if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_BMP + if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_GIF + if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_PSD + if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc); + #else + STBI_NOTUSED(bpc); + #endif + #ifndef STBI_NO_PIC + if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri); + #endif + + // then the formats that can end up attempting to load with just 1 or 2 + // bytes matching expectations; these are prone to false positives, so + // try them later + #ifndef STBI_NO_JPEG + if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri); + #endif + #ifndef STBI_NO_PNM + if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp, ri); + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri); + return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); + } + #endif + + #ifndef STBI_NO_TGA + // test tga last because it's a crappy test! + if (stbi__tga_test(s)) + return stbi__tga_load(s,x,y,comp,req_comp, ri); + #endif + + return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); +} + +static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels) +{ + int i; + int img_len = w * h * channels; + stbi_uc *reduced; + + reduced = (stbi_uc *) stbi__malloc(img_len); + if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory"); + + for (i = 0; i < img_len; ++i) + reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling + + STBI_FREE(orig); + return reduced; +} + +static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels) +{ + int i; + int img_len = w * h * channels; + stbi__uint16 *enlarged; + + enlarged = (stbi__uint16 *) stbi__malloc(img_len*2); + if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); + + for (i = 0; i < img_len; ++i) + enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff + + STBI_FREE(orig); + return enlarged; +} + +static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel) +{ + int row; + size_t bytes_per_row = (size_t)w * bytes_per_pixel; + stbi_uc temp[2048]; + stbi_uc *bytes = (stbi_uc *)image; + + for (row = 0; row < (h>>1); row++) { + stbi_uc *row0 = bytes + row*bytes_per_row; + stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row; + // swap row0 with row1 + size_t bytes_left = bytes_per_row; + while (bytes_left) { + size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp); + memcpy(temp, row0, bytes_copy); + memcpy(row0, row1, bytes_copy); + memcpy(row1, temp, bytes_copy); + row0 += bytes_copy; + row1 += bytes_copy; + bytes_left -= bytes_copy; + } + } +} + +#ifndef STBI_NO_GIF +static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel) +{ + int slice; + int slice_size = w * h * bytes_per_pixel; + + stbi_uc *bytes = (stbi_uc *)image; + for (slice = 0; slice < z; ++slice) { + stbi__vertical_flip(bytes, w, h, bytes_per_pixel); + bytes += slice_size; + } +} +#endif + +static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__result_info ri; + void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8); + + if (result == NULL) + return NULL; + + // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. + STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); + + if (ri.bits_per_channel != 8) { + result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp); + ri.bits_per_channel = 8; + } + + // @TODO: move stbi__convert_format to here + + if (stbi__vertically_flip_on_load) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc)); + } + + return (unsigned char *) result; +} + +static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__result_info ri; + void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16); + + if (result == NULL) + return NULL; + + // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. + STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); + + if (ri.bits_per_channel != 16) { + result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp); + ri.bits_per_channel = 16; + } + + // @TODO: move stbi__convert_format16 to here + // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision + + if (stbi__vertically_flip_on_load) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16)); + } + + return (stbi__uint16 *) result; +} + +#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR) +static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) +{ + if (stbi__vertically_flip_on_load && result != NULL) { + int channels = req_comp ? req_comp : *comp; + stbi__vertical_flip(result, *x, *y, channels * sizeof(float)); + } +} +#endif + +#ifndef STBI_NO_STDIO + +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) +STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); +STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); +#endif + +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) +STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) +{ + return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); +} +#endif + +static FILE *stbi__fopen(char const *filename, char const *mode) +{ + FILE *f; +#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) + wchar_t wMode[64]; + wchar_t wFilename[1024]; + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename))) + return 0; + + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode))) + return 0; + +#if defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != _wfopen_s(&f, wFilename, wMode)) + f = 0; +#else + f = _wfopen(wFilename, wMode); +#endif + +#elif defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != fopen_s(&f, filename, mode)) + f=0; +#else + f = fopen(filename, mode); +#endif + return f; +} + + +STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + unsigned char *result; + if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} + +STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__uint16 *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} + +STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + stbi__uint16 *result; + if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file_16(f,x,y,comp,req_comp); + fclose(f); + return result; +} + + +#endif //!STBI_NO_STDIO + +STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); +} + +STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); + return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); +} + +STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); +} + +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_GIF +STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_mem(&s,buffer,len); + + result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp); + if (stbi__vertically_flip_on_load) { + stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); + } + + return result; +} +#endif + +#ifndef STBI_NO_LINEAR +static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *data; + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + stbi__result_info ri; + float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri); + if (hdr_data) + stbi__float_postprocess(hdr_data,x,y,comp,req_comp); + return hdr_data; + } + #endif + data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp); + if (data) + return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); + return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); +} + +STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_STDIO +STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + float *result; + FILE *f = stbi__fopen(filename, "rb"); + if (!f) return stbi__errpf("can't fopen", "Unable to open file"); + result = stbi_loadf_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_file(&s,f); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} +#endif // !STBI_NO_STDIO + +#endif // !STBI_NO_LINEAR + +// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is +// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always +// reports false! + +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(buffer); + STBI_NOTUSED(len); + return 0; + #endif +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result=0; + if (f) { + result = stbi_is_hdr_from_file(f); + fclose(f); + } + return result; +} + +STBIDEF int stbi_is_hdr_from_file(FILE *f) +{ + #ifndef STBI_NO_HDR + long pos = ftell(f); + int res; + stbi__context s; + stbi__start_file(&s,f); + res = stbi__hdr_test(&s); + fseek(f, pos, SEEK_SET); + return res; + #else + STBI_NOTUSED(f); + return 0; + #endif +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(clbk); + STBI_NOTUSED(user); + return 0; + #endif +} + +#ifndef STBI_NO_LINEAR +static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; + +STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } +STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } +#endif + +static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; + +STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } +STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } + + +////////////////////////////////////////////////////////////////////////////// +// +// Common code used by all image loaders +// + +enum +{ + STBI__SCAN_load=0, + STBI__SCAN_type, + STBI__SCAN_header +}; + +static void stbi__refill_buffer(stbi__context *s) +{ + int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); + s->callback_already_read += (int) (s->img_buffer - s->img_buffer_original); + if (n == 0) { + // at end of file, treat same as if from memory, but need to handle case + // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file + s->read_from_callbacks = 0; + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start+1; + *s->img_buffer = 0; + } else { + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start + n; + } +} + +stbi_inline static stbi_uc stbi__get8(stbi__context *s) +{ + if (s->img_buffer < s->img_buffer_end) + return *s->img_buffer++; + if (s->read_from_callbacks) { + stbi__refill_buffer(s); + return *s->img_buffer++; + } + return 0; +} + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_HDR) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +stbi_inline static int stbi__at_eof(stbi__context *s) +{ + if (s->io.read) { + if (!(s->io.eof)(s->io_user_data)) return 0; + // if feof() is true, check if buffer = end + // special case: we've only got the special 0 character at the end + if (s->read_from_callbacks == 0) return 1; + } + + return s->img_buffer >= s->img_buffer_end; +} +#endif + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) +// nothing +#else +static void stbi__skip(stbi__context *s, int n) +{ + if (n == 0) return; // already there! + if (n < 0) { + s->img_buffer = s->img_buffer_end; + return; + } + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + s->img_buffer = s->img_buffer_end; + (s->io.skip)(s->io_user_data, n - blen); + return; + } + } + s->img_buffer += n; +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_TGA) && defined(STBI_NO_HDR) && defined(STBI_NO_PNM) +// nothing +#else +static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) +{ + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + int res, count; + + memcpy(buffer, s->img_buffer, blen); + + count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); + res = (count == (n-blen)); + s->img_buffer = s->img_buffer_end; + return res; + } + } + + if (s->img_buffer+n <= s->img_buffer_end) { + memcpy(buffer, s->img_buffer, n); + s->img_buffer += n; + return 1; + } else + return 0; +} +#endif + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) +// nothing +#else +static int stbi__get16be(stbi__context *s) +{ + int z = stbi__get8(s); + return (z << 8) + stbi__get8(s); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) +// nothing +#else +static stbi__uint32 stbi__get32be(stbi__context *s) +{ + stbi__uint32 z = stbi__get16be(s); + return (z << 16) + stbi__get16be(s); +} +#endif + +#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) +// nothing +#else +static int stbi__get16le(stbi__context *s) +{ + int z = stbi__get8(s); + return z + (stbi__get8(s) << 8); +} +#endif + +#ifndef STBI_NO_BMP +static stbi__uint32 stbi__get32le(stbi__context *s) +{ + stbi__uint32 z = stbi__get16le(s); + z += (stbi__uint32)stbi__get16le(s) << 16; + return z; +} +#endif + +#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings + +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +////////////////////////////////////////////////////////////////////////////// +// +// generic converter from built-in img_n to req_comp +// individual types do this automatically as much as possible (e.g. jpeg +// does all cases internally since it needs to colorspace convert anyway, +// and it never has alpha, so very few cases ). png can automatically +// interleave an alpha=255 channel, but falls back to this for other cases +// +// assume data buffer is malloced, so malloc a new one and free that one +// only failure mode is malloc failing + +static stbi_uc stbi__compute_y(int r, int g, int b) +{ + return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else +static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + unsigned char *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0); + if (good == NULL) { + STBI_FREE(data); + return stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + unsigned char *src = data + j * x * img_n ; + unsigned char *dest = good + j * x * req_comp; + + #define STBI__COMBO(a,b) ((a)*8+(b)) + #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (STBI__COMBO(img_n, req_comp)) { + STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=255; } break; + STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=255; } break; + STBI__CASE(2,1) { dest[0]=src[0]; } break; + STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; + STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=255; } break; + STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; + STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = 255; } break; + STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; + STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break; + STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; + default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return stbi__errpuc("unsupported", "Unsupported format conversion"); + } + #undef STBI__CASE + } + + STBI_FREE(data); + return good; +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) +// nothing +#else +static stbi__uint16 stbi__compute_y_16(int r, int g, int b) +{ + return (stbi__uint16) (((r*77) + (g*150) + (29*b)) >> 8); +} +#endif + +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) +// nothing +#else +static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + stbi__uint16 *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2); + if (good == NULL) { + STBI_FREE(data); + return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + stbi__uint16 *src = data + j * x * img_n ; + stbi__uint16 *dest = good + j * x * req_comp; + + #define STBI__COMBO(a,b) ((a)*8+(b)) + #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (STBI__COMBO(img_n, req_comp)) { + STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=0xffff; } break; + STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=0xffff; } break; + STBI__CASE(2,1) { dest[0]=src[0]; } break; + STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; + STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; + STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=0xffff; } break; + STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; + STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = 0xffff; } break; + STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; + STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break; + STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; + default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return (stbi__uint16*) stbi__errpuc("unsupported", "Unsupported format conversion"); + } + #undef STBI__CASE + } + + STBI_FREE(data); + return good; +} +#endif + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) +{ + int i,k,n; + float *output; + if (!data) return NULL; + output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0); + if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); + } + } + if (n < comp) { + for (i=0; i < x*y; ++i) { + output[i*comp + n] = data[i*comp + n]/255.0f; + } + } + STBI_FREE(data); + return output; +} +#endif + +#ifndef STBI_NO_HDR +#define stbi__float2int(x) ((int) (x)) +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) +{ + int i,k,n; + stbi_uc *output; + if (!data) return NULL; + output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0); + if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + if (k < comp) { + float z = data[i*comp+k] * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + } + STBI_FREE(data); + return output; +} +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// "baseline" JPEG/JFIF decoder +// +// simple implementation +// - doesn't support delayed output of y-dimension +// - simple interface (only one output format: 8-bit interleaved RGB) +// - doesn't try to recover corrupt jpegs +// - doesn't allow partial loading, loading multiple at once +// - still fast on x86 (copying globals into locals doesn't help x86) +// - allocates lots of intermediate memory (full size of all components) +// - non-interleaved case requires this anyway +// - allows good upsampling (see next) +// high-quality +// - upsampled channels are bilinearly interpolated, even across blocks +// - quality integer IDCT derived from IJG's 'slow' +// performance +// - fast huffman; reasonable integer IDCT +// - some SIMD kernels for common paths on targets with SSE2/NEON +// - uses a lot of intermediate memory, could cache poorly + +#ifndef STBI_NO_JPEG + +// huffman decoding acceleration +#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache + +typedef struct +{ + stbi_uc fast[1 << FAST_BITS]; + // weirdly, repacking this into AoS is a 10% speed loss, instead of a win + stbi__uint16 code[256]; + stbi_uc values[256]; + stbi_uc size[257]; + unsigned int maxcode[18]; + int delta[17]; // old 'firstsymbol' - old 'firstcode' +} stbi__huffman; + +typedef struct +{ + stbi__context *s; + stbi__huffman huff_dc[4]; + stbi__huffman huff_ac[4]; + stbi__uint16 dequant[4][64]; + stbi__int16 fast_ac[4][1 << FAST_BITS]; + +// sizes for components, interleaved MCUs + int img_h_max, img_v_max; + int img_mcu_x, img_mcu_y; + int img_mcu_w, img_mcu_h; + +// definition of jpeg image component + struct + { + int id; + int h,v; + int tq; + int hd,ha; + int dc_pred; + + int x,y,w2,h2; + stbi_uc *data; + void *raw_data, *raw_coeff; + stbi_uc *linebuf; + short *coeff; // progressive only + int coeff_w, coeff_h; // number of 8x8 coefficient blocks + } img_comp[4]; + + stbi__uint32 code_buffer; // jpeg entropy-coded buffer + int code_bits; // number of valid bits + unsigned char marker; // marker seen while filling entropy buffer + int nomore; // flag if we saw a marker so must stop + + int progressive; + int spec_start; + int spec_end; + int succ_high; + int succ_low; + int eob_run; + int jfif; + int app14_color_transform; // Adobe APP14 tag + int rgb; + + int scan_n, order[4]; + int restart_interval, todo; + +// kernels + void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); + void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); + stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); +} stbi__jpeg; + +static int stbi__build_huffman(stbi__huffman *h, int *count) +{ + int i,j,k=0; + unsigned int code; + // build size list for each symbol (from JPEG spec) + for (i=0; i < 16; ++i) { + for (j=0; j < count[i]; ++j) { + h->size[k++] = (stbi_uc) (i+1); + if(k >= 257) return stbi__err("bad size list","Corrupt JPEG"); + } + } + h->size[k] = 0; + + // compute actual symbols (from jpeg spec) + code = 0; + k = 0; + for(j=1; j <= 16; ++j) { + // compute delta to add to code to compute symbol id + h->delta[j] = k - code; + if (h->size[k] == j) { + while (h->size[k] == j) + h->code[k++] = (stbi__uint16) (code++); + if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG"); + } + // compute largest code + 1 for this size, preshifted as needed later + h->maxcode[j] = code << (16-j); + code <<= 1; + } + h->maxcode[j] = 0xffffffff; + + // build non-spec acceleration table; 255 is flag for not-accelerated + memset(h->fast, 255, 1 << FAST_BITS); + for (i=0; i < k; ++i) { + int s = h->size[i]; + if (s <= FAST_BITS) { + int c = h->code[i] << (FAST_BITS-s); + int m = 1 << (FAST_BITS-s); + for (j=0; j < m; ++j) { + h->fast[c+j] = (stbi_uc) i; + } + } + } + return 1; +} + +// build a table that decodes both magnitude and value of small ACs in +// one go. +static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) +{ + int i; + for (i=0; i < (1 << FAST_BITS); ++i) { + stbi_uc fast = h->fast[i]; + fast_ac[i] = 0; + if (fast < 255) { + int rs = h->values[fast]; + int run = (rs >> 4) & 15; + int magbits = rs & 15; + int len = h->size[fast]; + + if (magbits && len + magbits <= FAST_BITS) { + // magnitude code followed by receive_extend code + int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); + int m = 1 << (magbits - 1); + if (k < m) k += (~0U << magbits) + 1; + // if the result is small enough, we can fit it in fast_ac table + if (k >= -128 && k <= 127) + fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits)); + } + } + } +} + +static void stbi__grow_buffer_unsafe(stbi__jpeg *j) +{ + do { + unsigned int b = j->nomore ? 0 : stbi__get8(j->s); + if (b == 0xff) { + int c = stbi__get8(j->s); + while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes + if (c != 0) { + j->marker = (unsigned char) c; + j->nomore = 1; + return; + } + } + j->code_buffer |= b << (24 - j->code_bits); + j->code_bits += 8; + } while (j->code_bits <= 24); +} + +// (1 << n) - 1 +static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; + +// decode a jpeg huffman value from the bitstream +stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) +{ + unsigned int temp; + int c,k; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + // look at the top FAST_BITS and determine what symbol ID it is, + // if the code is <= FAST_BITS + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + k = h->fast[c]; + if (k < 255) { + int s = h->size[k]; + if (s > j->code_bits) + return -1; + j->code_buffer <<= s; + j->code_bits -= s; + return h->values[k]; + } + + // naive test is to shift the code_buffer down so k bits are + // valid, then test against maxcode. To speed this up, we've + // preshifted maxcode left so that it has (16-k) 0s at the + // end; in other words, regardless of the number of bits, it + // wants to be compared against something shifted to have 16; + // that way we don't need to shift inside the loop. + temp = j->code_buffer >> 16; + for (k=FAST_BITS+1 ; ; ++k) + if (temp < h->maxcode[k]) + break; + if (k == 17) { + // error! code not found + j->code_bits -= 16; + return -1; + } + + if (k > j->code_bits) + return -1; + + // convert the huffman code to the symbol id + c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; + if(c < 0 || c >= 256) // symbol id out of bounds! + return -1; + STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); + + // convert the id to a symbol + j->code_bits -= k; + j->code_buffer <<= k; + return h->values[c]; +} + +// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing + + sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative) + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k + (stbi__jbias[n] & (sgn - 1)); +} + +// get some unsigned bits +stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) +{ + unsigned int k; + if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k; +} + +stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) +{ + unsigned int k; + if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); + if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s intead of continuing + k = j->code_buffer; + j->code_buffer <<= 1; + --j->code_bits; + return k & 0x80000000; +} + +// given a value that's at position X in the zigzag stream, +// where does it appear in the 8x8 matrix coded as row-major? +static const stbi_uc stbi__jpeg_dezigzag[64+15] = +{ + 0, 1, 8, 16, 9, 2, 3, 10, + 17, 24, 32, 25, 18, 11, 4, 5, + 12, 19, 26, 33, 40, 48, 41, 34, + 27, 20, 13, 6, 7, 14, 21, 28, + 35, 42, 49, 56, 57, 50, 43, 36, + 29, 22, 15, 23, 30, 37, 44, 51, + 58, 59, 52, 45, 38, 31, 39, 46, + 53, 60, 61, 54, 47, 55, 62, 63, + // let corrupt input sample past end + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63 +}; + +// decode one 64-entry block-- +static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant) +{ + int diff,dc,k; + int t; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0 || t > 15) return stbi__err("bad huffman code","Corrupt JPEG"); + + // 0 all the ac values now so we can do it 32-bits at a time + memset(data,0,64*sizeof(data[0])); + + diff = t ? stbi__extend_receive(j, t) : 0; + if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta","Corrupt JPEG"); + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + if (!stbi__mul2shorts_valid(dc, dequant[0])) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + data[0] = (short) (dc * dequant[0]); + + // decode AC components, see JPEG spec + k = 1; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); + j->code_buffer <<= s; + j->code_bits -= s; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * dequant[zig]); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (rs != 0xf0) break; // end block + k += 16; + } else { + k += r; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); + } + } + } while (k < 64); + return 1; +} + +static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) +{ + int diff,dc; + int t; + if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + if (j->succ_high == 0) { + // first scan for DC coefficient, must be first + memset(data,0,64*sizeof(data[0])); // 0 all the ac values now + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + diff = t ? stbi__extend_receive(j, t) : 0; + + if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta", "Corrupt JPEG"); + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + if (!stbi__mul2shorts_valid(dc, 1 << j->succ_low)) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + data[0] = (short) (dc * (1 << j->succ_low)); + } else { + // refinement scan for DC coefficient + if (stbi__jpeg_get_bit(j)) + data[0] += (short) (1 << j->succ_low); + } + return 1; +} + +// @OPTIMIZE: store non-zigzagged during the decode passes, +// and only de-zigzag when dequantizing +static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) +{ + int k; + if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->succ_high == 0) { + int shift = j->succ_low; + + if (j->eob_run) { + --j->eob_run; + return 1; + } + + k = j->spec_start; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); + j->code_buffer <<= s; + j->code_bits -= s; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * (1 << shift)); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r); + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + --j->eob_run; + break; + } + k += 16; + } else { + k += r; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * (1 << shift)); + } + } + } while (k <= j->spec_end); + } else { + // refinement scan for these AC coefficients + + short bit = (short) (1 << j->succ_low); + + if (j->eob_run) { + --j->eob_run; + for (k = j->spec_start; k <= j->spec_end; ++k) { + short *p = &data[stbi__jpeg_dezigzag[k]]; + if (*p != 0) + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } + } else { + k = j->spec_start; + do { + int r,s; + int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r) - 1; + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + r = 64; // force end of block + } else { + // r=15 s=0 should write 16 0s, so we just do + // a run of 15 0s and then write s (which is 0), + // so we don't have to do anything special here + } + } else { + if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); + // sign bit + if (stbi__jpeg_get_bit(j)) + s = bit; + else + s = -bit; + } + + // advance by r + while (k <= j->spec_end) { + short *p = &data[stbi__jpeg_dezigzag[k++]]; + if (*p != 0) { + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } else { + if (r == 0) { + *p = (short) s; + break; + } + --r; + } + } + } while (k <= j->spec_end); + } + } + return 1; +} + +// take a -128..127 value and stbi__clamp it and convert to 0..255 +stbi_inline static stbi_uc stbi__clamp(int x) +{ + // trick to use a single test to catch both cases + if ((unsigned int) x > 255) { + if (x < 0) return 0; + if (x > 255) return 255; + } + return (stbi_uc) x; +} + +#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) +#define stbi__fsh(x) ((x) * 4096) + +// derived from jidctint -- DCT_ISLOW +#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ + int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ + p2 = s2; \ + p3 = s6; \ + p1 = (p2+p3) * stbi__f2f(0.5411961f); \ + t2 = p1 + p3*stbi__f2f(-1.847759065f); \ + t3 = p1 + p2*stbi__f2f( 0.765366865f); \ + p2 = s0; \ + p3 = s4; \ + t0 = stbi__fsh(p2+p3); \ + t1 = stbi__fsh(p2-p3); \ + x0 = t0+t3; \ + x3 = t0-t3; \ + x1 = t1+t2; \ + x2 = t1-t2; \ + t0 = s7; \ + t1 = s5; \ + t2 = s3; \ + t3 = s1; \ + p3 = t0+t2; \ + p4 = t1+t3; \ + p1 = t0+t3; \ + p2 = t1+t2; \ + p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ + t0 = t0*stbi__f2f( 0.298631336f); \ + t1 = t1*stbi__f2f( 2.053119869f); \ + t2 = t2*stbi__f2f( 3.072711026f); \ + t3 = t3*stbi__f2f( 1.501321110f); \ + p1 = p5 + p1*stbi__f2f(-0.899976223f); \ + p2 = p5 + p2*stbi__f2f(-2.562915447f); \ + p3 = p3*stbi__f2f(-1.961570560f); \ + p4 = p4*stbi__f2f(-0.390180644f); \ + t3 += p1+p4; \ + t2 += p2+p3; \ + t1 += p2+p4; \ + t0 += p1+p3; + +static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) +{ + int i,val[64],*v=val; + stbi_uc *o; + short *d = data; + + // columns + for (i=0; i < 8; ++i,++d, ++v) { + // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing + if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 + && d[40]==0 && d[48]==0 && d[56]==0) { + // no shortcut 0 seconds + // (1|2|3|4|5|6|7)==0 0 seconds + // all separate -0.047 seconds + // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds + int dcterm = d[0]*4; + v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; + } else { + STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) + // constants scaled things up by 1<<12; let's bring them back + // down, but keep 2 extra bits of precision + x0 += 512; x1 += 512; x2 += 512; x3 += 512; + v[ 0] = (x0+t3) >> 10; + v[56] = (x0-t3) >> 10; + v[ 8] = (x1+t2) >> 10; + v[48] = (x1-t2) >> 10; + v[16] = (x2+t1) >> 10; + v[40] = (x2-t1) >> 10; + v[24] = (x3+t0) >> 10; + v[32] = (x3-t0) >> 10; + } + } + + for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { + // no fast case since the first 1D IDCT spread components out + STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) + // constants scaled things up by 1<<12, plus we had 1<<2 from first + // loop, plus horizontal and vertical each scale by sqrt(8) so together + // we've got an extra 1<<3, so 1<<17 total we need to remove. + // so we want to round that, which means adding 0.5 * 1<<17, + // aka 65536. Also, we'll end up with -128 to 127 that we want + // to encode as 0..255 by adding 128, so we'll add that before the shift + x0 += 65536 + (128<<17); + x1 += 65536 + (128<<17); + x2 += 65536 + (128<<17); + x3 += 65536 + (128<<17); + // tried computing the shifts into temps, or'ing the temps to see + // if any were out of range, but that was slower + o[0] = stbi__clamp((x0+t3) >> 17); + o[7] = stbi__clamp((x0-t3) >> 17); + o[1] = stbi__clamp((x1+t2) >> 17); + o[6] = stbi__clamp((x1-t2) >> 17); + o[2] = stbi__clamp((x2+t1) >> 17); + o[5] = stbi__clamp((x2-t1) >> 17); + o[3] = stbi__clamp((x3+t0) >> 17); + o[4] = stbi__clamp((x3-t0) >> 17); + } +} + +#ifdef STBI_SSE2 +// sse2 integer IDCT. not the fastest possible implementation but it +// produces bit-identical results to the generic C version so it's +// fully "transparent". +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + // This is constructed to match our regular (generic) integer IDCT exactly. + __m128i row0, row1, row2, row3, row4, row5, row6, row7; + __m128i tmp; + + // dot product constant: even elems=x, odd elems=y + #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) + + // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) + // out(1) = c1[even]*x + c1[odd]*y + #define dct_rot(out0,out1, x,y,c0,c1) \ + __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ + __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ + __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ + __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ + __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ + __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) + + // out = in << 12 (in 16-bit, out 32-bit) + #define dct_widen(out, in) \ + __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ + __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) + + // wide add + #define dct_wadd(out, a, b) \ + __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_add_epi32(a##_h, b##_h) + + // wide sub + #define dct_wsub(out, a, b) \ + __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) + + // butterfly a/b, add bias, then shift by "s" and pack + #define dct_bfly32o(out0, out1, a,b,bias,s) \ + { \ + __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ + __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ + dct_wadd(sum, abiased, b); \ + dct_wsub(dif, abiased, b); \ + out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ + out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ + } + + // 8-bit interleave step (for transposes) + #define dct_interleave8(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi8(a, b); \ + b = _mm_unpackhi_epi8(tmp, b) + + // 16-bit interleave step (for transposes) + #define dct_interleave16(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi16(a, b); \ + b = _mm_unpackhi_epi16(tmp, b) + + #define dct_pass(bias,shift) \ + { \ + /* even part */ \ + dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ + __m128i sum04 = _mm_add_epi16(row0, row4); \ + __m128i dif04 = _mm_sub_epi16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ + dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ + __m128i sum17 = _mm_add_epi16(row1, row7); \ + __m128i sum35 = _mm_add_epi16(row3, row5); \ + dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ + dct_wadd(x4, y0o, y4o); \ + dct_wadd(x5, y1o, y5o); \ + dct_wadd(x6, y2o, y5o); \ + dct_wadd(x7, y3o, y4o); \ + dct_bfly32o(row0,row7, x0,x7,bias,shift); \ + dct_bfly32o(row1,row6, x1,x6,bias,shift); \ + dct_bfly32o(row2,row5, x2,x5,bias,shift); \ + dct_bfly32o(row3,row4, x3,x4,bias,shift); \ + } + + __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); + __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); + __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); + __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); + __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); + __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); + __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); + __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); + + // rounding biases in column/row passes, see stbi__idct_block for explanation. + __m128i bias_0 = _mm_set1_epi32(512); + __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); + + // load + row0 = _mm_load_si128((const __m128i *) (data + 0*8)); + row1 = _mm_load_si128((const __m128i *) (data + 1*8)); + row2 = _mm_load_si128((const __m128i *) (data + 2*8)); + row3 = _mm_load_si128((const __m128i *) (data + 3*8)); + row4 = _mm_load_si128((const __m128i *) (data + 4*8)); + row5 = _mm_load_si128((const __m128i *) (data + 5*8)); + row6 = _mm_load_si128((const __m128i *) (data + 6*8)); + row7 = _mm_load_si128((const __m128i *) (data + 7*8)); + + // column pass + dct_pass(bias_0, 10); + + { + // 16bit 8x8 transpose pass 1 + dct_interleave16(row0, row4); + dct_interleave16(row1, row5); + dct_interleave16(row2, row6); + dct_interleave16(row3, row7); + + // transpose pass 2 + dct_interleave16(row0, row2); + dct_interleave16(row1, row3); + dct_interleave16(row4, row6); + dct_interleave16(row5, row7); + + // transpose pass 3 + dct_interleave16(row0, row1); + dct_interleave16(row2, row3); + dct_interleave16(row4, row5); + dct_interleave16(row6, row7); + } + + // row pass + dct_pass(bias_1, 17); + + { + // pack + __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 + __m128i p1 = _mm_packus_epi16(row2, row3); + __m128i p2 = _mm_packus_epi16(row4, row5); + __m128i p3 = _mm_packus_epi16(row6, row7); + + // 8bit 8x8 transpose pass 1 + dct_interleave8(p0, p2); // a0e0a1e1... + dct_interleave8(p1, p3); // c0g0c1g1... + + // transpose pass 2 + dct_interleave8(p0, p1); // a0c0e0g0... + dct_interleave8(p2, p3); // b0d0f0h0... + + // transpose pass 3 + dct_interleave8(p0, p2); // a0b0c0d0... + dct_interleave8(p1, p3); // a4b4c4d4... + + // store + _mm_storel_epi64((__m128i *) out, p0); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p2); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p1); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p3); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); + } + +#undef dct_const +#undef dct_rot +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_interleave8 +#undef dct_interleave16 +#undef dct_pass +} + +#endif // STBI_SSE2 + +#ifdef STBI_NEON + +// NEON integer IDCT. should produce bit-identical +// results to the generic C version. +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; + + int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); + int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); + int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); + int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); + int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); + int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); + int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); + int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); + int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); + int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); + int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); + int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); + +#define dct_long_mul(out, inq, coeff) \ + int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) + +#define dct_long_mac(out, acc, inq, coeff) \ + int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) + +#define dct_widen(out, inq) \ + int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ + int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) + +// wide add +#define dct_wadd(out, a, b) \ + int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vaddq_s32(a##_h, b##_h) + +// wide sub +#define dct_wsub(out, a, b) \ + int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vsubq_s32(a##_h, b##_h) + +// butterfly a/b, then shift using "shiftop" by "s" and pack +#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ + { \ + dct_wadd(sum, a, b); \ + dct_wsub(dif, a, b); \ + out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ + out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ + } + +#define dct_pass(shiftop, shift) \ + { \ + /* even part */ \ + int16x8_t sum26 = vaddq_s16(row2, row6); \ + dct_long_mul(p1e, sum26, rot0_0); \ + dct_long_mac(t2e, p1e, row6, rot0_1); \ + dct_long_mac(t3e, p1e, row2, rot0_2); \ + int16x8_t sum04 = vaddq_s16(row0, row4); \ + int16x8_t dif04 = vsubq_s16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + int16x8_t sum15 = vaddq_s16(row1, row5); \ + int16x8_t sum17 = vaddq_s16(row1, row7); \ + int16x8_t sum35 = vaddq_s16(row3, row5); \ + int16x8_t sum37 = vaddq_s16(row3, row7); \ + int16x8_t sumodd = vaddq_s16(sum17, sum35); \ + dct_long_mul(p5o, sumodd, rot1_0); \ + dct_long_mac(p1o, p5o, sum17, rot1_1); \ + dct_long_mac(p2o, p5o, sum35, rot1_2); \ + dct_long_mul(p3o, sum37, rot2_0); \ + dct_long_mul(p4o, sum15, rot2_1); \ + dct_wadd(sump13o, p1o, p3o); \ + dct_wadd(sump24o, p2o, p4o); \ + dct_wadd(sump23o, p2o, p3o); \ + dct_wadd(sump14o, p1o, p4o); \ + dct_long_mac(x4, sump13o, row7, rot3_0); \ + dct_long_mac(x5, sump24o, row5, rot3_1); \ + dct_long_mac(x6, sump23o, row3, rot3_2); \ + dct_long_mac(x7, sump14o, row1, rot3_3); \ + dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ + dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ + dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ + dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ + } + + // load + row0 = vld1q_s16(data + 0*8); + row1 = vld1q_s16(data + 1*8); + row2 = vld1q_s16(data + 2*8); + row3 = vld1q_s16(data + 3*8); + row4 = vld1q_s16(data + 4*8); + row5 = vld1q_s16(data + 5*8); + row6 = vld1q_s16(data + 6*8); + row7 = vld1q_s16(data + 7*8); + + // add DC bias + row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); + + // column pass + dct_pass(vrshrn_n_s32, 10); + + // 16bit 8x8 transpose + { +// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. +// whether compilers actually get this is another story, sadly. +#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } +#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } + + // pass 1 + dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 + dct_trn16(row2, row3); + dct_trn16(row4, row5); + dct_trn16(row6, row7); + + // pass 2 + dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 + dct_trn32(row1, row3); + dct_trn32(row4, row6); + dct_trn32(row5, row7); + + // pass 3 + dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 + dct_trn64(row1, row5); + dct_trn64(row2, row6); + dct_trn64(row3, row7); + +#undef dct_trn16 +#undef dct_trn32 +#undef dct_trn64 + } + + // row pass + // vrshrn_n_s32 only supports shifts up to 16, we need + // 17. so do a non-rounding shift of 16 first then follow + // up with a rounding shift by 1. + dct_pass(vshrn_n_s32, 16); + + { + // pack and round + uint8x8_t p0 = vqrshrun_n_s16(row0, 1); + uint8x8_t p1 = vqrshrun_n_s16(row1, 1); + uint8x8_t p2 = vqrshrun_n_s16(row2, 1); + uint8x8_t p3 = vqrshrun_n_s16(row3, 1); + uint8x8_t p4 = vqrshrun_n_s16(row4, 1); + uint8x8_t p5 = vqrshrun_n_s16(row5, 1); + uint8x8_t p6 = vqrshrun_n_s16(row6, 1); + uint8x8_t p7 = vqrshrun_n_s16(row7, 1); + + // again, these can translate into one instruction, but often don't. +#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } +#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } + + // sadly can't use interleaved stores here since we only write + // 8 bytes to each scan line! + + // 8x8 8-bit transpose pass 1 + dct_trn8_8(p0, p1); + dct_trn8_8(p2, p3); + dct_trn8_8(p4, p5); + dct_trn8_8(p6, p7); + + // pass 2 + dct_trn8_16(p0, p2); + dct_trn8_16(p1, p3); + dct_trn8_16(p4, p6); + dct_trn8_16(p5, p7); + + // pass 3 + dct_trn8_32(p0, p4); + dct_trn8_32(p1, p5); + dct_trn8_32(p2, p6); + dct_trn8_32(p3, p7); + + // store + vst1_u8(out, p0); out += out_stride; + vst1_u8(out, p1); out += out_stride; + vst1_u8(out, p2); out += out_stride; + vst1_u8(out, p3); out += out_stride; + vst1_u8(out, p4); out += out_stride; + vst1_u8(out, p5); out += out_stride; + vst1_u8(out, p6); out += out_stride; + vst1_u8(out, p7); + +#undef dct_trn8_8 +#undef dct_trn8_16 +#undef dct_trn8_32 + } + +#undef dct_long_mul +#undef dct_long_mac +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_pass +} + +#endif // STBI_NEON + +#define STBI__MARKER_none 0xff +// if there's a pending marker from the entropy stream, return that +// otherwise, fetch from the stream and get a marker. if there's no +// marker, return 0xff, which is never a valid marker value +static stbi_uc stbi__get_marker(stbi__jpeg *j) +{ + stbi_uc x; + if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } + x = stbi__get8(j->s); + if (x != 0xff) return STBI__MARKER_none; + while (x == 0xff) + x = stbi__get8(j->s); // consume repeated 0xff fill bytes + return x; +} + +// in each scan, we'll have scan_n components, and the order +// of the components is specified by order[] +#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) + +// after a restart interval, stbi__jpeg_reset the entropy decoder and +// the dc prediction +static void stbi__jpeg_reset(stbi__jpeg *j) +{ + j->code_bits = 0; + j->code_buffer = 0; + j->nomore = 0; + j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0; + j->marker = STBI__MARKER_none; + j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; + j->eob_run = 0; + // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, + // since we don't even allow 1<<30 pixels +} + +static int stbi__parse_entropy_coded_data(stbi__jpeg *z) +{ + stbi__jpeg_reset(z); + if (!z->progressive) { + if (z->scan_n == 1) { + int i,j; + STBI_SIMD_ALIGN(short, data[64]); + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + // if it's NOT a restart, then just bail, so we get corrupt data + // rather than no data + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + STBI_SIMD_ALIGN(short, data[64]); + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x)*8; + int y2 = (j*z->img_comp[n].v + y)*8; + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } else { + if (z->scan_n == 1) { + int i,j; + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + if (z->spec_start == 0) { + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } else { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) + return 0; + } + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x); + int y2 = (j*z->img_comp[n].v + y); + short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } +} + +static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant) +{ + int i; + for (i=0; i < 64; ++i) + data[i] *= dequant[i]; +} + +static void stbi__jpeg_finish(stbi__jpeg *z) +{ + if (z->progressive) { + // dequantize and idct the data + int i,j,n; + for (n=0; n < z->s->img_n; ++n) { + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + } + } + } + } +} + +static int stbi__process_marker(stbi__jpeg *z, int m) +{ + int L; + switch (m) { + case STBI__MARKER_none: // no marker found + return stbi__err("expected marker","Corrupt JPEG"); + + case 0xDD: // DRI - specify restart interval + if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); + z->restart_interval = stbi__get16be(z->s); + return 1; + + case 0xDB: // DQT - define quantization table + L = stbi__get16be(z->s)-2; + while (L > 0) { + int q = stbi__get8(z->s); + int p = q >> 4, sixteen = (p != 0); + int t = q & 15,i; + if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG"); + if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); + + for (i=0; i < 64; ++i) + z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s)); + L -= (sixteen ? 129 : 65); + } + return L==0; + + case 0xC4: // DHT - define huffman table + L = stbi__get16be(z->s)-2; + while (L > 0) { + stbi_uc *v; + int sizes[16],i,n=0; + int q = stbi__get8(z->s); + int tc = q >> 4; + int th = q & 15; + if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); + for (i=0; i < 16; ++i) { + sizes[i] = stbi__get8(z->s); + n += sizes[i]; + } + if(n > 256) return stbi__err("bad DHT header","Corrupt JPEG"); // Loop over i < n would write past end of values! + L -= 17; + if (tc == 0) { + if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; + v = z->huff_dc[th].values; + } else { + if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; + v = z->huff_ac[th].values; + } + for (i=0; i < n; ++i) + v[i] = stbi__get8(z->s); + if (tc != 0) + stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); + L -= n; + } + return L==0; + } + + // check for comment block or APP blocks + if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { + L = stbi__get16be(z->s); + if (L < 2) { + if (m == 0xFE) + return stbi__err("bad COM len","Corrupt JPEG"); + else + return stbi__err("bad APP len","Corrupt JPEG"); + } + L -= 2; + + if (m == 0xE0 && L >= 5) { // JFIF APP0 segment + static const unsigned char tag[5] = {'J','F','I','F','\0'}; + int ok = 1; + int i; + for (i=0; i < 5; ++i) + if (stbi__get8(z->s) != tag[i]) + ok = 0; + L -= 5; + if (ok) + z->jfif = 1; + } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment + static const unsigned char tag[6] = {'A','d','o','b','e','\0'}; + int ok = 1; + int i; + for (i=0; i < 6; ++i) + if (stbi__get8(z->s) != tag[i]) + ok = 0; + L -= 6; + if (ok) { + stbi__get8(z->s); // version + stbi__get16be(z->s); // flags0 + stbi__get16be(z->s); // flags1 + z->app14_color_transform = stbi__get8(z->s); // color transform + L -= 6; + } + } + + stbi__skip(z->s, L); + return 1; + } + + return stbi__err("unknown marker","Corrupt JPEG"); +} + +// after we see SOS +static int stbi__process_scan_header(stbi__jpeg *z) +{ + int i; + int Ls = stbi__get16be(z->s); + z->scan_n = stbi__get8(z->s); + if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); + if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); + for (i=0; i < z->scan_n; ++i) { + int id = stbi__get8(z->s), which; + int q = stbi__get8(z->s); + for (which = 0; which < z->s->img_n; ++which) + if (z->img_comp[which].id == id) + break; + if (which == z->s->img_n) return 0; // no match + z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); + z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); + z->order[i] = which; + } + + { + int aa; + z->spec_start = stbi__get8(z->s); + z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 + aa = stbi__get8(z->s); + z->succ_high = (aa >> 4); + z->succ_low = (aa & 15); + if (z->progressive) { + if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) + return stbi__err("bad SOS", "Corrupt JPEG"); + } else { + if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); + if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); + z->spec_end = 63; + } + } + + return 1; +} + +static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why) +{ + int i; + for (i=0; i < ncomp; ++i) { + if (z->img_comp[i].raw_data) { + STBI_FREE(z->img_comp[i].raw_data); + z->img_comp[i].raw_data = NULL; + z->img_comp[i].data = NULL; + } + if (z->img_comp[i].raw_coeff) { + STBI_FREE(z->img_comp[i].raw_coeff); + z->img_comp[i].raw_coeff = 0; + z->img_comp[i].coeff = 0; + } + if (z->img_comp[i].linebuf) { + STBI_FREE(z->img_comp[i].linebuf); + z->img_comp[i].linebuf = NULL; + } + } + return why; +} + +static int stbi__process_frame_header(stbi__jpeg *z, int scan) +{ + stbi__context *s = z->s; + int Lf,p,i,q, h_max=1,v_max=1,c; + Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG + p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline + s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG + s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + c = stbi__get8(s); + if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG"); + s->img_n = c; + for (i=0; i < c; ++i) { + z->img_comp[i].data = NULL; + z->img_comp[i].linebuf = NULL; + } + + if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); + + z->rgb = 0; + for (i=0; i < s->img_n; ++i) { + static const unsigned char rgb[3] = { 'R', 'G', 'B' }; + z->img_comp[i].id = stbi__get8(s); + if (s->img_n == 3 && z->img_comp[i].id == rgb[i]) + ++z->rgb; + q = stbi__get8(s); + z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); + z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); + z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); + } + + if (scan != STBI__SCAN_load) return 1; + + if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode"); + + for (i=0; i < s->img_n; ++i) { + if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; + if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; + } + + // check that plane subsampling factors are integer ratios; our resamplers can't deal with fractional ratios + // and I've never seen a non-corrupted JPEG file actually use them + for (i=0; i < s->img_n; ++i) { + if (h_max % z->img_comp[i].h != 0) return stbi__err("bad H","Corrupt JPEG"); + if (v_max % z->img_comp[i].v != 0) return stbi__err("bad V","Corrupt JPEG"); + } + + // compute interleaved mcu info + z->img_h_max = h_max; + z->img_v_max = v_max; + z->img_mcu_w = h_max * 8; + z->img_mcu_h = v_max * 8; + // these sizes can't be more than 17 bits + z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; + z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; + + for (i=0; i < s->img_n; ++i) { + // number of effective pixels (e.g. for non-interleaved MCU) + z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; + z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; + // to simplify generation, we'll allocate enough memory to decode + // the bogus oversized data from using interleaved MCUs and their + // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't + // discard the extra data until colorspace conversion + // + // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier) + // so these muls can't overflow with 32-bit ints (which we require) + z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; + z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; + z->img_comp[i].coeff = 0; + z->img_comp[i].raw_coeff = 0; + z->img_comp[i].linebuf = NULL; + z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15); + if (z->img_comp[i].raw_data == NULL) + return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); + // align blocks for idct using mmx/sse + z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); + if (z->progressive) { + // w2, h2 are multiples of 8 (see above) + z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8; + z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8; + z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15); + if (z->img_comp[i].raw_coeff == NULL) + return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); + z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); + } + } + + return 1; +} + +// use comparisons since in some cases we handle more than one case (e.g. SOF) +#define stbi__DNL(x) ((x) == 0xdc) +#define stbi__SOI(x) ((x) == 0xd8) +#define stbi__EOI(x) ((x) == 0xd9) +#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) +#define stbi__SOS(x) ((x) == 0xda) + +#define stbi__SOF_progressive(x) ((x) == 0xc2) + +static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) +{ + int m; + z->jfif = 0; + z->app14_color_transform = -1; // valid values are 0,1,2 + z->marker = STBI__MARKER_none; // initialize cached marker to empty + m = stbi__get_marker(z); + if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); + if (scan == STBI__SCAN_type) return 1; + m = stbi__get_marker(z); + while (!stbi__SOF(m)) { + if (!stbi__process_marker(z,m)) return 0; + m = stbi__get_marker(z); + while (m == STBI__MARKER_none) { + // some files have extra padding after their blocks, so ok, we'll scan + if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); + m = stbi__get_marker(z); + } + } + z->progressive = stbi__SOF_progressive(m); + if (!stbi__process_frame_header(z, scan)) return 0; + return 1; +} + +static stbi_uc stbi__skip_jpeg_junk_at_end(stbi__jpeg *j) +{ + // some JPEGs have junk at end, skip over it but if we find what looks + // like a valid marker, resume there + while (!stbi__at_eof(j->s)) { + stbi_uc x = stbi__get8(j->s); + while (x == 0xff) { // might be a marker + if (stbi__at_eof(j->s)) return STBI__MARKER_none; + x = stbi__get8(j->s); + if (x != 0x00 && x != 0xff) { + // not a stuffed zero or lead-in to another marker, looks + // like an actual marker, return it + return x; + } + // stuffed zero has x=0 now which ends the loop, meaning we go + // back to regular scan loop. + // repeated 0xff keeps trying to read the next byte of the marker. + } + } + return STBI__MARKER_none; +} + +// decode image to YCbCr format +static int stbi__decode_jpeg_image(stbi__jpeg *j) +{ + int m; + for (m = 0; m < 4; m++) { + j->img_comp[m].raw_data = NULL; + j->img_comp[m].raw_coeff = NULL; + } + j->restart_interval = 0; + if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; + m = stbi__get_marker(j); + while (!stbi__EOI(m)) { + if (stbi__SOS(m)) { + if (!stbi__process_scan_header(j)) return 0; + if (!stbi__parse_entropy_coded_data(j)) return 0; + if (j->marker == STBI__MARKER_none ) { + j->marker = stbi__skip_jpeg_junk_at_end(j); + // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 + } + m = stbi__get_marker(j); + if (STBI__RESTART(m)) + m = stbi__get_marker(j); + } else if (stbi__DNL(m)) { + int Ld = stbi__get16be(j->s); + stbi__uint32 NL = stbi__get16be(j->s); + if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG"); + if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG"); + m = stbi__get_marker(j); + } else { + if (!stbi__process_marker(j, m)) return 1; + m = stbi__get_marker(j); + } + } + if (j->progressive) + stbi__jpeg_finish(j); + return 1; +} + +// static jfif-centered resampling (across block boundaries) + +typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, + int w, int hs); + +#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) + +static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + STBI_NOTUSED(out); + STBI_NOTUSED(in_far); + STBI_NOTUSED(w); + STBI_NOTUSED(hs); + return in_near; +} + +static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples vertically for every one in input + int i; + STBI_NOTUSED(hs); + for (i=0; i < w; ++i) + out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); + return out; +} + +static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples horizontally for every one in input + int i; + stbi_uc *input = in_near; + + if (w == 1) { + // if only one sample, can't do any interpolation + out[0] = out[1] = input[0]; + return out; + } + + out[0] = input[0]; + out[1] = stbi__div4(input[0]*3 + input[1] + 2); + for (i=1; i < w-1; ++i) { + int n = 3*input[i]+2; + out[i*2+0] = stbi__div4(n+input[i-1]); + out[i*2+1] = stbi__div4(n+input[i+1]); + } + out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); + out[i*2+1] = input[w-1]; + + STBI_NOTUSED(in_far); + STBI_NOTUSED(hs); + + return out; +} + +#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) + +static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i,t0,t1; + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + out[0] = stbi__div4(t1+2); + for (i=1; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i=0,t0,t1; + + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + // process groups of 8 pixels for as long as we can. + // note we can't handle the last pixel in a row in this loop + // because we need to handle the filter boundary conditions. + for (; i < ((w-1) & ~7); i += 8) { +#if defined(STBI_SSE2) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + __m128i zero = _mm_setzero_si128(); + __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); + __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); + __m128i farw = _mm_unpacklo_epi8(farb, zero); + __m128i nearw = _mm_unpacklo_epi8(nearb, zero); + __m128i diff = _mm_sub_epi16(farw, nearw); + __m128i nears = _mm_slli_epi16(nearw, 2); + __m128i curr = _mm_add_epi16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + __m128i prv0 = _mm_slli_si128(curr, 2); + __m128i nxt0 = _mm_srli_si128(curr, 2); + __m128i prev = _mm_insert_epi16(prv0, t1, 0); + __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + __m128i bias = _mm_set1_epi16(8); + __m128i curs = _mm_slli_epi16(curr, 2); + __m128i prvd = _mm_sub_epi16(prev, curr); + __m128i nxtd = _mm_sub_epi16(next, curr); + __m128i curb = _mm_add_epi16(curs, bias); + __m128i even = _mm_add_epi16(prvd, curb); + __m128i odd = _mm_add_epi16(nxtd, curb); + + // interleave even and odd pixels, then undo scaling. + __m128i int0 = _mm_unpacklo_epi16(even, odd); + __m128i int1 = _mm_unpackhi_epi16(even, odd); + __m128i de0 = _mm_srli_epi16(int0, 4); + __m128i de1 = _mm_srli_epi16(int1, 4); + + // pack and write output + __m128i outv = _mm_packus_epi16(de0, de1); + _mm_storeu_si128((__m128i *) (out + i*2), outv); +#elif defined(STBI_NEON) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + uint8x8_t farb = vld1_u8(in_far + i); + uint8x8_t nearb = vld1_u8(in_near + i); + int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); + int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); + int16x8_t curr = vaddq_s16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + int16x8_t prv0 = vextq_s16(curr, curr, 7); + int16x8_t nxt0 = vextq_s16(curr, curr, 1); + int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); + int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + int16x8_t curs = vshlq_n_s16(curr, 2); + int16x8_t prvd = vsubq_s16(prev, curr); + int16x8_t nxtd = vsubq_s16(next, curr); + int16x8_t even = vaddq_s16(curs, prvd); + int16x8_t odd = vaddq_s16(curs, nxtd); + + // undo scaling and round, then store with even/odd phases interleaved + uint8x8x2_t o; + o.val[0] = vqrshrun_n_s16(even, 4); + o.val[1] = vqrshrun_n_s16(odd, 4); + vst2_u8(out + i*2, o); +#endif + + // "previous" value for next iter + t1 = 3*in_near[i+7] + in_far[i+7]; + } + + t0 = t1; + t1 = 3*in_near[i] + in_far[i]; + out[i*2] = stbi__div16(3*t1 + t0 + 8); + + for (++i; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} +#endif + +static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // resample with nearest-neighbor + int i,j; + STBI_NOTUSED(in_far); + for (i=0; i < w; ++i) + for (j=0; j < hs; ++j) + out[i*hs+j] = in_near[i]; + return out; +} + +// this is a reduced-precision calculation of YCbCr-to-RGB introduced +// to make sure the code produces the same results in both SIMD and scalar +#define stbi__float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* stbi__float2fixed(1.40200f); + g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* stbi__float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) +{ + int i = 0; + +#ifdef STBI_SSE2 + // step == 3 is pretty ugly on the final interleave, and i'm not convinced + // it's useful in practice (you wouldn't use it for textures, for example). + // so just accelerate step == 4 case. + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + __m128i signflip = _mm_set1_epi8(-0x80); + __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); + __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); + __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); + __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); + __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); + __m128i xw = _mm_set1_epi16(255); // alpha channel + + for (; i+7 < count; i += 8) { + // load + __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); + __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); + __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); + __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 + __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 + + // unpack to short (and left-shift cr, cb by 8) + __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); + __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); + __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); + + // color transform + __m128i yws = _mm_srli_epi16(yw, 4); + __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); + __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); + __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); + __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); + __m128i rws = _mm_add_epi16(cr0, yws); + __m128i gwt = _mm_add_epi16(cb0, yws); + __m128i bws = _mm_add_epi16(yws, cb1); + __m128i gws = _mm_add_epi16(gwt, cr1); + + // descale + __m128i rw = _mm_srai_epi16(rws, 4); + __m128i bw = _mm_srai_epi16(bws, 4); + __m128i gw = _mm_srai_epi16(gws, 4); + + // back to byte, set up for transpose + __m128i brb = _mm_packus_epi16(rw, bw); + __m128i gxb = _mm_packus_epi16(gw, xw); + + // transpose to interleave channels + __m128i t0 = _mm_unpacklo_epi8(brb, gxb); + __m128i t1 = _mm_unpackhi_epi8(brb, gxb); + __m128i o0 = _mm_unpacklo_epi16(t0, t1); + __m128i o1 = _mm_unpackhi_epi16(t0, t1); + + // store + _mm_storeu_si128((__m128i *) (out + 0), o0); + _mm_storeu_si128((__m128i *) (out + 16), o1); + out += 32; + } + } +#endif + +#ifdef STBI_NEON + // in this version, step=3 support would be easy to add. but is there demand? + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + uint8x8_t signflip = vdup_n_u8(0x80); + int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); + int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); + int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); + int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); + + for (; i+7 < count; i += 8) { + // load + uint8x8_t y_bytes = vld1_u8(y + i); + uint8x8_t cr_bytes = vld1_u8(pcr + i); + uint8x8_t cb_bytes = vld1_u8(pcb + i); + int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); + int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); + + // expand to s16 + int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); + int16x8_t crw = vshll_n_s8(cr_biased, 7); + int16x8_t cbw = vshll_n_s8(cb_biased, 7); + + // color transform + int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); + int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); + int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); + int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); + int16x8_t rws = vaddq_s16(yws, cr0); + int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); + int16x8_t bws = vaddq_s16(yws, cb1); + + // undo scaling, round, convert to byte + uint8x8x4_t o; + o.val[0] = vqrshrun_n_s16(rws, 4); + o.val[1] = vqrshrun_n_s16(gws, 4); + o.val[2] = vqrshrun_n_s16(bws, 4); + o.val[3] = vdup_n_u8(255); + + // store, interleaving r/g/b/a + vst4_u8(out, o); + out += 8*4; + } + } +#endif + + for (; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* stbi__float2fixed(1.40200f); + g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* stbi__float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +// set up the kernels +static void stbi__setup_jpeg(stbi__jpeg *j) +{ + j->idct_block_kernel = stbi__idct_block; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; + +#ifdef STBI_SSE2 + if (stbi__sse2_available()) { + j->idct_block_kernel = stbi__idct_simd; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; + } +#endif + +#ifdef STBI_NEON + j->idct_block_kernel = stbi__idct_simd; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; +#endif +} + +// clean up the temporary component buffers +static void stbi__cleanup_jpeg(stbi__jpeg *j) +{ + stbi__free_jpeg_components(j, j->s->img_n, 0); +} + +typedef struct +{ + resample_row_func resample; + stbi_uc *line0,*line1; + int hs,vs; // expansion factor in each axis + int w_lores; // horizontal pixels pre-expansion + int ystep; // how far through vertical expansion we are + int ypos; // which pre-expansion row we're on +} stbi__resample; + +// fast 0..255 * 0..255 => 0..255 rounded multiplication +static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y) +{ + unsigned int t = x*y + 128; + return (stbi_uc) ((t + (t >>8)) >> 8); +} + +static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) +{ + int n, decode_n, is_rgb; + z->s->img_n = 0; // make stbi__cleanup_jpeg safe + + // validate req_comp + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + + // load a jpeg image from whichever source, but leave in YCbCr format + if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } + + // determine actual number of components to generate + n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1; + + is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif)); + + if (z->s->img_n == 3 && n < 3 && !is_rgb) + decode_n = 1; + else + decode_n = z->s->img_n; + + // nothing to do if no components requested; check this now to avoid + // accessing uninitialized coutput[0] later + if (decode_n <= 0) { stbi__cleanup_jpeg(z); return NULL; } + + // resample and color-convert + { + int k; + unsigned int i,j; + stbi_uc *output; + stbi_uc *coutput[4] = { NULL, NULL, NULL, NULL }; + + stbi__resample res_comp[4]; + + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + + // allocate line buffer big enough for upsampling off the edges + // with upsample factor of 4 + z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); + if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + r->hs = z->img_h_max / z->img_comp[k].h; + r->vs = z->img_v_max / z->img_comp[k].v; + r->ystep = r->vs >> 1; + r->w_lores = (z->s->img_x + r->hs-1) / r->hs; + r->ypos = 0; + r->line0 = r->line1 = z->img_comp[k].data; + + if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; + else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; + else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; + else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; + else r->resample = stbi__resample_row_generic; + } + + // can't error after this so, this is safe + output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1); + if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + // now go ahead and resample + for (j=0; j < z->s->img_y; ++j) { + stbi_uc *out = output + n * z->s->img_x * j; + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + int y_bot = r->ystep >= (r->vs >> 1); + coutput[k] = r->resample(z->img_comp[k].linebuf, + y_bot ? r->line1 : r->line0, + y_bot ? r->line0 : r->line1, + r->w_lores, r->hs); + if (++r->ystep >= r->vs) { + r->ystep = 0; + r->line0 = r->line1; + if (++r->ypos < z->img_comp[k].y) + r->line1 += z->img_comp[k].w2; + } + } + if (n >= 3) { + stbi_uc *y = coutput[0]; + if (z->s->img_n == 3) { + if (is_rgb) { + for (i=0; i < z->s->img_x; ++i) { + out[0] = y[i]; + out[1] = coutput[1][i]; + out[2] = coutput[2][i]; + out[3] = 255; + out += n; + } + } else { + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } + } else if (z->s->img_n == 4) { + if (z->app14_color_transform == 0) { // CMYK + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + out[0] = stbi__blinn_8x8(coutput[0][i], m); + out[1] = stbi__blinn_8x8(coutput[1][i], m); + out[2] = stbi__blinn_8x8(coutput[2][i], m); + out[3] = 255; + out += n; + } + } else if (z->app14_color_transform == 2) { // YCCK + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + out[0] = stbi__blinn_8x8(255 - out[0], m); + out[1] = stbi__blinn_8x8(255 - out[1], m); + out[2] = stbi__blinn_8x8(255 - out[2], m); + out += n; + } + } else { // YCbCr + alpha? Ignore the fourth channel for now + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } + } else + for (i=0; i < z->s->img_x; ++i) { + out[0] = out[1] = out[2] = y[i]; + out[3] = 255; // not used if n==3 + out += n; + } + } else { + if (is_rgb) { + if (n == 1) + for (i=0; i < z->s->img_x; ++i) + *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); + else { + for (i=0; i < z->s->img_x; ++i, out += 2) { + out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); + out[1] = 255; + } + } + } else if (z->s->img_n == 4 && z->app14_color_transform == 0) { + for (i=0; i < z->s->img_x; ++i) { + stbi_uc m = coutput[3][i]; + stbi_uc r = stbi__blinn_8x8(coutput[0][i], m); + stbi_uc g = stbi__blinn_8x8(coutput[1][i], m); + stbi_uc b = stbi__blinn_8x8(coutput[2][i], m); + out[0] = stbi__compute_y(r, g, b); + out[1] = 255; + out += n; + } + } else if (z->s->img_n == 4 && z->app14_color_transform == 2) { + for (i=0; i < z->s->img_x; ++i) { + out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]); + out[1] = 255; + out += n; + } + } else { + stbi_uc *y = coutput[0]; + if (n == 1) + for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; + else + for (i=0; i < z->s->img_x; ++i) { *out++ = y[i]; *out++ = 255; } + } + } + } + stbi__cleanup_jpeg(z); + *out_x = z->s->img_x; + *out_y = z->s->img_y; + if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output + return output; + } +} + +static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + unsigned char* result; + stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg)); + if (!j) return stbi__errpuc("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); + STBI_NOTUSED(ri); + j->s = s; + stbi__setup_jpeg(j); + result = load_jpeg_image(j, x,y,comp,req_comp); + STBI_FREE(j); + return result; +} + +static int stbi__jpeg_test(stbi__context *s) +{ + int r; + stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg)); + if (!j) return stbi__err("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); + j->s = s; + stbi__setup_jpeg(j); + r = stbi__decode_jpeg_header(j, STBI__SCAN_type); + stbi__rewind(s); + STBI_FREE(j); + return r; +} + +static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) +{ + if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { + stbi__rewind( j->s ); + return 0; + } + if (x) *x = j->s->img_x; + if (y) *y = j->s->img_y; + if (comp) *comp = j->s->img_n >= 3 ? 3 : 1; + return 1; +} + +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) +{ + int result; + stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg))); + if (!j) return stbi__err("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); + j->s = s; + result = stbi__jpeg_info_raw(j, x, y, comp); + STBI_FREE(j); + return result; +} +#endif + +// public domain zlib decode v0.2 Sean Barrett 2006-11-18 +// simple implementation +// - all input must be provided in an upfront buffer +// - all output is written to a single output buffer (can malloc/realloc) +// performance +// - fast huffman + +#ifndef STBI_NO_ZLIB + +// fast-way is faster to check than jpeg huffman, but slow way is slower +#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables +#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) +#define STBI__ZNSYMS 288 // number of symbols in literal/length alphabet + +// zlib-style huffman encoding +// (jpegs packs from left, zlib from right, so can't share code) +typedef struct +{ + stbi__uint16 fast[1 << STBI__ZFAST_BITS]; + stbi__uint16 firstcode[16]; + int maxcode[17]; + stbi__uint16 firstsymbol[16]; + stbi_uc size[STBI__ZNSYMS]; + stbi__uint16 value[STBI__ZNSYMS]; +} stbi__zhuffman; + +stbi_inline static int stbi__bitreverse16(int n) +{ + n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); + n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); + n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); + n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); + return n; +} + +stbi_inline static int stbi__bit_reverse(int v, int bits) +{ + STBI_ASSERT(bits <= 16); + // to bit reverse n bits, reverse 16 and shift + // e.g. 11 bits, bit reverse and shift away 5 + return stbi__bitreverse16(v) >> (16-bits); +} + +static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num) +{ + int i,k=0; + int code, next_code[16], sizes[17]; + + // DEFLATE spec for generating codes + memset(sizes, 0, sizeof(sizes)); + memset(z->fast, 0, sizeof(z->fast)); + for (i=0; i < num; ++i) + ++sizes[sizelist[i]]; + sizes[0] = 0; + for (i=1; i < 16; ++i) + if (sizes[i] > (1 << i)) + return stbi__err("bad sizes", "Corrupt PNG"); + code = 0; + for (i=1; i < 16; ++i) { + next_code[i] = code; + z->firstcode[i] = (stbi__uint16) code; + z->firstsymbol[i] = (stbi__uint16) k; + code = (code + sizes[i]); + if (sizes[i]) + if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); + z->maxcode[i] = code << (16-i); // preshift for inner loop + code <<= 1; + k += sizes[i]; + } + z->maxcode[16] = 0x10000; // sentinel + for (i=0; i < num; ++i) { + int s = sizelist[i]; + if (s) { + int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; + stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); + z->size [c] = (stbi_uc ) s; + z->value[c] = (stbi__uint16) i; + if (s <= STBI__ZFAST_BITS) { + int j = stbi__bit_reverse(next_code[s],s); + while (j < (1 << STBI__ZFAST_BITS)) { + z->fast[j] = fastv; + j += (1 << s); + } + } + ++next_code[s]; + } + } + return 1; +} + +// zlib-from-memory implementation for PNG reading +// because PNG allows splitting the zlib stream arbitrarily, +// and it's annoying structurally to have PNG call ZLIB call PNG, +// we require PNG read all the IDATs and combine them into a single +// memory buffer + +typedef struct +{ + stbi_uc *zbuffer, *zbuffer_end; + int num_bits; + int hit_zeof_once; + stbi__uint32 code_buffer; + + char *zout; + char *zout_start; + char *zout_end; + int z_expandable; + + stbi__zhuffman z_length, z_distance; +} stbi__zbuf; + +stbi_inline static int stbi__zeof(stbi__zbuf *z) +{ + return (z->zbuffer >= z->zbuffer_end); +} + +stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) +{ + return stbi__zeof(z) ? 0 : *z->zbuffer++; +} + +static void stbi__fill_bits(stbi__zbuf *z) +{ + do { + if (z->code_buffer >= (1U << z->num_bits)) { + z->zbuffer = z->zbuffer_end; /* treat this as EOF so we fail. */ + return; + } + z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; + z->num_bits += 8; + } while (z->num_bits <= 24); +} + +stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) +{ + unsigned int k; + if (z->num_bits < n) stbi__fill_bits(z); + k = z->code_buffer & ((1 << n) - 1); + z->code_buffer >>= n; + z->num_bits -= n; + return k; +} + +static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s,k; + // not resolved by fast table, so compute it the slow way + // use jpeg approach, which requires MSbits at top + k = stbi__bit_reverse(a->code_buffer, 16); + for (s=STBI__ZFAST_BITS+1; ; ++s) + if (k < z->maxcode[s]) + break; + if (s >= 16) return -1; // invalid code! + // code size is s, so: + b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; + if (b >= STBI__ZNSYMS) return -1; // some data was corrupt somewhere! + if (z->size[b] != s) return -1; // was originally an assert, but report failure instead. + a->code_buffer >>= s; + a->num_bits -= s; + return z->value[b]; +} + +stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s; + if (a->num_bits < 16) { + if (stbi__zeof(a)) { + if (!a->hit_zeof_once) { + // This is the first time we hit eof, insert 16 extra padding btis + // to allow us to keep going; if we actually consume any of them + // though, that is invalid data. This is caught later. + a->hit_zeof_once = 1; + a->num_bits += 16; // add 16 implicit zero bits + } else { + // We already inserted our extra 16 padding bits and are again + // out, this stream is actually prematurely terminated. + return -1; + } + } else { + stbi__fill_bits(a); + } + } + b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; + if (b) { + s = b >> 9; + a->code_buffer >>= s; + a->num_bits -= s; + return b & 511; + } + return stbi__zhuffman_decode_slowpath(a, z); +} + +static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes +{ + char *q; + unsigned int cur, limit, old_limit; + z->zout = zout; + if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); + cur = (unsigned int) (z->zout - z->zout_start); + limit = old_limit = (unsigned) (z->zout_end - z->zout_start); + if (UINT_MAX - cur < (unsigned) n) return stbi__err("outofmem", "Out of memory"); + while (cur + n > limit) { + if(limit > UINT_MAX / 2) return stbi__err("outofmem", "Out of memory"); + limit *= 2; + } + q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit); + STBI_NOTUSED(old_limit); + if (q == NULL) return stbi__err("outofmem", "Out of memory"); + z->zout_start = q; + z->zout = q + cur; + z->zout_end = q + limit; + return 1; +} + +static const int stbi__zlength_base[31] = { + 3,4,5,6,7,8,9,10,11,13, + 15,17,19,23,27,31,35,43,51,59, + 67,83,99,115,131,163,195,227,258,0,0 }; + +static const int stbi__zlength_extra[31]= +{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; + +static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, +257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; + +static const int stbi__zdist_extra[32] = +{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +static int stbi__parse_huffman_block(stbi__zbuf *a) +{ + char *zout = a->zout; + for(;;) { + int z = stbi__zhuffman_decode(a, &a->z_length); + if (z < 256) { + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes + if (zout >= a->zout_end) { + if (!stbi__zexpand(a, zout, 1)) return 0; + zout = a->zout; + } + *zout++ = (char) z; + } else { + stbi_uc *p; + int len,dist; + if (z == 256) { + a->zout = zout; + if (a->hit_zeof_once && a->num_bits < 16) { + // The first time we hit zeof, we inserted 16 extra zero bits into our bit + // buffer so the decoder can just do its speculative decoding. But if we + // actually consumed any of those bits (which is the case when num_bits < 16), + // the stream actually read past the end so it is malformed. + return stbi__err("unexpected end","Corrupt PNG"); + } + return 1; + } + if (z >= 286) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, length codes 286 and 287 must not appear in compressed data + z -= 257; + len = stbi__zlength_base[z]; + if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); + z = stbi__zhuffman_decode(a, &a->z_distance); + if (z < 0 || z >= 30) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, distance codes 30 and 31 must not appear in compressed data + dist = stbi__zdist_base[z]; + if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); + if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); + if (len > a->zout_end - zout) { + if (!stbi__zexpand(a, zout, len)) return 0; + zout = a->zout; + } + p = (stbi_uc *) (zout - dist); + if (dist == 1) { // run of one byte; common in images. + stbi_uc v = *p; + if (len) { do *zout++ = v; while (--len); } + } else { + if (len) { do *zout++ = *p++; while (--len); } + } + } + } +} + +static int stbi__compute_huffman_codes(stbi__zbuf *a) +{ + static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; + stbi__zhuffman z_codelength; + stbi_uc lencodes[286+32+137];//padding for maximum single op + stbi_uc codelength_sizes[19]; + int i,n; + + int hlit = stbi__zreceive(a,5) + 257; + int hdist = stbi__zreceive(a,5) + 1; + int hclen = stbi__zreceive(a,4) + 4; + int ntot = hlit + hdist; + + memset(codelength_sizes, 0, sizeof(codelength_sizes)); + for (i=0; i < hclen; ++i) { + int s = stbi__zreceive(a,3); + codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; + } + if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; + + n = 0; + while (n < ntot) { + int c = stbi__zhuffman_decode(a, &z_codelength); + if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); + if (c < 16) + lencodes[n++] = (stbi_uc) c; + else { + stbi_uc fill = 0; + if (c == 16) { + c = stbi__zreceive(a,2)+3; + if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG"); + fill = lencodes[n-1]; + } else if (c == 17) { + c = stbi__zreceive(a,3)+3; + } else if (c == 18) { + c = stbi__zreceive(a,7)+11; + } else { + return stbi__err("bad codelengths", "Corrupt PNG"); + } + if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG"); + memset(lencodes+n, fill, c); + n += c; + } + } + if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG"); + if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; + return 1; +} + +static int stbi__parse_uncompressed_block(stbi__zbuf *a) +{ + stbi_uc header[4]; + int len,nlen,k; + if (a->num_bits & 7) + stbi__zreceive(a, a->num_bits & 7); // discard + // drain the bit-packed data into header + k = 0; + while (a->num_bits > 0) { + header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check + a->code_buffer >>= 8; + a->num_bits -= 8; + } + if (a->num_bits < 0) return stbi__err("zlib corrupt","Corrupt PNG"); + // now fill header the normal way + while (k < 4) + header[k++] = stbi__zget8(a); + len = header[1] * 256 + header[0]; + nlen = header[3] * 256 + header[2]; + if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); + if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); + if (a->zout + len > a->zout_end) + if (!stbi__zexpand(a, a->zout, len)) return 0; + memcpy(a->zout, a->zbuffer, len); + a->zbuffer += len; + a->zout += len; + return 1; +} + +static int stbi__parse_zlib_header(stbi__zbuf *a) +{ + int cmf = stbi__zget8(a); + int cm = cmf & 15; + /* int cinfo = cmf >> 4; */ + int flg = stbi__zget8(a); + if (stbi__zeof(a)) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png + if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png + // window = 1 << (8 + cinfo)... but who cares, we fully buffer output + return 1; +} + +static const stbi_uc stbi__zdefault_length[STBI__ZNSYMS] = +{ + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8 +}; +static const stbi_uc stbi__zdefault_distance[32] = +{ + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +}; +/* +Init algorithm: +{ + int i; // use <= to match clearly with spec + for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; + for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; + for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; + for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; + + for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; +} +*/ + +static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) +{ + int final, type; + if (parse_header) + if (!stbi__parse_zlib_header(a)) return 0; + a->num_bits = 0; + a->code_buffer = 0; + a->hit_zeof_once = 0; + do { + final = stbi__zreceive(a,1); + type = stbi__zreceive(a,2); + if (type == 0) { + if (!stbi__parse_uncompressed_block(a)) return 0; + } else if (type == 3) { + return 0; + } else { + if (type == 1) { + // use fixed code lengths + if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , STBI__ZNSYMS)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; + } else { + if (!stbi__compute_huffman_codes(a)) return 0; + } + if (!stbi__parse_huffman_block(a)) return 0; + } + } while (!final); + return 1; +} + +static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) +{ + a->zout_start = obuf; + a->zout = obuf; + a->zout_end = obuf + olen; + a->z_expandable = exp; + + return stbi__parse_zlib(a, parse_header); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) +{ + return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) + return (int) (a.zout - a.zout_start); + else + return -1; +} + +STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(16384); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer+len; + if (stbi__do_zlib(&a, p, 16384, 1, 0)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) + return (int) (a.zout - a.zout_start); + else + return -1; +} +#endif + +// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 +// simple implementation +// - only 8-bit samples +// - no CRC checking +// - allocates lots of intermediate memory +// - avoids problem of streaming data between subsystems +// - avoids explicit window management +// performance +// - uses stb_zlib, a PD zlib implementation with fast huffman decoding + +#ifndef STBI_NO_PNG +typedef struct +{ + stbi__uint32 length; + stbi__uint32 type; +} stbi__pngchunk; + +static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) +{ + stbi__pngchunk c; + c.length = stbi__get32be(s); + c.type = stbi__get32be(s); + return c; +} + +static int stbi__check_png_header(stbi__context *s) +{ + static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; + int i; + for (i=0; i < 8; ++i) + if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); + return 1; +} + +typedef struct +{ + stbi__context *s; + stbi_uc *idata, *expanded, *out; + int depth; +} stbi__png; + + +enum { + STBI__F_none=0, + STBI__F_sub=1, + STBI__F_up=2, + STBI__F_avg=3, + STBI__F_paeth=4, + // synthetic filter used for first scanline to avoid needing a dummy row of 0s + STBI__F_avg_first +}; + +static stbi_uc first_row_filter[5] = +{ + STBI__F_none, + STBI__F_sub, + STBI__F_none, + STBI__F_avg_first, + STBI__F_sub // Paeth with b=c=0 turns out to be equivalent to sub +}; + +static int stbi__paeth(int a, int b, int c) +{ + // This formulation looks very different from the reference in the PNG spec, but is + // actually equivalent and has favorable data dependencies and admits straightforward + // generation of branch-free code, which helps performance significantly. + int thresh = c*3 - (a + b); + int lo = a < b ? a : b; + int hi = a < b ? b : a; + int t0 = (hi <= thresh) ? lo : c; + int t1 = (thresh <= lo) ? hi : t0; + return t1; +} + +static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; + +// adds an extra all-255 alpha channel +// dest == src is legal +// img_n must be 1 or 3 +static void stbi__create_png_alpha_expand8(stbi_uc *dest, stbi_uc *src, stbi__uint32 x, int img_n) +{ + int i; + // must process data backwards since we allow dest==src + if (img_n == 1) { + for (i=x-1; i >= 0; --i) { + dest[i*2+1] = 255; + dest[i*2+0] = src[i]; + } + } else { + STBI_ASSERT(img_n == 3); + for (i=x-1; i >= 0; --i) { + dest[i*4+3] = 255; + dest[i*4+2] = src[i*3+2]; + dest[i*4+1] = src[i*3+1]; + dest[i*4+0] = src[i*3+0]; + } + } +} + +// create the png data from post-deflated data +static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) +{ + int bytes = (depth == 16 ? 2 : 1); + stbi__context *s = a->s; + stbi__uint32 i,j,stride = x*out_n*bytes; + stbi__uint32 img_len, img_width_bytes; + stbi_uc *filter_buf; + int all_ok = 1; + int k; + int img_n = s->img_n; // copy it into a local for later + + int output_bytes = out_n*bytes; + int filter_bytes = img_n*bytes; + int width = x; + + STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); + a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into + if (!a->out) return stbi__err("outofmem", "Out of memory"); + + // note: error exits here don't need to clean up a->out individually, + // stbi__do_png always does on error. + if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG"); + img_width_bytes = (((img_n * x * depth) + 7) >> 3); + if (!stbi__mad2sizes_valid(img_width_bytes, y, img_width_bytes)) return stbi__err("too large", "Corrupt PNG"); + img_len = (img_width_bytes + 1) * y; + + // we used to check for exact match between raw_len and img_len on non-interlaced PNGs, + // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros), + // so just check for raw_len < img_len always. + if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); + + // Allocate two scan lines worth of filter workspace buffer. + filter_buf = (stbi_uc *) stbi__malloc_mad2(img_width_bytes, 2, 0); + if (!filter_buf) return stbi__err("outofmem", "Out of memory"); + + // Filtering for low-bit-depth images + if (depth < 8) { + filter_bytes = 1; + width = img_width_bytes; + } + + for (j=0; j < y; ++j) { + // cur/prior filter buffers alternate + stbi_uc *cur = filter_buf + (j & 1)*img_width_bytes; + stbi_uc *prior = filter_buf + (~j & 1)*img_width_bytes; + stbi_uc *dest = a->out + stride*j; + int nk = width * filter_bytes; + int filter = *raw++; + + // check filter type + if (filter > 4) { + all_ok = stbi__err("invalid filter","Corrupt PNG"); + break; + } + + // if first row, use special filter that doesn't sample previous row + if (j == 0) filter = first_row_filter[filter]; + + // perform actual filtering + switch (filter) { + case STBI__F_none: + memcpy(cur, raw, nk); + break; + case STBI__F_sub: + memcpy(cur, raw, filter_bytes); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); + break; + case STBI__F_up: + for (k = 0; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + prior[k]); + break; + case STBI__F_avg: + for (k = 0; k < filter_bytes; ++k) + cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); + break; + case STBI__F_paeth: + for (k = 0; k < filter_bytes; ++k) + cur[k] = STBI__BYTECAST(raw[k] + prior[k]); // prior[k] == stbi__paeth(0,prior[k],0) + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes], prior[k], prior[k-filter_bytes])); + break; + case STBI__F_avg_first: + memcpy(cur, raw, filter_bytes); + for (k = filter_bytes; k < nk; ++k) + cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); + break; + } + + raw += nk; + + // expand decoded bits in cur to dest, also adding an extra alpha channel if desired + if (depth < 8) { + stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range + stbi_uc *in = cur; + stbi_uc *out = dest; + stbi_uc inb = 0; + stbi__uint32 nsmp = x*img_n; + + // expand bits to bytes first + if (depth == 4) { + for (i=0; i < nsmp; ++i) { + if ((i & 1) == 0) inb = *in++; + *out++ = scale * (inb >> 4); + inb <<= 4; + } + } else if (depth == 2) { + for (i=0; i < nsmp; ++i) { + if ((i & 3) == 0) inb = *in++; + *out++ = scale * (inb >> 6); + inb <<= 2; + } + } else { + STBI_ASSERT(depth == 1); + for (i=0; i < nsmp; ++i) { + if ((i & 7) == 0) inb = *in++; + *out++ = scale * (inb >> 7); + inb <<= 1; + } + } + + // insert alpha=255 values if desired + if (img_n != out_n) + stbi__create_png_alpha_expand8(dest, dest, x, img_n); + } else if (depth == 8) { + if (img_n == out_n) + memcpy(dest, cur, x*img_n); + else + stbi__create_png_alpha_expand8(dest, cur, x, img_n); + } else if (depth == 16) { + // convert the image data from big-endian to platform-native + stbi__uint16 *dest16 = (stbi__uint16*)dest; + stbi__uint32 nsmp = x*img_n; + + if (img_n == out_n) { + for (i = 0; i < nsmp; ++i, ++dest16, cur += 2) + *dest16 = (cur[0] << 8) | cur[1]; + } else { + STBI_ASSERT(img_n+1 == out_n); + if (img_n == 1) { + for (i = 0; i < x; ++i, dest16 += 2, cur += 2) { + dest16[0] = (cur[0] << 8) | cur[1]; + dest16[1] = 0xffff; + } + } else { + STBI_ASSERT(img_n == 3); + for (i = 0; i < x; ++i, dest16 += 4, cur += 6) { + dest16[0] = (cur[0] << 8) | cur[1]; + dest16[1] = (cur[2] << 8) | cur[3]; + dest16[2] = (cur[4] << 8) | cur[5]; + dest16[3] = 0xffff; + } + } + } + } + } + + STBI_FREE(filter_buf); + if (!all_ok) return 0; + + return 1; +} + +static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) +{ + int bytes = (depth == 16 ? 2 : 1); + int out_bytes = out_n * bytes; + stbi_uc *final; + int p; + if (!interlaced) + return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); + + // de-interlacing + final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0); + if (!final) return stbi__err("outofmem", "Out of memory"); + for (p=0; p < 7; ++p) { + int xorig[] = { 0,4,0,2,0,1,0 }; + int yorig[] = { 0,0,4,0,2,0,1 }; + int xspc[] = { 8,8,4,4,2,2,1 }; + int yspc[] = { 8,8,8,4,4,2,2 }; + int i,j,x,y; + // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 + x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; + y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; + if (x && y) { + stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; + if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { + STBI_FREE(final); + return 0; + } + for (j=0; j < y; ++j) { + for (i=0; i < x; ++i) { + int out_y = j*yspc[p]+yorig[p]; + int out_x = i*xspc[p]+xorig[p]; + memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes, + a->out + (j*x+i)*out_bytes, out_bytes); + } + } + STBI_FREE(a->out); + image_data += img_len; + image_data_len -= img_len; + } + } + a->out = final; + + return 1; +} + +static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + // compute color-based transparency, assuming we've + // already got 255 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i=0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 255); + p += 2; + } + } else { + for (i=0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi__uint16 *p = (stbi__uint16*) z->out; + + // compute color-based transparency, assuming we've + // already got 65535 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i = 0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 65535); + p += 2; + } + } else { + for (i = 0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) +{ + stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; + stbi_uc *p, *temp_out, *orig = a->out; + + p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0); + if (p == NULL) return stbi__err("outofmem", "Out of memory"); + + // between here and free(out) below, exitting would leak + temp_out = p; + + if (pal_img_n == 3) { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p += 3; + } + } else { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p[3] = palette[n+3]; + p += 4; + } + } + STBI_FREE(a->out); + a->out = temp_out; + + STBI_NOTUSED(len); + + return 1; +} + +static int stbi__unpremultiply_on_load_global = 0; +static int stbi__de_iphone_flag_global = 0; + +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load_global = flag_true_if_should_unpremultiply; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag_global = flag_true_if_should_convert; +} + +#ifndef STBI_THREAD_LOCAL +#define stbi__unpremultiply_on_load stbi__unpremultiply_on_load_global +#define stbi__de_iphone_flag stbi__de_iphone_flag_global +#else +static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set; +static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set; + +STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply; + stbi__unpremultiply_on_load_set = 1; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag_local = flag_true_if_should_convert; + stbi__de_iphone_flag_set = 1; +} + +#define stbi__unpremultiply_on_load (stbi__unpremultiply_on_load_set \ + ? stbi__unpremultiply_on_load_local \ + : stbi__unpremultiply_on_load_global) +#define stbi__de_iphone_flag (stbi__de_iphone_flag_set \ + ? stbi__de_iphone_flag_local \ + : stbi__de_iphone_flag_global) +#endif // STBI_THREAD_LOCAL + +static void stbi__de_iphone(stbi__png *z) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + if (s->img_out_n == 3) { // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 3; + } + } else { + STBI_ASSERT(s->img_out_n == 4); + if (stbi__unpremultiply_on_load) { + // convert bgr to rgb and unpremultiply + for (i=0; i < pixel_count; ++i) { + stbi_uc a = p[3]; + stbi_uc t = p[0]; + if (a) { + stbi_uc half = a / 2; + p[0] = (p[2] * 255 + half) / a; + p[1] = (p[1] * 255 + half) / a; + p[2] = ( t * 255 + half) / a; + } else { + p[0] = p[2]; + p[2] = t; + } + p += 4; + } + } else { + // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 4; + } + } + } +} + +#define STBI__PNG_TYPE(a,b,c,d) (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d)) + +static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) +{ + stbi_uc palette[1024], pal_img_n=0; + stbi_uc has_trans=0, tc[3]={0}; + stbi__uint16 tc16[3]; + stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; + int first=1,k,interlace=0, color=0, is_iphone=0; + stbi__context *s = z->s; + + z->expanded = NULL; + z->idata = NULL; + z->out = NULL; + + if (!stbi__check_png_header(s)) return 0; + + if (scan == STBI__SCAN_type) return 1; + + for (;;) { + stbi__pngchunk c = stbi__get_chunk_header(s); + switch (c.type) { + case STBI__PNG_TYPE('C','g','B','I'): + is_iphone = 1; + stbi__skip(s, c.length); + break; + case STBI__PNG_TYPE('I','H','D','R'): { + int comp,filter; + if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); + first = 0; + if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); + s->img_x = stbi__get32be(s); + s->img_y = stbi__get32be(s); + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + z->depth = stbi__get8(s); if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only"); + color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3 && z->depth == 16) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); + comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); + filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); + interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); + if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); + if (!pal_img_n) { + s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + } else { + // if paletted, then pal_n is our final components, and + // img_n is # components to decompress/filter. + s->img_n = 1; + if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); + } + // even with SCAN_header, have to scan to see if we have a tRNS + break; + } + + case STBI__PNG_TYPE('P','L','T','E'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); + pal_len = c.length / 3; + if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); + for (i=0; i < pal_len; ++i) { + palette[i*4+0] = stbi__get8(s); + palette[i*4+1] = stbi__get8(s); + palette[i*4+2] = stbi__get8(s); + palette[i*4+3] = 255; + } + break; + } + + case STBI__PNG_TYPE('t','R','N','S'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); + if (pal_img_n) { + if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } + if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); + if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); + pal_img_n = 4; + for (i=0; i < c.length; ++i) + palette[i*4+3] = stbi__get8(s); + } else { + if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); + if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); + has_trans = 1; + // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now. + if (scan == STBI__SCAN_header) { ++s->img_n; return 1; } + if (z->depth == 16) { + for (k = 0; k < s->img_n && k < 3; ++k) // extra loop test to suppress false GCC warning + tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is + } else { + for (k = 0; k < s->img_n && k < 3; ++k) + tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger + } + } + break; + } + + case STBI__PNG_TYPE('I','D','A','T'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); + if (scan == STBI__SCAN_header) { + // header scan definitely stops at first IDAT + if (pal_img_n) + s->img_n = pal_img_n; + return 1; + } + if (c.length > (1u << 30)) return stbi__err("IDAT size limit", "IDAT section larger than 2^30 bytes"); + if ((int)(ioff + c.length) < (int)ioff) return 0; + if (ioff + c.length > idata_limit) { + stbi__uint32 idata_limit_old = idata_limit; + stbi_uc *p; + if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; + while (ioff + c.length > idata_limit) + idata_limit *= 2; + STBI_NOTUSED(idata_limit_old); + p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); + z->idata = p; + } + if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); + ioff += c.length; + break; + } + + case STBI__PNG_TYPE('I','E','N','D'): { + stbi__uint32 raw_len, bpl; + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (scan != STBI__SCAN_load) return 1; + if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); + // initial guess for decoded data size to avoid unnecessary reallocs + bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component + raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; + z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); + if (z->expanded == NULL) return 0; // zlib should set error + STBI_FREE(z->idata); z->idata = NULL; + if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) + s->img_out_n = s->img_n+1; + else + s->img_out_n = s->img_n; + if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0; + if (has_trans) { + if (z->depth == 16) { + if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0; + } else { + if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; + } + } + if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) + stbi__de_iphone(z); + if (pal_img_n) { + // pal_img_n == 3 or 4 + s->img_n = pal_img_n; // record the actual colors we had + s->img_out_n = pal_img_n; + if (req_comp >= 3) s->img_out_n = req_comp; + if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) + return 0; + } else if (has_trans) { + // non-paletted image with tRNS -> source image has (constant) alpha + ++s->img_n; + } + STBI_FREE(z->expanded); z->expanded = NULL; + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + return 1; + } + + default: + // if critical, fail + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if ((c.type & (1 << 29)) == 0) { + #ifndef STBI_NO_FAILURE_STRINGS + // not threadsafe + static char invalid_chunk[] = "XXXX PNG chunk not known"; + invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); + invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); + invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); + invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); + #endif + return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); + } + stbi__skip(s, c.length); + break; + } + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + } +} + +static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri) +{ + void *result=NULL; + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { + if (p->depth <= 8) + ri->bits_per_channel = 8; + else if (p->depth == 16) + ri->bits_per_channel = 16; + else + return stbi__errpuc("bad bits_per_channel", "PNG not supported: unsupported color depth"); + result = p->out; + p->out = NULL; + if (req_comp && req_comp != p->s->img_out_n) { + if (ri->bits_per_channel == 8) + result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + else + result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + p->s->img_out_n = req_comp; + if (result == NULL) return result; + } + *x = p->s->img_x; + *y = p->s->img_y; + if (n) *n = p->s->img_n; + } + STBI_FREE(p->out); p->out = NULL; + STBI_FREE(p->expanded); p->expanded = NULL; + STBI_FREE(p->idata); p->idata = NULL; + + return result; +} + +static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi__png p; + p.s = s; + return stbi__do_png(&p, x,y,comp,req_comp, ri); +} + +static int stbi__png_test(stbi__context *s) +{ + int r; + r = stbi__check_png_header(s); + stbi__rewind(s); + return r; +} + +static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) +{ + if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { + stbi__rewind( p->s ); + return 0; + } + if (x) *x = p->s->img_x; + if (y) *y = p->s->img_y; + if (comp) *comp = p->s->img_n; + return 1; +} + +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__png p; + p.s = s; + return stbi__png_info_raw(&p, x, y, comp); +} + +static int stbi__png_is16(stbi__context *s) +{ + stbi__png p; + p.s = s; + if (!stbi__png_info_raw(&p, NULL, NULL, NULL)) + return 0; + if (p.depth != 16) { + stbi__rewind(p.s); + return 0; + } + return 1; +} +#endif + +// Microsoft/Windows BMP image + +#ifndef STBI_NO_BMP +static int stbi__bmp_test_raw(stbi__context *s) +{ + int r; + int sz; + if (stbi__get8(s) != 'B') return 0; + if (stbi__get8(s) != 'M') return 0; + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + stbi__get32le(s); // discard data offset + sz = stbi__get32le(s); + r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); + return r; +} + +static int stbi__bmp_test(stbi__context *s) +{ + int r = stbi__bmp_test_raw(s); + stbi__rewind(s); + return r; +} + + +// returns 0..31 for the highest set bit +static int stbi__high_bit(unsigned int z) +{ + int n=0; + if (z == 0) return -1; + if (z >= 0x10000) { n += 16; z >>= 16; } + if (z >= 0x00100) { n += 8; z >>= 8; } + if (z >= 0x00010) { n += 4; z >>= 4; } + if (z >= 0x00004) { n += 2; z >>= 2; } + if (z >= 0x00002) { n += 1;/* >>= 1;*/ } + return n; +} + +static int stbi__bitcount(unsigned int a) +{ + a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 + a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 + a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits + a = (a + (a >> 8)); // max 16 per 8 bits + a = (a + (a >> 16)); // max 32 per 8 bits + return a & 0xff; +} + +// extract an arbitrarily-aligned N-bit value (N=bits) +// from v, and then make it 8-bits long and fractionally +// extend it to full full range. +static int stbi__shiftsigned(unsigned int v, int shift, int bits) +{ + static unsigned int mul_table[9] = { + 0, + 0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/, + 0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/, + }; + static unsigned int shift_table[9] = { + 0, 0,0,1,0,2,4,6,0, + }; + if (shift < 0) + v <<= -shift; + else + v >>= shift; + STBI_ASSERT(v < 256); + v >>= (8-bits); + STBI_ASSERT(bits >= 0 && bits <= 8); + return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits]; +} + +typedef struct +{ + int bpp, offset, hsz; + unsigned int mr,mg,mb,ma, all_a; + int extra_read; +} stbi__bmp_data; + +static int stbi__bmp_set_mask_defaults(stbi__bmp_data *info, int compress) +{ + // BI_BITFIELDS specifies masks explicitly, don't override + if (compress == 3) + return 1; + + if (compress == 0) { + if (info->bpp == 16) { + info->mr = 31u << 10; + info->mg = 31u << 5; + info->mb = 31u << 0; + } else if (info->bpp == 32) { + info->mr = 0xffu << 16; + info->mg = 0xffu << 8; + info->mb = 0xffu << 0; + info->ma = 0xffu << 24; + info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 + } else { + // otherwise, use defaults, which is all-0 + info->mr = info->mg = info->mb = info->ma = 0; + } + return 1; + } + return 0; // error +} + +static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) +{ + int hsz; + if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + info->offset = stbi__get32le(s); + info->hsz = hsz = stbi__get32le(s); + info->mr = info->mg = info->mb = info->ma = 0; + info->extra_read = 14; + + if (info->offset < 0) return stbi__errpuc("bad BMP", "bad BMP"); + + if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); + if (hsz == 12) { + s->img_x = stbi__get16le(s); + s->img_y = stbi__get16le(s); + } else { + s->img_x = stbi__get32le(s); + s->img_y = stbi__get32le(s); + } + if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); + info->bpp = stbi__get16le(s); + if (hsz != 12) { + int compress = stbi__get32le(s); + if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); + if (compress >= 4) return stbi__errpuc("BMP JPEG/PNG", "BMP type not supported: unsupported compression"); // this includes PNG/JPEG modes + if (compress == 3 && info->bpp != 16 && info->bpp != 32) return stbi__errpuc("bad BMP", "bad BMP"); // bitfields requires 16 or 32 bits/pixel + stbi__get32le(s); // discard sizeof + stbi__get32le(s); // discard hres + stbi__get32le(s); // discard vres + stbi__get32le(s); // discard colorsused + stbi__get32le(s); // discard max important + if (hsz == 40 || hsz == 56) { + if (hsz == 56) { + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + } + if (info->bpp == 16 || info->bpp == 32) { + if (compress == 0) { + stbi__bmp_set_mask_defaults(info, compress); + } else if (compress == 3) { + info->mr = stbi__get32le(s); + info->mg = stbi__get32le(s); + info->mb = stbi__get32le(s); + info->extra_read += 12; + // not documented, but generated by photoshop and handled by mspaint + if (info->mr == info->mg && info->mg == info->mb) { + // ?!?!? + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else { + // V4/V5 header + int i; + if (hsz != 108 && hsz != 124) + return stbi__errpuc("bad BMP", "bad BMP"); + info->mr = stbi__get32le(s); + info->mg = stbi__get32le(s); + info->mb = stbi__get32le(s); + info->ma = stbi__get32le(s); + if (compress != 3) // override mr/mg/mb unless in BI_BITFIELDS mode, as per docs + stbi__bmp_set_mask_defaults(info, compress); + stbi__get32le(s); // discard color space + for (i=0; i < 12; ++i) + stbi__get32le(s); // discard color space parameters + if (hsz == 124) { + stbi__get32le(s); // discard rendering intent + stbi__get32le(s); // discard offset of profile data + stbi__get32le(s); // discard size of profile data + stbi__get32le(s); // discard reserved + } + } + } + return (void *) 1; +} + + +static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *out; + unsigned int mr=0,mg=0,mb=0,ma=0, all_a; + stbi_uc pal[256][4]; + int psize=0,i,j,width; + int flip_vertically, pad, target; + stbi__bmp_data info; + STBI_NOTUSED(ri); + + info.all_a = 255; + if (stbi__bmp_parse_header(s, &info) == NULL) + return NULL; // error code already set + + flip_vertically = ((int) s->img_y) > 0; + s->img_y = abs((int) s->img_y); + + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + mr = info.mr; + mg = info.mg; + mb = info.mb; + ma = info.ma; + all_a = info.all_a; + + if (info.hsz == 12) { + if (info.bpp < 24) + psize = (info.offset - info.extra_read - 24) / 3; + } else { + if (info.bpp < 16) + psize = (info.offset - info.extra_read - info.hsz) >> 2; + } + if (psize == 0) { + // accept some number of extra bytes after the header, but if the offset points either to before + // the header ends or implies a large amount of extra data, reject the file as malformed + int bytes_read_so_far = s->callback_already_read + (int)(s->img_buffer - s->img_buffer_original); + int header_limit = 1024; // max we actually read is below 256 bytes currently. + int extra_data_limit = 256*4; // what ordinarily goes here is a palette; 256 entries*4 bytes is its max size. + if (bytes_read_so_far <= 0 || bytes_read_so_far > header_limit) { + return stbi__errpuc("bad header", "Corrupt BMP"); + } + // we established that bytes_read_so_far is positive and sensible. + // the first half of this test rejects offsets that are either too small positives, or + // negative, and guarantees that info.offset >= bytes_read_so_far > 0. this in turn + // ensures the number computed in the second half of the test can't overflow. + if (info.offset < bytes_read_so_far || info.offset - bytes_read_so_far > extra_data_limit) { + return stbi__errpuc("bad offset", "Corrupt BMP"); + } else { + stbi__skip(s, info.offset - bytes_read_so_far); + } + } + + if (info.bpp == 24 && ma == 0xff000000) + s->img_n = 3; + else + s->img_n = ma ? 4 : 3; + if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 + target = req_comp; + else + target = s->img_n; // if they want monochrome, we'll post-convert + + // sanity-check size + if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0)) + return stbi__errpuc("too large", "Corrupt BMP"); + + out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + if (info.bpp < 16) { + int z=0; + if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } + for (i=0; i < psize; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + if (info.hsz != 12) stbi__get8(s); + pal[i][3] = 255; + } + stbi__skip(s, info.offset - info.extra_read - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); + if (info.bpp == 1) width = (s->img_x + 7) >> 3; + else if (info.bpp == 4) width = (s->img_x + 1) >> 1; + else if (info.bpp == 8) width = s->img_x; + else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } + pad = (-width)&3; + if (info.bpp == 1) { + for (j=0; j < (int) s->img_y; ++j) { + int bit_offset = 7, v = stbi__get8(s); + for (i=0; i < (int) s->img_x; ++i) { + int color = (v>>bit_offset)&0x1; + out[z++] = pal[color][0]; + out[z++] = pal[color][1]; + out[z++] = pal[color][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + if((--bit_offset) < 0) { + bit_offset = 7; + v = stbi__get8(s); + } + } + stbi__skip(s, pad); + } + } else { + for (j=0; j < (int) s->img_y; ++j) { + for (i=0; i < (int) s->img_x; i += 2) { + int v=stbi__get8(s),v2=0; + if (info.bpp == 4) { + v2 = v & 15; + v >>= 4; + } + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + v = (info.bpp == 8) ? stbi__get8(s) : v2; + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + } + stbi__skip(s, pad); + } + } + } else { + int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; + int z = 0; + int easy=0; + stbi__skip(s, info.offset - info.extra_read - info.hsz); + if (info.bpp == 24) width = 3 * s->img_x; + else if (info.bpp == 16) width = 2*s->img_x; + else /* bpp = 32 and pad = 0 */ width=0; + pad = (-width) & 3; + if (info.bpp == 24) { + easy = 1; + } else if (info.bpp == 32) { + if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) + easy = 2; + } + if (!easy) { + if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + // right shift amt to put high bit in position #7 + rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); + gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); + bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); + ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); + if (rcount > 8 || gcount > 8 || bcount > 8 || acount > 8) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + } + for (j=0; j < (int) s->img_y; ++j) { + if (easy) { + for (i=0; i < (int) s->img_x; ++i) { + unsigned char a; + out[z+2] = stbi__get8(s); + out[z+1] = stbi__get8(s); + out[z+0] = stbi__get8(s); + z += 3; + a = (easy == 2 ? stbi__get8(s) : 255); + all_a |= a; + if (target == 4) out[z++] = a; + } + } else { + int bpp = info.bpp; + for (i=0; i < (int) s->img_x; ++i) { + stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); + unsigned int a; + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); + a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); + all_a |= a; + if (target == 4) out[z++] = STBI__BYTECAST(a); + } + } + stbi__skip(s, pad); + } + } + + // if alpha channel is all 0s, replace with all 255s + if (target == 4 && all_a == 0) + for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) + out[i] = 255; + + if (flip_vertically) { + stbi_uc t; + for (j=0; j < (int) s->img_y>>1; ++j) { + stbi_uc *p1 = out + j *s->img_x*target; + stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; + for (i=0; i < (int) s->img_x*target; ++i) { + t = p1[i]; p1[i] = p2[i]; p2[i] = t; + } + } + } + + if (req_comp && req_comp != target) { + out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + return out; +} +#endif + +// Targa Truevision - TGA +// by Jonathan Dummer +#ifndef STBI_NO_TGA +// returns STBI_rgb or whatever, 0 on error +static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16) +{ + // only RGB or RGBA (incl. 16bit) or grey allowed + if (is_rgb16) *is_rgb16 = 0; + switch(bits_per_pixel) { + case 8: return STBI_grey; + case 16: if(is_grey) return STBI_grey_alpha; + // fallthrough + case 15: if(is_rgb16) *is_rgb16 = 1; + return STBI_rgb; + case 24: // fallthrough + case 32: return bits_per_pixel/8; + default: return 0; + } +} + +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) +{ + int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp; + int sz, tga_colormap_type; + stbi__get8(s); // discard Offset + tga_colormap_type = stbi__get8(s); // colormap type + if( tga_colormap_type > 1 ) { + stbi__rewind(s); + return 0; // only RGB or indexed allowed + } + tga_image_type = stbi__get8(s); // image type + if ( tga_colormap_type == 1 ) { // colormapped (paletted) image + if (tga_image_type != 1 && tga_image_type != 9) { + stbi__rewind(s); + return 0; + } + stbi__skip(s,4); // skip index of first colormap entry and number of entries + sz = stbi__get8(s); // check bits per palette color entry + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) { + stbi__rewind(s); + return 0; + } + stbi__skip(s,4); // skip image x and y origin + tga_colormap_bpp = sz; + } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE + if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) { + stbi__rewind(s); + return 0; // only RGB or grey allowed, +/- RLE + } + stbi__skip(s,9); // skip colormap specification and image x/y origin + tga_colormap_bpp = 0; + } + tga_w = stbi__get16le(s); + if( tga_w < 1 ) { + stbi__rewind(s); + return 0; // test width + } + tga_h = stbi__get16le(s); + if( tga_h < 1 ) { + stbi__rewind(s); + return 0; // test height + } + tga_bits_per_pixel = stbi__get8(s); // bits per pixel + stbi__get8(s); // ignore alpha bits + if (tga_colormap_bpp != 0) { + if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) { + // when using a colormap, tga_bits_per_pixel is the size of the indexes + // I don't think anything but 8 or 16bit indexes makes sense + stbi__rewind(s); + return 0; + } + tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL); + } else { + tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL); + } + if(!tga_comp) { + stbi__rewind(s); + return 0; + } + if (x) *x = tga_w; + if (y) *y = tga_h; + if (comp) *comp = tga_comp; + return 1; // seems to have passed everything +} + +static int stbi__tga_test(stbi__context *s) +{ + int res = 0; + int sz, tga_color_type; + stbi__get8(s); // discard Offset + tga_color_type = stbi__get8(s); // color type + if ( tga_color_type > 1 ) goto errorEnd; // only RGB or indexed allowed + sz = stbi__get8(s); // image type + if ( tga_color_type == 1 ) { // colormapped (paletted) image + if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9 + stbi__skip(s,4); // skip index of first colormap entry and number of entries + sz = stbi__get8(s); // check bits per palette color entry + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; + stbi__skip(s,4); // skip image x and y origin + } else { // "normal" image w/o colormap + if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE + stbi__skip(s,9); // skip colormap specification and image x/y origin + } + if ( stbi__get16le(s) < 1 ) goto errorEnd; // test width + if ( stbi__get16le(s) < 1 ) goto errorEnd; // test height + sz = stbi__get8(s); // bits per pixel + if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index + if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; + + res = 1; // if we got this far, everything's good and we can return 1 instead of 0 + +errorEnd: + stbi__rewind(s); + return res; +} + +// read 16bit value and convert to 24bit RGB +static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out) +{ + stbi__uint16 px = (stbi__uint16)stbi__get16le(s); + stbi__uint16 fiveBitMask = 31; + // we have 3 channels with 5bits each + int r = (px >> 10) & fiveBitMask; + int g = (px >> 5) & fiveBitMask; + int b = px & fiveBitMask; + // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later + out[0] = (stbi_uc)((r * 255)/31); + out[1] = (stbi_uc)((g * 255)/31); + out[2] = (stbi_uc)((b * 255)/31); + + // some people claim that the most significant bit might be used for alpha + // (possibly if an alpha-bit is set in the "image descriptor byte") + // but that only made 16bit test images completely translucent.. + // so let's treat all 15 and 16bit TGAs as RGB with no alpha. +} + +static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + // read in the TGA header stuff + int tga_offset = stbi__get8(s); + int tga_indexed = stbi__get8(s); + int tga_image_type = stbi__get8(s); + int tga_is_RLE = 0; + int tga_palette_start = stbi__get16le(s); + int tga_palette_len = stbi__get16le(s); + int tga_palette_bits = stbi__get8(s); + int tga_x_origin = stbi__get16le(s); + int tga_y_origin = stbi__get16le(s); + int tga_width = stbi__get16le(s); + int tga_height = stbi__get16le(s); + int tga_bits_per_pixel = stbi__get8(s); + int tga_comp, tga_rgb16=0; + int tga_inverted = stbi__get8(s); + // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?) + // image data + unsigned char *tga_data; + unsigned char *tga_palette = NULL; + int i, j; + unsigned char raw_data[4] = {0}; + int RLE_count = 0; + int RLE_repeating = 0; + int read_next_pixel = 1; + STBI_NOTUSED(ri); + STBI_NOTUSED(tga_x_origin); // @TODO + STBI_NOTUSED(tga_y_origin); // @TODO + + if (tga_height > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (tga_width > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + // do a tiny bit of precessing + if ( tga_image_type >= 8 ) + { + tga_image_type -= 8; + tga_is_RLE = 1; + } + tga_inverted = 1 - ((tga_inverted >> 5) & 1); + + // If I'm paletted, then I'll use the number of bits from the palette + if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16); + else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16); + + if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency + return stbi__errpuc("bad format", "Can't find out TGA pixelformat"); + + // tga info + *x = tga_width; + *y = tga_height; + if (comp) *comp = tga_comp; + + if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0)) + return stbi__errpuc("too large", "Corrupt TGA"); + + tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0); + if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); + + // skip to the data's starting position (offset usually = 0) + stbi__skip(s, tga_offset ); + + if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) { + for (i=0; i < tga_height; ++i) { + int row = tga_inverted ? tga_height -i - 1 : i; + stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; + stbi__getn(s, tga_row, tga_width * tga_comp); + } + } else { + // do I need to load a palette? + if ( tga_indexed) + { + if (tga_palette_len == 0) { /* you have to have at least one entry! */ + STBI_FREE(tga_data); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + + // any data to skip? (offset usually = 0) + stbi__skip(s, tga_palette_start ); + // load the palette + tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0); + if (!tga_palette) { + STBI_FREE(tga_data); + return stbi__errpuc("outofmem", "Out of memory"); + } + if (tga_rgb16) { + stbi_uc *pal_entry = tga_palette; + STBI_ASSERT(tga_comp == STBI_rgb); + for (i=0; i < tga_palette_len; ++i) { + stbi__tga_read_rgb16(s, pal_entry); + pal_entry += tga_comp; + } + } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) { + STBI_FREE(tga_data); + STBI_FREE(tga_palette); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + } + // load the data + for (i=0; i < tga_width * tga_height; ++i) + { + // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? + if ( tga_is_RLE ) + { + if ( RLE_count == 0 ) + { + // yep, get the next byte as a RLE command + int RLE_cmd = stbi__get8(s); + RLE_count = 1 + (RLE_cmd & 127); + RLE_repeating = RLE_cmd >> 7; + read_next_pixel = 1; + } else if ( !RLE_repeating ) + { + read_next_pixel = 1; + } + } else + { + read_next_pixel = 1; + } + // OK, if I need to read a pixel, do it now + if ( read_next_pixel ) + { + // load however much data we did have + if ( tga_indexed ) + { + // read in index, then perform the lookup + int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s); + if ( pal_idx >= tga_palette_len ) { + // invalid index + pal_idx = 0; + } + pal_idx *= tga_comp; + for (j = 0; j < tga_comp; ++j) { + raw_data[j] = tga_palette[pal_idx+j]; + } + } else if(tga_rgb16) { + STBI_ASSERT(tga_comp == STBI_rgb); + stbi__tga_read_rgb16(s, raw_data); + } else { + // read in the data raw + for (j = 0; j < tga_comp; ++j) { + raw_data[j] = stbi__get8(s); + } + } + // clear the reading flag for the next pixel + read_next_pixel = 0; + } // end of reading a pixel + + // copy data + for (j = 0; j < tga_comp; ++j) + tga_data[i*tga_comp+j] = raw_data[j]; + + // in case we're in RLE mode, keep counting down + --RLE_count; + } + // do I need to invert the image? + if ( tga_inverted ) + { + for (j = 0; j*2 < tga_height; ++j) + { + int index1 = j * tga_width * tga_comp; + int index2 = (tga_height - 1 - j) * tga_width * tga_comp; + for (i = tga_width * tga_comp; i > 0; --i) + { + unsigned char temp = tga_data[index1]; + tga_data[index1] = tga_data[index2]; + tga_data[index2] = temp; + ++index1; + ++index2; + } + } + } + // clear my palette, if I had one + if ( tga_palette != NULL ) + { + STBI_FREE( tga_palette ); + } + } + + // swap RGB - if the source data was RGB16, it already is in the right order + if (tga_comp >= 3 && !tga_rgb16) + { + unsigned char* tga_pixel = tga_data; + for (i=0; i < tga_width * tga_height; ++i) + { + unsigned char temp = tga_pixel[0]; + tga_pixel[0] = tga_pixel[2]; + tga_pixel[2] = temp; + tga_pixel += tga_comp; + } + } + + // convert to target component count + if (req_comp && req_comp != tga_comp) + tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); + + // the things I do to get rid of an error message, and yet keep + // Microsoft's C compilers happy... [8^( + tga_palette_start = tga_palette_len = tga_palette_bits = + tga_x_origin = tga_y_origin = 0; + STBI_NOTUSED(tga_palette_start); + // OK, done + return tga_data; +} +#endif + +// ************************************************************************************************* +// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s) +{ + int r = (stbi__get32be(s) == 0x38425053); + stbi__rewind(s); + return r; +} + +static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount) +{ + int count, nleft, len; + + count = 0; + while ((nleft = pixelCount - count) > 0) { + len = stbi__get8(s); + if (len == 128) { + // No-op. + } else if (len < 128) { + // Copy next len+1 bytes literally. + len++; + if (len > nleft) return 0; // corrupt data + count += len; + while (len) { + *p = stbi__get8(s); + p += 4; + len--; + } + } else if (len > 128) { + stbi_uc val; + // Next -len+1 bytes in the dest are replicated from next source byte. + // (Interpret len as a negative 8-bit int.) + len = 257 - len; + if (len > nleft) return 0; // corrupt data + val = stbi__get8(s); + count += len; + while (len) { + *p = val; + p += 4; + len--; + } + } + } + + return 1; +} + +static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) +{ + int pixelCount; + int channelCount, compression; + int channel, i; + int bitdepth; + int w,h; + stbi_uc *out; + STBI_NOTUSED(ri); + + // Check identifier + if (stbi__get32be(s) != 0x38425053) // "8BPS" + return stbi__errpuc("not PSD", "Corrupt PSD image"); + + // Check file type version. + if (stbi__get16be(s) != 1) + return stbi__errpuc("wrong version", "Unsupported version of PSD image"); + + // Skip 6 reserved bytes. + stbi__skip(s, 6 ); + + // Read the number of channels (R, G, B, A, etc). + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) + return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); + + // Read the rows and columns of the image. + h = stbi__get32be(s); + w = stbi__get32be(s); + + if (h > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (w > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + // Make sure the depth is 8 bits. + bitdepth = stbi__get16be(s); + if (bitdepth != 8 && bitdepth != 16) + return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); + + // Make sure the color mode is RGB. + // Valid options are: + // 0: Bitmap + // 1: Grayscale + // 2: Indexed color + // 3: RGB color + // 4: CMYK color + // 7: Multichannel + // 8: Duotone + // 9: Lab color + if (stbi__get16be(s) != 3) + return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); + + // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) + stbi__skip(s,stbi__get32be(s) ); + + // Skip the image resources. (resolution, pen tool paths, etc) + stbi__skip(s, stbi__get32be(s) ); + + // Skip the reserved data. + stbi__skip(s, stbi__get32be(s) ); + + // Find out if the data is compressed. + // Known values: + // 0: no compression + // 1: RLE compressed + compression = stbi__get16be(s); + if (compression > 1) + return stbi__errpuc("bad compression", "PSD has an unknown compression format"); + + // Check size + if (!stbi__mad3sizes_valid(4, w, h, 0)) + return stbi__errpuc("too large", "Corrupt PSD"); + + // Create the destination image. + + if (!compression && bitdepth == 16 && bpc == 16) { + out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0); + ri->bits_per_channel = 16; + } else + out = (stbi_uc *) stbi__malloc(4 * w*h); + + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + pixelCount = w*h; + + // Initialize the data to zero. + //memset( out, 0, pixelCount * 4 ); + + // Finally, the image data. + if (compression) { + // RLE as used by .PSD and .TIFF + // Loop until you get the number of unpacked bytes you are expecting: + // Read the next source byte into n. + // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. + // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. + // Else if n is 128, noop. + // Endloop + + // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, + // which we're going to just skip. + stbi__skip(s, h * channelCount * 2 ); + + // Read the RLE data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out+channel; + if (channel >= channelCount) { + // Fill this channel with default data. + for (i = 0; i < pixelCount; i++, p += 4) + *p = (channel == 3 ? 255 : 0); + } else { + // Read the RLE data. + if (!stbi__psd_decode_rle(s, p, pixelCount)) { + STBI_FREE(out); + return stbi__errpuc("corrupt", "bad RLE data"); + } + } + } + + } else { + // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) + // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image. + + // Read the data by channel. + for (channel = 0; channel < 4; channel++) { + if (channel >= channelCount) { + // Fill this channel with default data. + if (bitdepth == 16 && bpc == 16) { + stbi__uint16 *q = ((stbi__uint16 *) out) + channel; + stbi__uint16 val = channel == 3 ? 65535 : 0; + for (i = 0; i < pixelCount; i++, q += 4) + *q = val; + } else { + stbi_uc *p = out+channel; + stbi_uc val = channel == 3 ? 255 : 0; + for (i = 0; i < pixelCount; i++, p += 4) + *p = val; + } + } else { + if (ri->bits_per_channel == 16) { // output bpc + stbi__uint16 *q = ((stbi__uint16 *) out) + channel; + for (i = 0; i < pixelCount; i++, q += 4) + *q = (stbi__uint16) stbi__get16be(s); + } else { + stbi_uc *p = out+channel; + if (bitdepth == 16) { // input bpc + for (i = 0; i < pixelCount; i++, p += 4) + *p = (stbi_uc) (stbi__get16be(s) >> 8); + } else { + for (i = 0; i < pixelCount; i++, p += 4) + *p = stbi__get8(s); + } + } + } + } + } + + // remove weird white matte from PSD + if (channelCount >= 4) { + if (ri->bits_per_channel == 16) { + for (i=0; i < w*h; ++i) { + stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i; + if (pixel[3] != 0 && pixel[3] != 65535) { + float a = pixel[3] / 65535.0f; + float ra = 1.0f / a; + float inv_a = 65535.0f * (1 - ra); + pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a); + pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a); + pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a); + } + } + } else { + for (i=0; i < w*h; ++i) { + unsigned char *pixel = out + 4*i; + if (pixel[3] != 0 && pixel[3] != 255) { + float a = pixel[3] / 255.0f; + float ra = 1.0f / a; + float inv_a = 255.0f * (1 - ra); + pixel[0] = (unsigned char) (pixel[0]*ra + inv_a); + pixel[1] = (unsigned char) (pixel[1]*ra + inv_a); + pixel[2] = (unsigned char) (pixel[2]*ra + inv_a); + } + } + } + } + + // convert to desired output format + if (req_comp && req_comp != 4) { + if (ri->bits_per_channel == 16) + out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h); + else + out = stbi__convert_format(out, 4, req_comp, w, h); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + if (comp) *comp = 4; + *y = h; + *x = w; + + return out; +} +#endif + +// ************************************************************************************************* +// Softimage PIC loader +// by Tom Seddon +// +// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format +// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ + +#ifndef STBI_NO_PIC +static int stbi__pic_is4(stbi__context *s,const char *str) +{ + int i; + for (i=0; i<4; ++i) + if (stbi__get8(s) != (stbi_uc)str[i]) + return 0; + + return 1; +} + +static int stbi__pic_test_core(stbi__context *s) +{ + int i; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) + return 0; + + for(i=0;i<84;++i) + stbi__get8(s); + + if (!stbi__pic_is4(s,"PICT")) + return 0; + + return 1; +} + +typedef struct +{ + stbi_uc size,type,channel; +} stbi__pic_packet; + +static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) +{ + int mask=0x80, i; + + for (i=0; i<4; ++i, mask>>=1) { + if (channel & mask) { + if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); + dest[i]=stbi__get8(s); + } + } + + return dest; +} + +static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) +{ + int mask=0x80,i; + + for (i=0;i<4; ++i, mask>>=1) + if (channel&mask) + dest[i]=src[i]; +} + +static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) +{ + int act_comp=0,num_packets=0,y,chained; + stbi__pic_packet packets[10]; + + // this will (should...) cater for even some bizarre stuff like having data + // for the same channel in multiple packets. + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return stbi__errpuc("bad format","too many packets"); + + packet = &packets[num_packets++]; + + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + + act_comp |= packet->channel; + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); + if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? + + for(y=0; ytype) { + default: + return stbi__errpuc("bad format","packet has bad compression type"); + + case 0: {//uncompressed + int x; + + for(x=0;xchannel,dest)) + return 0; + break; + } + + case 1://Pure RLE + { + int left=width, i; + + while (left>0) { + stbi_uc count,value[4]; + + count=stbi__get8(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); + + if (count > left) + count = (stbi_uc) left; + + if (!stbi__readval(s,packet->channel,value)) return 0; + + for(i=0; ichannel,dest,value); + left -= count; + } + } + break; + + case 2: {//Mixed RLE + int left=width; + while (left>0) { + int count = stbi__get8(s), i; + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); + + if (count >= 128) { // Repeated + stbi_uc value[4]; + + if (count==128) + count = stbi__get16be(s); + else + count -= 127; + if (count > left) + return stbi__errpuc("bad file","scanline overrun"); + + if (!stbi__readval(s,packet->channel,value)) + return 0; + + for(i=0;ichannel,dest,value); + } else { // Raw + ++count; + if (count>left) return stbi__errpuc("bad file","scanline overrun"); + + for(i=0;ichannel,dest)) + return 0; + } + left-=count; + } + break; + } + } + } + } + + return result; +} + +static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri) +{ + stbi_uc *result; + int i, x,y, internal_comp; + STBI_NOTUSED(ri); + + if (!comp) comp = &internal_comp; + + for (i=0; i<92; ++i) + stbi__get8(s); + + x = stbi__get16be(s); + y = stbi__get16be(s); + + if (y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); + if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode"); + + stbi__get32be(s); //skip `ratio' + stbi__get16be(s); //skip `fields' + stbi__get16be(s); //skip `pad' + + // intermediate buffer is RGBA + result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0); + if (!result) return stbi__errpuc("outofmem", "Out of memory"); + memset(result, 0xff, x*y*4); + + if (!stbi__pic_load_core(s,x,y,comp, result)) { + STBI_FREE(result); + result=0; + } + *px = x; + *py = y; + if (req_comp == 0) req_comp = *comp; + result=stbi__convert_format(result,4,req_comp,x,y); + + return result; +} + +static int stbi__pic_test(stbi__context *s) +{ + int r = stbi__pic_test_core(s); + stbi__rewind(s); + return r; +} +#endif + +// ************************************************************************************************* +// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb + +#ifndef STBI_NO_GIF +typedef struct +{ + stbi__int16 prefix; + stbi_uc first; + stbi_uc suffix; +} stbi__gif_lzw; + +typedef struct +{ + int w,h; + stbi_uc *out; // output buffer (always 4 components) + stbi_uc *background; // The current "background" as far as a gif is concerned + stbi_uc *history; + int flags, bgindex, ratio, transparent, eflags; + stbi_uc pal[256][4]; + stbi_uc lpal[256][4]; + stbi__gif_lzw codes[8192]; + stbi_uc *color_table; + int parse, step; + int lflags; + int start_x, start_y; + int max_x, max_y; + int cur_x, cur_y; + int line_size; + int delay; +} stbi__gif; + +static int stbi__gif_test_raw(stbi__context *s) +{ + int sz; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; + sz = stbi__get8(s); + if (sz != '9' && sz != '7') return 0; + if (stbi__get8(s) != 'a') return 0; + return 1; +} + +static int stbi__gif_test(stbi__context *s) +{ + int r = stbi__gif_test_raw(s); + stbi__rewind(s); + return r; +} + +static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) +{ + int i; + for (i=0; i < num_entries; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + pal[i][3] = transp == i ? 0 : 255; + } +} + +static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) +{ + stbi_uc version; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') + return stbi__err("not GIF", "Corrupt GIF"); + + version = stbi__get8(s); + if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); + if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); + + stbi__g_failure_reason = ""; + g->w = stbi__get16le(s); + g->h = stbi__get16le(s); + g->flags = stbi__get8(s); + g->bgindex = stbi__get8(s); + g->ratio = stbi__get8(s); + g->transparent = -1; + + if (g->w > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + if (g->h > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); + + if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments + + if (is_info) return 1; + + if (g->flags & 0x80) + stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); + + return 1; +} + +static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif)); + if (!g) return stbi__err("outofmem", "Out of memory"); + if (!stbi__gif_header(s, g, comp, 1)) { + STBI_FREE(g); + stbi__rewind( s ); + return 0; + } + if (x) *x = g->w; + if (y) *y = g->h; + STBI_FREE(g); + return 1; +} + +static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) +{ + stbi_uc *p, *c; + int idx; + + // recurse to decode the prefixes, since the linked-list is backwards, + // and working backwards through an interleaved image would be nasty + if (g->codes[code].prefix >= 0) + stbi__out_gif_code(g, g->codes[code].prefix); + + if (g->cur_y >= g->max_y) return; + + idx = g->cur_x + g->cur_y; + p = &g->out[idx]; + g->history[idx / 4] = 1; + + c = &g->color_table[g->codes[code].suffix * 4]; + if (c[3] > 128) { // don't render transparent pixels; + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = c[3]; + } + g->cur_x += 4; + + if (g->cur_x >= g->max_x) { + g->cur_x = g->start_x; + g->cur_y += g->step; + + while (g->cur_y >= g->max_y && g->parse > 0) { + g->step = (1 << g->parse) * g->line_size; + g->cur_y = g->start_y + (g->step >> 1); + --g->parse; + } + } +} + +static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) +{ + stbi_uc lzw_cs; + stbi__int32 len, init_code; + stbi__uint32 first; + stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; + stbi__gif_lzw *p; + + lzw_cs = stbi__get8(s); + if (lzw_cs > 12) return NULL; + clear = 1 << lzw_cs; + first = 1; + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + bits = 0; + valid_bits = 0; + for (init_code = 0; init_code < clear; init_code++) { + g->codes[init_code].prefix = -1; + g->codes[init_code].first = (stbi_uc) init_code; + g->codes[init_code].suffix = (stbi_uc) init_code; + } + + // support no starting clear code + avail = clear+2; + oldcode = -1; + + len = 0; + for(;;) { + if (valid_bits < codesize) { + if (len == 0) { + len = stbi__get8(s); // start new block + if (len == 0) + return g->out; + } + --len; + bits |= (stbi__int32) stbi__get8(s) << valid_bits; + valid_bits += 8; + } else { + stbi__int32 code = bits & codemask; + bits >>= codesize; + valid_bits -= codesize; + // @OPTIMIZE: is there some way we can accelerate the non-clear path? + if (code == clear) { // clear code + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + avail = clear + 2; + oldcode = -1; + first = 0; + } else if (code == clear + 1) { // end of stream code + stbi__skip(s, len); + while ((len = stbi__get8(s)) > 0) + stbi__skip(s,len); + return g->out; + } else if (code <= avail) { + if (first) { + return stbi__errpuc("no clear code", "Corrupt GIF"); + } + + if (oldcode >= 0) { + p = &g->codes[avail++]; + if (avail > 8192) { + return stbi__errpuc("too many codes", "Corrupt GIF"); + } + + p->prefix = (stbi__int16) oldcode; + p->first = g->codes[oldcode].first; + p->suffix = (code == avail) ? p->first : g->codes[code].first; + } else if (code == avail) + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + + stbi__out_gif_code(g, (stbi__uint16) code); + + if ((avail & codemask) == 0 && avail <= 0x0FFF) { + codesize++; + codemask = (1 << codesize) - 1; + } + + oldcode = code; + } else { + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + } + } + } +} + +// this function is designed to support animated gifs, although stb_image doesn't support it +// two back is the image from two frames ago, used for a very specific disposal format +static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back) +{ + int dispose; + int first_frame; + int pi; + int pcount; + STBI_NOTUSED(req_comp); + + // on first frame, any non-written pixels get the background colour (non-transparent) + first_frame = 0; + if (g->out == 0) { + if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header + if (!stbi__mad3sizes_valid(4, g->w, g->h, 0)) + return stbi__errpuc("too large", "GIF image is too large"); + pcount = g->w * g->h; + g->out = (stbi_uc *) stbi__malloc(4 * pcount); + g->background = (stbi_uc *) stbi__malloc(4 * pcount); + g->history = (stbi_uc *) stbi__malloc(pcount); + if (!g->out || !g->background || !g->history) + return stbi__errpuc("outofmem", "Out of memory"); + + // image is treated as "transparent" at the start - ie, nothing overwrites the current background; + // background colour is only used for pixels that are not rendered first frame, after that "background" + // color refers to the color that was there the previous frame. + memset(g->out, 0x00, 4 * pcount); + memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent) + memset(g->history, 0x00, pcount); // pixels that were affected previous frame + first_frame = 1; + } else { + // second frame - how do we dispose of the previous one? + dispose = (g->eflags & 0x1C) >> 2; + pcount = g->w * g->h; + + if ((dispose == 3) && (two_back == 0)) { + dispose = 2; // if I don't have an image to revert back to, default to the old background + } + + if (dispose == 3) { // use previous graphic + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi]) { + memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); + } + } + } else if (dispose == 2) { + // restore what was changed last frame to background before that frame; + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi]) { + memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); + } + } + } else { + // This is a non-disposal case eithe way, so just + // leave the pixels as is, and they will become the new background + // 1: do not dispose + // 0: not specified. + } + + // background is what out is after the undoing of the previou frame; + memcpy( g->background, g->out, 4 * g->w * g->h ); + } + + // clear my history; + memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame + + for (;;) { + int tag = stbi__get8(s); + switch (tag) { + case 0x2C: /* Image Descriptor */ + { + stbi__int32 x, y, w, h; + stbi_uc *o; + + x = stbi__get16le(s); + y = stbi__get16le(s); + w = stbi__get16le(s); + h = stbi__get16le(s); + if (((x + w) > (g->w)) || ((y + h) > (g->h))) + return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); + + g->line_size = g->w * 4; + g->start_x = x * 4; + g->start_y = y * g->line_size; + g->max_x = g->start_x + w * 4; + g->max_y = g->start_y + h * g->line_size; + g->cur_x = g->start_x; + g->cur_y = g->start_y; + + // if the width of the specified rectangle is 0, that means + // we may not see *any* pixels or the image is malformed; + // to make sure this is caught, move the current y down to + // max_y (which is what out_gif_code checks). + if (w == 0) + g->cur_y = g->max_y; + + g->lflags = stbi__get8(s); + + if (g->lflags & 0x40) { + g->step = 8 * g->line_size; // first interlaced spacing + g->parse = 3; + } else { + g->step = g->line_size; + g->parse = 0; + } + + if (g->lflags & 0x80) { + stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); + g->color_table = (stbi_uc *) g->lpal; + } else if (g->flags & 0x80) { + g->color_table = (stbi_uc *) g->pal; + } else + return stbi__errpuc("missing color table", "Corrupt GIF"); + + o = stbi__process_gif_raster(s, g); + if (!o) return NULL; + + // if this was the first frame, + pcount = g->w * g->h; + if (first_frame && (g->bgindex > 0)) { + // if first frame, any pixel not drawn to gets the background color + for (pi = 0; pi < pcount; ++pi) { + if (g->history[pi] == 0) { + g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; + memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); + } + } + } + + return o; + } + + case 0x21: // Comment Extension. + { + int len; + int ext = stbi__get8(s); + if (ext == 0xF9) { // Graphic Control Extension. + len = stbi__get8(s); + if (len == 4) { + g->eflags = stbi__get8(s); + g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths. + + // unset old transparent + if (g->transparent >= 0) { + g->pal[g->transparent][3] = 255; + } + if (g->eflags & 0x01) { + g->transparent = stbi__get8(s); + if (g->transparent >= 0) { + g->pal[g->transparent][3] = 0; + } + } else { + // don't need transparent + stbi__skip(s, 1); + g->transparent = -1; + } + } else { + stbi__skip(s, len); + break; + } + } + while ((len = stbi__get8(s)) != 0) { + stbi__skip(s, len); + } + break; + } + + case 0x3B: // gif stream termination code + return (stbi_uc *) s; // using '1' causes warning on some compilers + + default: + return stbi__errpuc("unknown code", "Corrupt GIF"); + } + } +} + +static void *stbi__load_gif_main_outofmem(stbi__gif *g, stbi_uc *out, int **delays) +{ + STBI_FREE(g->out); + STBI_FREE(g->history); + STBI_FREE(g->background); + + if (out) STBI_FREE(out); + if (delays && *delays) STBI_FREE(*delays); + return stbi__errpuc("outofmem", "Out of memory"); +} + +static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp) +{ + if (stbi__gif_test(s)) { + int layers = 0; + stbi_uc *u = 0; + stbi_uc *out = 0; + stbi_uc *two_back = 0; + stbi__gif g; + int stride; + int out_size = 0; + int delays_size = 0; + + STBI_NOTUSED(out_size); + STBI_NOTUSED(delays_size); + + memset(&g, 0, sizeof(g)); + if (delays) { + *delays = 0; + } + + do { + u = stbi__gif_load_next(s, &g, comp, req_comp, two_back); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + + if (u) { + *x = g.w; + *y = g.h; + ++layers; + stride = g.w * g.h * 4; + + if (out) { + void *tmp = (stbi_uc*) STBI_REALLOC_SIZED( out, out_size, layers * stride ); + if (!tmp) + return stbi__load_gif_main_outofmem(&g, out, delays); + else { + out = (stbi_uc*) tmp; + out_size = layers * stride; + } + + if (delays) { + int *new_delays = (int*) STBI_REALLOC_SIZED( *delays, delays_size, sizeof(int) * layers ); + if (!new_delays) + return stbi__load_gif_main_outofmem(&g, out, delays); + *delays = new_delays; + delays_size = layers * sizeof(int); + } + } else { + out = (stbi_uc*)stbi__malloc( layers * stride ); + if (!out) + return stbi__load_gif_main_outofmem(&g, out, delays); + out_size = layers * stride; + if (delays) { + *delays = (int*) stbi__malloc( layers * sizeof(int) ); + if (!*delays) + return stbi__load_gif_main_outofmem(&g, out, delays); + delays_size = layers * sizeof(int); + } + } + memcpy( out + ((layers - 1) * stride), u, stride ); + if (layers >= 2) { + two_back = out - 2 * stride; + } + + if (delays) { + (*delays)[layers - 1U] = g.delay; + } + } + } while (u != 0); + + // free temp buffer; + STBI_FREE(g.out); + STBI_FREE(g.history); + STBI_FREE(g.background); + + // do the final conversion after loading everything; + if (req_comp && req_comp != 4) + out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h); + + *z = layers; + return out; + } else { + return stbi__errpuc("not GIF", "Image was not as a gif type."); + } +} + +static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *u = 0; + stbi__gif g; + memset(&g, 0, sizeof(g)); + STBI_NOTUSED(ri); + + u = stbi__gif_load_next(s, &g, comp, req_comp, 0); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + if (u) { + *x = g.w; + *y = g.h; + + // moved conversion to after successful load so that the same + // can be done for multiple frames. + if (req_comp && req_comp != 4) + u = stbi__convert_format(u, 4, req_comp, g.w, g.h); + } else if (g.out) { + // if there was an error and we allocated an image buffer, free it! + STBI_FREE(g.out); + } + + // free buffers needed for multiple frame loading; + STBI_FREE(g.history); + STBI_FREE(g.background); + + return u; +} + +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) +{ + return stbi__gif_info_raw(s,x,y,comp); +} +#endif + +// ************************************************************************************************* +// Radiance RGBE HDR loader +// originally by Nicolas Schulz +#ifndef STBI_NO_HDR +static int stbi__hdr_test_core(stbi__context *s, const char *signature) +{ + int i; + for (i=0; signature[i]; ++i) + if (stbi__get8(s) != signature[i]) + return 0; + stbi__rewind(s); + return 1; +} + +static int stbi__hdr_test(stbi__context* s) +{ + int r = stbi__hdr_test_core(s, "#?RADIANCE\n"); + stbi__rewind(s); + if(!r) { + r = stbi__hdr_test_core(s, "#?RGBE\n"); + stbi__rewind(s); + } + return r; +} + +#define STBI__HDR_BUFLEN 1024 +static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) +{ + int len=0; + char c = '\0'; + + c = (char) stbi__get8(z); + + while (!stbi__at_eof(z) && c != '\n') { + buffer[len++] = c; + if (len == STBI__HDR_BUFLEN-1) { + // flush to end of line + while (!stbi__at_eof(z) && stbi__get8(z) != '\n') + ; + break; + } + c = (char) stbi__get8(z); + } + + buffer[len] = 0; + return buffer; +} + +static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) +{ + if ( input[3] != 0 ) { + float f1; + // Exponent + f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); + if (req_comp <= 2) + output[0] = (input[0] + input[1] + input[2]) * f1 / 3; + else { + output[0] = input[0] * f1; + output[1] = input[1] * f1; + output[2] = input[2] * f1; + } + if (req_comp == 2) output[1] = 1; + if (req_comp == 4) output[3] = 1; + } else { + switch (req_comp) { + case 4: output[3] = 1; /* fallthrough */ + case 3: output[0] = output[1] = output[2] = 0; + break; + case 2: output[1] = 1; /* fallthrough */ + case 1: output[0] = 0; + break; + } + } +} + +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int width, height; + stbi_uc *scanline; + float *hdr_data; + int len; + unsigned char count, value; + int i, j, k, c1,c2, z; + const char *headerToken; + STBI_NOTUSED(ri); + + // Check identifier + headerToken = stbi__hdr_gettoken(s,buffer); + if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0) + return stbi__errpf("not HDR", "Corrupt HDR image"); + + // Parse header + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); + + // Parse width and height + // can't use sscanf() if we're not using stdio! + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + height = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + width = (int) strtol(token, NULL, 10); + + if (height > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)"); + if (width > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)"); + + *x = width; + *y = height; + + if (comp) *comp = 3; + if (req_comp == 0) req_comp = 3; + + if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0)) + return stbi__errpf("too large", "HDR image is too large"); + + // Read data + hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0); + if (!hdr_data) + return stbi__errpf("outofmem", "Out of memory"); + + // Load image data + // image data is stored as some number of sca + if ( width < 8 || width >= 32768) { + // Read flat data + for (j=0; j < height; ++j) { + for (i=0; i < width; ++i) { + stbi_uc rgbe[4]; + main_decode_loop: + stbi__getn(s, rgbe, 4); + stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); + } + } + } else { + // Read RLE-encoded data + scanline = NULL; + + for (j = 0; j < height; ++j) { + c1 = stbi__get8(s); + c2 = stbi__get8(s); + len = stbi__get8(s); + if (c1 != 2 || c2 != 2 || (len & 0x80)) { + // not run-length encoded, so we have to actually use THIS data as a decoded + // pixel (note this can't be a valid pixel--one of RGB must be >= 128) + stbi_uc rgbe[4]; + rgbe[0] = (stbi_uc) c1; + rgbe[1] = (stbi_uc) c2; + rgbe[2] = (stbi_uc) len; + rgbe[3] = (stbi_uc) stbi__get8(s); + stbi__hdr_convert(hdr_data, rgbe, req_comp); + i = 1; + j = 0; + STBI_FREE(scanline); + goto main_decode_loop; // yes, this makes no sense + } + len <<= 8; + len |= stbi__get8(s); + if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } + if (scanline == NULL) { + scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0); + if (!scanline) { + STBI_FREE(hdr_data); + return stbi__errpf("outofmem", "Out of memory"); + } + } + + for (k = 0; k < 4; ++k) { + int nleft; + i = 0; + while ((nleft = width - i) > 0) { + count = stbi__get8(s); + if (count > 128) { + // Run + value = stbi__get8(s); + count -= 128; + if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = value; + } else { + // Dump + if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = stbi__get8(s); + } + } + } + for (i=0; i < width; ++i) + stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); + } + if (scanline) + STBI_FREE(scanline); + } + + return hdr_data; +} + +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int dummy; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + if (stbi__hdr_test(s) == 0) { + stbi__rewind( s ); + return 0; + } + + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) { + stbi__rewind( s ); + return 0; + } + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *y = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *x = (int) strtol(token, NULL, 10); + *comp = 3; + return 1; +} +#endif // STBI_NO_HDR + +#ifndef STBI_NO_BMP +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) +{ + void *p; + stbi__bmp_data info; + + info.all_a = 255; + p = stbi__bmp_parse_header(s, &info); + if (p == NULL) { + stbi__rewind( s ); + return 0; + } + if (x) *x = s->img_x; + if (y) *y = s->img_y; + if (comp) { + if (info.bpp == 24 && info.ma == 0xff000000) + *comp = 3; + else + *comp = info.ma ? 4 : 3; + } + return 1; +} +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) +{ + int channelCount, dummy, depth; + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + *y = stbi__get32be(s); + *x = stbi__get32be(s); + depth = stbi__get16be(s); + if (depth != 8 && depth != 16) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 3) { + stbi__rewind( s ); + return 0; + } + *comp = 4; + return 1; +} + +static int stbi__psd_is16(stbi__context *s) +{ + int channelCount, depth; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + STBI_NOTUSED(stbi__get32be(s)); + STBI_NOTUSED(stbi__get32be(s)); + depth = stbi__get16be(s); + if (depth != 16) { + stbi__rewind( s ); + return 0; + } + return 1; +} +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) +{ + int act_comp=0,num_packets=0,chained,dummy; + stbi__pic_packet packets[10]; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { + stbi__rewind(s); + return 0; + } + + stbi__skip(s, 88); + + *x = stbi__get16be(s); + *y = stbi__get16be(s); + if (stbi__at_eof(s)) { + stbi__rewind( s); + return 0; + } + if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { + stbi__rewind( s ); + return 0; + } + + stbi__skip(s, 8); + + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return 0; + + packet = &packets[num_packets++]; + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + act_comp |= packet->channel; + + if (stbi__at_eof(s)) { + stbi__rewind( s ); + return 0; + } + if (packet->size != 8) { + stbi__rewind( s ); + return 0; + } + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); + + return 1; +} +#endif + +// ************************************************************************************************* +// Portable Gray Map and Portable Pixel Map loader +// by Ken Miller +// +// PGM: http://netpbm.sourceforge.net/doc/pgm.html +// PPM: http://netpbm.sourceforge.net/doc/ppm.html +// +// Known limitations: +// Does not support comments in the header section +// Does not support ASCII image data (formats P2 and P3) + +#ifndef STBI_NO_PNM + +static int stbi__pnm_test(stbi__context *s) +{ + char p, t; + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + return 1; +} + +static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) +{ + stbi_uc *out; + STBI_NOTUSED(ri); + + ri->bits_per_channel = stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n); + if (ri->bits_per_channel == 0) + return 0; + + if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + + if (!stbi__mad4sizes_valid(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0)) + return stbi__errpuc("too large", "PNM too large"); + + out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + if (!stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8))) { + STBI_FREE(out); + return stbi__errpuc("bad PNM", "PNM file truncated"); + } + + if (req_comp && req_comp != s->img_n) { + if (ri->bits_per_channel == 16) { + out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, s->img_n, req_comp, s->img_x, s->img_y); + } else { + out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + } + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + return out; +} + +static int stbi__pnm_isspace(char c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; +} + +static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) +{ + for (;;) { + while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) + *c = (char) stbi__get8(s); + + if (stbi__at_eof(s) || *c != '#') + break; + + while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' ) + *c = (char) stbi__get8(s); + } +} + +static int stbi__pnm_isdigit(char c) +{ + return c >= '0' && c <= '9'; +} + +static int stbi__pnm_getinteger(stbi__context *s, char *c) +{ + int value = 0; + + while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { + value = value*10 + (*c - '0'); + *c = (char) stbi__get8(s); + if((value > 214748364) || (value == 214748364 && *c > '7')) + return stbi__err("integer parse overflow", "Parsing an integer in the PPM header overflowed a 32-bit int"); + } + + return value; +} + +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) +{ + int maxv, dummy; + char c, p, t; + + if (!x) x = &dummy; + if (!y) y = &dummy; + if (!comp) comp = &dummy; + + stbi__rewind(s); + + // Get identifier + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind(s); + return 0; + } + + *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm + + c = (char) stbi__get8(s); + stbi__pnm_skip_whitespace(s, &c); + + *x = stbi__pnm_getinteger(s, &c); // read width + if(*x == 0) + return stbi__err("invalid width", "PPM image header had zero or overflowing width"); + stbi__pnm_skip_whitespace(s, &c); + + *y = stbi__pnm_getinteger(s, &c); // read height + if (*y == 0) + return stbi__err("invalid width", "PPM image header had zero or overflowing width"); + stbi__pnm_skip_whitespace(s, &c); + + maxv = stbi__pnm_getinteger(s, &c); // read max value + if (maxv > 65535) + return stbi__err("max value > 65535", "PPM image supports only 8-bit and 16-bit images"); + else if (maxv > 255) + return 16; + else + return 8; +} + +static int stbi__pnm_is16(stbi__context *s) +{ + if (stbi__pnm_info(s, NULL, NULL, NULL) == 16) + return 1; + return 0; +} +#endif + +static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNG + if (stbi__png_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_GIF + if (stbi__gif_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_BMP + if (stbi__bmp_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PIC + if (stbi__pic_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_info(s, x, y, comp)) return 1; + #endif + + // test tga last because it's a crappy test! + #ifndef STBI_NO_TGA + if (stbi__tga_info(s, x, y, comp)) + return 1; + #endif + return stbi__err("unknown image type", "Image not of any known type, or corrupt"); +} + +static int stbi__is_16_main(stbi__context *s) +{ + #ifndef STBI_NO_PNG + if (stbi__png_is16(s)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_is16(s)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_is16(s)) return 1; + #endif + return 0; +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_info_from_file(f, x, y, comp); + fclose(f); + return result; +} + +STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__info_main(&s,x,y,comp); + fseek(f,pos,SEEK_SET); + return r; +} + +STBIDEF int stbi_is_16_bit(char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_is_16_bit_from_file(f); + fclose(f); + return result; +} + +STBIDEF int stbi_is_16_bit_from_file(FILE *f) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__is_16_main(&s); + fseek(f,pos,SEEK_SET); + return r; +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__is_16_main(&s); +} + +STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__is_16_main(&s); +} + +#endif // STB_IMAGE_IMPLEMENTATION + +/* + revision history: + 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs + 2.19 (2018-02-11) fix warning + 2.18 (2018-01-30) fix warnings + 2.17 (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug + 1-bit BMP + *_is_16_bit api + avoid warnings + 2.16 (2017-07-23) all functions have 16-bit variants; + STBI_NO_STDIO works again; + compilation fixes; + fix rounding in unpremultiply; + optimize vertical flip; + disable raw_len validation; + documentation fixes + 2.15 (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode; + warning fixes; disable run-time SSE detection on gcc; + uniform handling of optional "return" values; + thread-safe initialization of zlib tables + 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs + 2.13 (2016-11-29) add 16-bit API, only supported for PNG right now + 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes + 2.11 (2016-04-02) allocate large structures on the stack + remove white matting for transparent PSD + fix reported channel count for PNG & BMP + re-enable SSE2 in non-gcc 64-bit + support RGB-formatted JPEG + read 16-bit PNGs (only as 8-bit) + 2.10 (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED + 2.09 (2016-01-16) allow comments in PNM files + 16-bit-per-pixel TGA (not bit-per-component) + info() for TGA could break due to .hdr handling + info() for BMP to shares code instead of sloppy parse + can use STBI_REALLOC_SIZED if allocator doesn't support realloc + code cleanup + 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA + 2.07 (2015-09-13) fix compiler warnings + partial animated GIF support + limited 16-bpc PSD support + #ifdef unused functions + bug with < 92 byte PIC,PNM,HDR,TGA + 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value + 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning + 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit + 2.03 (2015-04-12) extra corruption checking (mmozeiko) + stbi_set_flip_vertically_on_load (nguillemot) + fix NEON support; fix mingw support + 2.02 (2015-01-19) fix incorrect assert, fix warning + 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 + 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG + 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) + progressive JPEG (stb) + PGM/PPM support (Ken Miller) + STBI_MALLOC,STBI_REALLOC,STBI_FREE + GIF bugfix -- seemingly never worked + STBI_NO_*, STBI_ONLY_* + 1.48 (2014-12-14) fix incorrectly-named assert() + 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) + optimize PNG (ryg) + fix bug in interlaced PNG with user-specified channel count (stb) + 1.46 (2014-08-26) + fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG + 1.45 (2014-08-16) + fix MSVC-ARM internal compiler error by wrapping malloc + 1.44 (2014-08-07) + various warning fixes from Ronny Chevalier + 1.43 (2014-07-15) + fix MSVC-only compiler problem in code changed in 1.42 + 1.42 (2014-07-09) + don't define _CRT_SECURE_NO_WARNINGS (affects user code) + fixes to stbi__cleanup_jpeg path + added STBI_ASSERT to avoid requiring assert.h + 1.41 (2014-06-25) + fix search&replace from 1.36 that messed up comments/error messages + 1.40 (2014-06-22) + fix gcc struct-initialization warning + 1.39 (2014-06-15) + fix to TGA optimization when req_comp != number of components in TGA; + fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) + add support for BMP version 5 (more ignored fields) + 1.38 (2014-06-06) + suppress MSVC warnings on integer casts truncating values + fix accidental rename of 'skip' field of I/O + 1.37 (2014-06-04) + remove duplicate typedef + 1.36 (2014-06-03) + convert to header file single-file library + if de-iphone isn't set, load iphone images color-swapped instead of returning NULL + 1.35 (2014-05-27) + various warnings + fix broken STBI_SIMD path + fix bug where stbi_load_from_file no longer left file pointer in correct place + fix broken non-easy path for 32-bit BMP (possibly never used) + TGA optimization by Arseny Kapoulkine + 1.34 (unknown) + use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case + 1.33 (2011-07-14) + make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements + 1.32 (2011-07-13) + support for "info" function for all supported filetypes (SpartanJ) + 1.31 (2011-06-20) + a few more leak fixes, bug in PNG handling (SpartanJ) + 1.30 (2011-06-11) + added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) + removed deprecated format-specific test/load functions + removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway + error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) + fix inefficiency in decoding 32-bit BMP (David Woo) + 1.29 (2010-08-16) + various warning fixes from Aurelien Pocheville + 1.28 (2010-08-01) + fix bug in GIF palette transparency (SpartanJ) + 1.27 (2010-08-01) + cast-to-stbi_uc to fix warnings + 1.26 (2010-07-24) + fix bug in file buffering for PNG reported by SpartanJ + 1.25 (2010-07-17) + refix trans_data warning (Won Chun) + 1.24 (2010-07-12) + perf improvements reading from files on platforms with lock-heavy fgetc() + minor perf improvements for jpeg + deprecated type-specific functions so we'll get feedback if they're needed + attempt to fix trans_data warning (Won Chun) + 1.23 fixed bug in iPhone support + 1.22 (2010-07-10) + removed image *writing* support + stbi_info support from Jetro Lauha + GIF support from Jean-Marc Lienher + iPhone PNG-extensions from James Brown + warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) + 1.21 fix use of 'stbi_uc' in header (reported by jon blow) + 1.20 added support for Softimage PIC, by Tom Seddon + 1.19 bug in interlaced PNG corruption check (found by ryg) + 1.18 (2008-08-02) + fix a threading bug (local mutable static) + 1.17 support interlaced PNG + 1.16 major bugfix - stbi__convert_format converted one too many pixels + 1.15 initialize some fields for thread safety + 1.14 fix threadsafe conversion bug + header-file-only version (#define STBI_HEADER_FILE_ONLY before including) + 1.13 threadsafe + 1.12 const qualifiers in the API + 1.11 Support installable IDCT, colorspace conversion routines + 1.10 Fixes for 64-bit (don't use "unsigned long") + optimized upsampling by Fabian "ryg" Giesen + 1.09 Fix format-conversion for PSD code (bad global variables!) + 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz + 1.07 attempt to fix C++ warning/errors again + 1.06 attempt to fix C++ warning/errors again + 1.05 fix TGA loading to return correct *comp and use good luminance calc + 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free + 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR + 1.02 support for (subset of) HDR files, float interface for preferred access to them + 1.01 fix bug: possible bug in handling right-side up bmps... not sure + fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all + 1.00 interface to zlib that skips zlib header + 0.99 correct handling of alpha in palette + 0.98 TGA loader by lonesock; dynamically add loaders (untested) + 0.97 jpeg errors on too large a file; also catch another malloc failure + 0.96 fix detection of invalid v value - particleman@mollyrocket forum + 0.95 during header scan, seek to markers in case of padding + 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same + 0.93 handle jpegtran output; verbose errors + 0.92 read 4,8,16,24,32-bit BMP files of several formats + 0.91 output 24-bit Windows 3.0 BMP files + 0.90 fix a few more warnings; bump version number to approach 1.0 + 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd + 0.60 fix compiling as c++ + 0.59 fix warnings: merge Dave Moore's -Wall fixes + 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian + 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available + 0.56 fix bug: zlib uncompressed mode len vs. nlen + 0.55 fix bug: restart_interval not initialized to 0 + 0.54 allow NULL for 'int *comp' + 0.53 fix bug in png 3->4; speedup png decoding + 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments + 0.51 obey req_comp requests, 1-component jpegs return as 1-component, + on 'test' only check type, not whether we support this variant + 0.50 (2006-11-19) + first released version +*/ + + +/* +------------------------------------------------------------------------------ +This software is available under 2 licenses -- choose whichever you prefer. +------------------------------------------------------------------------------ +ALTERNATIVE A - MIT License +Copyright (c) 2017 Sean Barrett +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------ +ALTERNATIVE B - Public Domain (www.unlicense.org) +This is free and unencumbered software released into the public domain. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, +commercial or non-commercial, and by any means. +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to +this software under copyright law. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------------------------ +*/ \ No newline at end of file From b433315eff0fe1744817a00479ee051721ac315f Mon Sep 17 00:00:00 2001 From: AR Date: Mon, 20 Apr 2026 13:15:33 +0500 Subject: [PATCH 07/41] Add framebuffer handles, render targets & dynamic/transient buffers support --- engine/native/main/main.cpp | 37 +++++-- engine/native/rendering/rhi/rhi.cppm | 26 +++++ engine/native/rendering/rhi/rhi_bgfx.cpp | 134 +++++++++++++++++++---- engine/native/thirdparty/bgfx | 2 +- engine/native/thirdparty/bimg | 2 +- engine/native/thirdparty/sdl | 2 +- 6 files changed, 170 insertions(+), 33 deletions(-) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 950ac67..78e1451 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -136,6 +136,8 @@ int main(int argc, char* argv[]) // Create a uniform for an offset auto u_offset = draco::rhi::create_uniform("u_offset", draco::rhi::UniformType::Vec4); + auto offscreen_fb = draco::rhi::create_framebuffer(1280, 720, draco::rhi::TextureFormat::RGBA8); + bool running = true; float time = 0.0f; @@ -156,13 +158,16 @@ int main(int argc, char* argv[]) time += 0.01f; + // Start the frame + // This initializes View 0 and View 1 draco::rhi::begin_frame(); - // Prepare uniform data (Must be float arrays for Vec4) - float tint[4] = { 1.0f, 0.5f, 0.2f, 1.0f }; // Warm orange - float offset[4] = { std::sin(time), std::cos(time), 0.0f, 0.0f }; // Circular motion + // In pass 1, we render the Quad to the Framebuffer (View 0) + draco::rhi::set_view_framebuffer(0, offscreen_fb); + + float tint[4] = { 1.0f, 0.5f, 0.2f, 1.0f }; + float offset[4] = { std::sin(time), std::cos(time), 0.0f, 0.0f }; - // Upload to the RHI (This prepares the state for the next submit) draco::rhi::set_uniform(u_tint, tint); draco::rhi::set_uniform(u_offset, offset); @@ -170,16 +175,34 @@ int main(int argc, char* argv[]) packet.vertex_buffer = vbh; packet.index_buffer = ibh; packet.pipeline = pipeline; - packet.texture_handle = tex; packet.uniform_handle = s_texColor; - packet.texture_unit = 0; // Standard slot 0 + packet.texture_unit = 0; draco::rhi::identity_matrix(packet.model); - // Submit uses the currently bound uniforms + // Submit to the offscreen view draco::rhi::submit(packet, 0); + // In pass 2, we render the Framebuffer result to the Screen (View 1) + // Setting to InvalidFramebuffer tells bgfx to target the backbuffer (the window) + draco::rhi::set_view_framebuffer(1, draco::rhi::InvalidFramebuffer); + + draco::rhi::RenderPacket display_packet{}; + display_packet.vertex_buffer = vbh; // Use the same quad vertices + display_packet.index_buffer = ibh; + display_packet.pipeline = pipeline; + + // Use the texture created by the framebuffer + display_packet.texture_handle = draco::rhi::get_framebuffer_texture(offscreen_fb); + display_packet.uniform_handle = s_texColor; + display_packet.texture_unit = 0; + + draco::rhi::identity_matrix(display_packet.model); + + // Submit to the display view + draco::rhi::submit(display_packet, 1); + draco::rhi::end_frame(); } diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 72d0789..63bffe4 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -13,6 +13,7 @@ export namespace draco::rhi using ShaderHandle = uint16_t; using UniformHandle = uint16_t; using TextureHandle = uint16_t; + using FramebufferHandle = uint16_t; using ViewID = uint16_t; inline constexpr BufferHandle InvalidBuffer = 0xFFFF; @@ -20,6 +21,7 @@ export namespace draco::rhi inline constexpr ShaderHandle InvalidShader = 0xFFFF; inline constexpr UniformHandle InvalidUniform = 0xFFFF; inline constexpr TextureHandle InvalidTexture = 0xFFFF; + inline constexpr FramebufferHandle InvalidFramebuffer = 0xFFFF; inline constexpr ViewID InvalidView = 0xFFFF; enum class PipelineState : uint64_t { @@ -38,6 +40,19 @@ export namespace draco::rhi Mat4, // For transform matrices }; + enum class TextureFormat { + RGBA8, + D16, + D24, + D32 + }; + + struct TransientBuffer { + const void* data; + uint32_t size; + uint16_t stride; + }; + struct RenderPacket { uint64_t sort_key; @@ -90,6 +105,17 @@ export namespace draco::rhi TextureHandle create_texture(const void* data, uint16_t width, uint16_t height, uint32_t flags = 0); void destroy_texture(TextureHandle handle); + FramebufferHandle create_framebuffer(uint16_t width, uint16_t height, TextureFormat format); + void destroy_framebuffer(FramebufferHandle handle); + TextureHandle get_framebuffer_texture(FramebufferHandle handle); + + // Dynamic Buffer functions (For data that changes often) + BufferHandle create_dynamic_vertex_buffer(uint32_t size, uint16_t stride); + void update_dynamic_vertex_buffer(BufferHandle handle, uint32_t start_vertex, const void* data, uint32_t size); + + // Set the render target for a specific view + void set_view_framebuffer(ViewID view, FramebufferHandle handle); + // Helper function to set a 4x4 matrix to the identity matrix void identity_matrix(float* _mtx); diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 07f015d..29c88f4 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -29,6 +29,9 @@ namespace draco::rhi static std::vector g_pipelines; static std::vector g_uniforms; static std::vector g_textures; + static std::vector g_framebuffers; + static std::vector g_dynamic_vbs; + static std::map g_fb_to_tex; static uint16_t g_width = 0; static uint16_t g_height = 0; @@ -244,6 +247,14 @@ namespace draco::rhi } } + bgfx::TextureFormat::Enum map_format(TextureFormat format) { + switch(format) { + case TextureFormat::RGBA8: return bgfx::TextureFormat::RGBA8; + case TextureFormat::D24: return bgfx::TextureFormat::D24; + default: return bgfx::TextureFormat::RGBA8; + } + } + TextureHandle create_texture(const void* data, uint16_t width, uint16_t height, uint32_t flags) { if (!data || width == 0 || height == 0) { @@ -265,54 +276,128 @@ namespace draco::rhi return static_cast(g_textures.size() - 1); } + FramebufferHandle create_framebuffer(uint16_t width, uint16_t height, TextureFormat format) { + // Create the texture that will be the color attachment + // We use BGFX_TEXTURE_RT to tell bgfx this is a Render Target + bgfx::TextureHandle th = bgfx::createTexture2D( + width, height, false, 1, bgfx::TextureFormat::RGBA8, + BGFX_TEXTURE_RT | BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP + ); + + // Create the framebuffer using that texture + bgfx::FrameBufferHandle fbh = bgfx::createFrameBuffer(1, &th, true); + draco::rhi::g_framebuffers.push_back(fbh); + + draco::rhi::FramebufferHandle handle = static_cast(draco::rhi::g_framebuffers.size() - 1); + + // Register the texture + draco::rhi::g_textures.push_back(th); + draco::rhi::TextureHandle tex_handle = static_cast(draco::rhi::g_textures.size() - 1); + + draco::rhi::g_fb_to_tex[handle] = tex_handle; + + return handle; + } + + TextureHandle get_framebuffer_texture(FramebufferHandle handle) { + if (draco::rhi::g_fb_to_tex.contains(handle)) { + return draco::rhi::g_fb_to_tex[handle]; + } + return draco::rhi::InvalidTexture; + } + + void set_view_framebuffer(ViewID view, FramebufferHandle handle) { + if (handle == draco::rhi::InvalidFramebuffer) { + bgfx::setViewFrameBuffer(view, { bgfx::kInvalidHandle }); + } else { + bgfx::setViewFrameBuffer(view, draco::rhi::g_framebuffers[handle]); + } + } + + BufferHandle create_dynamic_vertex_buffer(uint32_t size) { + bgfx::VertexLayout layout; + layout.begin() + .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) + .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) + .add(bgfx::Attrib::TexCoord0, 2, bgfx::AttribType::Float) + .end(); + + bgfx::DynamicVertexBufferHandle dvb = bgfx::createDynamicVertexBuffer(size / 24, layout); + // For now, let's just push it to a new specialized vector + g_dynamic_vbs.push_back(dvb); + return static_cast(g_dynamic_vbs.size() - 1); + } + + void submit_transient(const RenderPacket& p, ViewID view, const void* data, uint32_t size) { + bgfx::TransientVertexBuffer tvb; + bgfx::VertexLayout layout; + layout.begin() + .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) + .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) + .add(bgfx::Attrib::TexCoord0, 2, bgfx::AttribType::Float) + .end(); + + // Allocate from the transient pool for this frame + bgfx::allocTransientVertexBuffer(&tvb, size / 24, layout); + + if (tvb.data != nullptr) { // Check if the pointer is valid + std::memcpy(tvb.data, data, size); + } + bgfx::setVertexBuffer(0, &tvb); + + // Apply uniforms, state, etc. + bgfx::setState(g_pipelines[p.pipeline].state); + bgfx::submit(view, g_pipelines[p.pipeline].program); + } + void identity_matrix(float* _mtx) { bx::mtxIdentity(_mtx); } - void submit(const RenderPacket& p, ViewID view) + void submit(const draco::rhi::RenderPacket& p, ViewID view) { // Check for null/invalid handles - if (p.pipeline == InvalidPipeline || p.vertex_buffer == InvalidBuffer) { + if (p.pipeline == draco::rhi::InvalidPipeline || p.vertex_buffer == draco::rhi::InvalidBuffer) { std::println("Error: Attempted to submit RenderPacket with unitialized handles."); return; } // Check for out of bounds handles - if (p.pipeline >= g_pipelines.size() || p.vertex_buffer >= g_buffers.size()) { + if (p.pipeline >= draco::rhi::g_pipelines.size() || p.vertex_buffer >= draco::rhi::g_buffers.size()) { std::println("Error: Handle out of bounds! The resource may have been destroyed already or it was never created. Pipeline Handle: {}, Vertex Buffer Handle: {}", p.pipeline, p.vertex_buffer); return; } - Pipeline& pipeline = g_pipelines[p.pipeline]; - Buffer& vb = g_buffers[p.vertex_buffer]; + draco::rhi::Pipeline& pipeline = draco::rhi::g_pipelines[p.pipeline]; + draco::rhi::Buffer& vb = draco::rhi::g_buffers[p.vertex_buffer]; bgfx::setTransform(p.model); - bgfx::setVertexBuffer(0, g_buffers[p.vertex_buffer].vbh); + bgfx::setVertexBuffer(0, draco::rhi::g_buffers[p.vertex_buffer].vbh); - if (p.index_buffer != InvalidBuffer) + if (p.index_buffer != draco::rhi::InvalidBuffer) { - if (p.index_buffer >= g_buffers.size()) { + if (p.index_buffer >= draco::rhi::g_buffers.size()) { std::println("Error: Invalid index buffer handle in RenderPacket"); return; } - Buffer& ib = g_buffers[p.index_buffer]; + draco::rhi::Buffer& ib = draco::rhi::g_buffers[p.index_buffer]; if (ib.is_index) bgfx::setIndexBuffer(ib.ibh); } - if (p.uniform_handle != InvalidUniform && p.uniform_data != nullptr) + if (p.uniform_handle != draco::rhi::InvalidUniform && p.uniform_data != nullptr) { - bgfx::setUniform(g_uniforms[p.uniform_handle], p.uniform_data, 1); + bgfx::setUniform(draco::rhi::g_uniforms[p.uniform_handle], p.uniform_data, 1); } // Bind Texture if valid - if (p.texture_handle != InvalidTexture && p.texture_handle < g_textures.size()) + if (p.texture_handle != draco::rhi::InvalidTexture && p.texture_handle < draco::rhi::g_textures.size()) { // TODO: Use a dedicated sampler handle later // For now, we'll assume the uniform_handle passed is the sampler. - if (p.uniform_handle != InvalidUniform) { - bgfx::setTexture(p.texture_unit, g_uniforms[p.uniform_handle], g_textures[p.texture_handle]); + if (p.uniform_handle != draco::rhi::InvalidUniform) { + bgfx::setTexture(p.texture_unit, draco::rhi::g_uniforms[p.uniform_handle], draco::rhi::g_textures[p.texture_handle]); } } @@ -322,23 +407,26 @@ namespace draco::rhi void begin_frame() { + // Initialize View 0 (Offscreen) bgfx::setViewRect(0, 0, 0, g_width, g_height); + bgfx::setViewClear(0, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x303030ff, 1.0f, 0); + // Initialize View 1 (Backbuffer/Screen) + bgfx::setViewRect(1, 0, 0, g_width, g_height); + bgfx::setViewClear(1, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x000000ff, 1.0f, 0); + + // Set transforms for both views float view[16]; bx::mtxIdentity(view); - float proj[16]; - bx::mtxOrtho( - proj, - -1.0f, 1.0f, - -1.0f, 1.0f, - 0.0f, 100.0f, - 0.0f, - false - ); + bx::mtxOrtho(proj, -1.0f, 1.0f, -1.0f, 1.0f, 0.0f, 100.0f, 0.0f, bgfx::getCaps()->homogeneousDepth); bgfx::setViewTransform(0, view, proj); + bgfx::setViewTransform(1, view, proj); + + // Touch both views so they definitely render bgfx::touch(0); + bgfx::touch(1); } void end_frame() diff --git a/engine/native/thirdparty/bgfx b/engine/native/thirdparty/bgfx index e9a4f67..78076b0 160000 --- a/engine/native/thirdparty/bgfx +++ b/engine/native/thirdparty/bgfx @@ -1 +1 @@ -Subproject commit e9a4f671bc2862be58233dff3c16a92a971a8c59 +Subproject commit 78076b02eb50edc5d2b28c16fe00f6ad600135b5 diff --git a/engine/native/thirdparty/bimg b/engine/native/thirdparty/bimg index 9114b47..2317bb6 160000 --- a/engine/native/thirdparty/bimg +++ b/engine/native/thirdparty/bimg @@ -1 +1 @@ -Subproject commit 9114b47f532ce59cd0c6c9f8932df2c48888d4c1 +Subproject commit 2317bb623af11505062a59f5ee9fbaaf4a878928 diff --git a/engine/native/thirdparty/sdl b/engine/native/thirdparty/sdl index 59267ed..03ceaca 160000 --- a/engine/native/thirdparty/sdl +++ b/engine/native/thirdparty/sdl @@ -1 +1 @@ -Subproject commit 59267ed800661f81b7f89b49e88473acde7ce4bb +Subproject commit 03ceaca19c06732381b39d5353f05d1d1805199d From 436c4058ee474273ec122bfe175408073ca06ae0 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 26 Apr 2026 16:12:52 +0500 Subject: [PATCH 08/41] Add depth & stencil testing, Alpha blending modes, dedicated sampler objects, vertex layout abstraction, scissor rects, resource destruction queue & global uniforms (view/projection) --- engine/native/main/main.cpp | 47 ++++++---- engine/native/rendering/rhi/rhi.cppm | 35 +++++++ engine/native/rendering/rhi/rhi_bgfx.cpp | 112 +++++++++++++++++++++++ engine/native/rendering/rhi/vertex.cppm | 51 ++++++++--- engine/native/thirdparty/bgfx | 2 +- engine/native/thirdparty/bimg | 2 +- engine/native/thirdparty/bx | 2 +- engine/native/thirdparty/sdl | 2 +- 8 files changed, 220 insertions(+), 33 deletions(-) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 78e1451..66e5615 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -140,8 +140,12 @@ int main(int argc, char* argv[]) bool running = true; - float time = 0.0f; + auto layout_desc = draco::rhi::get_textured_vertex_layout(); + auto layout_handle = draco::rhi::create_vertex_layout(layout_desc); + + auto point_sampler = draco::rhi::create_sampler(false, true); + float time = 0.0f; while (running) { SDL_Event event; @@ -153,19 +157,30 @@ int main(int argc, char* argv[]) int w, h; SDL_GetWindowSize(window, &w, &h); - draco::rhi::resize(uint16_t(w), uint16_t(h)); time += 0.01f; - // Start the frame - // This initializes View 0 and View 1 draco::rhi::begin_frame(); - // In pass 1, we render the Quad to the Framebuffer (View 0) + float view[16]; + draco::rhi::identity_matrix(view); + + float proj[16]; + draco::rhi::identity_matrix(proj); + // Basic Ortho: Right=1.6, Left=-1.6, Top=0.9, Bottom=-0.9 (16:9 Aspect) + proj[0] = 1.0f / 1.6f; + proj[5] = 1.0f / 0.9f; + proj[10] = 1.0f / (100.0f - 0.0f); + proj[14] = -0.0f / (100.0f - 0.0f); + + // Upload Camera Data (Global Uniforms) + draco::rhi::set_view_projection(0, view, proj); + draco::rhi::set_view_projection(1, view, proj); + draco::rhi::set_view_framebuffer(0, offscreen_fb); - float tint[4] = { 1.0f, 0.5f, 0.2f, 1.0f }; + float tint[4] = { 1.0f, 0.5f, 0.2f, 1.0f }; float offset[4] = { std::sin(time), std::cos(time), 0.0f, 0.0f }; draco::rhi::set_uniform(u_tint, tint); @@ -174,36 +189,34 @@ int main(int argc, char* argv[]) draco::rhi::RenderPacket packet{}; packet.vertex_buffer = vbh; packet.index_buffer = ibh; - packet.pipeline = pipeline; + packet.pipeline = pipeline; packet.texture_handle = tex; packet.uniform_handle = s_texColor; - packet.texture_unit = 0; + packet.texture_unit = 0; draco::rhi::identity_matrix(packet.model); - - // Submit to the offscreen view draco::rhi::submit(packet, 0); - // In pass 2, we render the Framebuffer result to the Screen (View 1) - // Setting to InvalidFramebuffer tells bgfx to target the backbuffer (the window) draco::rhi::set_view_framebuffer(1, draco::rhi::InvalidFramebuffer); + uint16_t scissorW = w / 2; + uint16_t scissorH = h / 2; + draco::rhi::set_scissor((w - scissorW) / 2, (h - scissorH) / 2, scissorW, scissorH); + draco::rhi::RenderPacket display_packet{}; - display_packet.vertex_buffer = vbh; // Use the same quad vertices + display_packet.vertex_buffer = vbh; display_packet.index_buffer = ibh; display_packet.pipeline = pipeline; - - // Use the texture created by the framebuffer display_packet.texture_handle = draco::rhi::get_framebuffer_texture(offscreen_fb); display_packet.uniform_handle = s_texColor; display_packet.texture_unit = 0; draco::rhi::identity_matrix(display_packet.model); - - // Submit to the display view draco::rhi::submit(display_packet, 1); draco::rhi::end_frame(); + + draco::rhi::process_deletions(); } draco::rhi::shutdown(); diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 63bffe4..d3f5151 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -14,6 +14,8 @@ export namespace draco::rhi using UniformHandle = uint16_t; using TextureHandle = uint16_t; using FramebufferHandle = uint16_t; + using SamplerHandle = uint16_t; + using LayoutHandle = uint16_t; using ViewID = uint16_t; inline constexpr BufferHandle InvalidBuffer = 0xFFFF; @@ -22,6 +24,7 @@ export namespace draco::rhi inline constexpr UniformHandle InvalidUniform = 0xFFFF; inline constexpr TextureHandle InvalidTexture = 0xFFFF; inline constexpr FramebufferHandle InvalidFramebuffer = 0xFFFF; + inline constexpr SamplerHandle InvalidSampler = 0xFFFF; inline constexpr ViewID InvalidView = 0xFFFF; enum class PipelineState : uint64_t { @@ -47,6 +50,26 @@ export namespace draco::rhi D32 }; + enum class BlendMode { + None, + Alpha, + Additive, + Multiply + }; + + enum class DepthTest { + None, + Less, + Equal, + Always + }; + + enum class CullMode { + None, + CW, + CCW + }; + struct TransientBuffer { const void* data; uint32_t size; @@ -115,6 +138,13 @@ export namespace draco::rhi // Set the render target for a specific view void set_view_framebuffer(ViewID view, FramebufferHandle handle); + + LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc); + + SamplerHandle create_sampler(bool linear, bool clamp); + + void set_view_projection(uint16_t view, const float* view_mtx, const float* proj_mtx); + void set_scissor(uint16_t x, uint16_t y, uint16_t width, uint16_t height); // Helper function to set a 4x4 matrix to the identity matrix void identity_matrix(float* _mtx); @@ -126,6 +156,11 @@ export namespace draco::rhi void begin_frame(); void end_frame(); + // We need a resource management system + // but since we don't have any yet, let's just use this + void destroy_resource(auto handle); + void process_deletions(); + constexpr PipelineState operator|(PipelineState a, PipelineState b) { return static_cast(static_cast(a) | static_cast(b)); } diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 29c88f4..150b37a 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -23,6 +23,11 @@ namespace draco::rhi uint64_t state = 0; // Stored as raw bgfx bitmask }; + struct DeletionReq { + uint64_t frame; + std::function cleanup; + }; + // Static globals // Note: We need to replace it with a more robust resource management system later, but this'll work for now static std::vector g_buffers; @@ -32,6 +37,8 @@ namespace draco::rhi static std::vector g_framebuffers; static std::vector g_dynamic_vbs; static std::map g_fb_to_tex; + static std::vector g_layouts; + static std::vector g_deletion_queue; static uint16_t g_width = 0; static uint16_t g_height = 0; @@ -350,6 +357,111 @@ namespace draco::rhi bgfx::submit(view, g_pipelines[p.pipeline].program); } + LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc) { + bgfx::VertexLayout layout; + layout.begin(); + for (const auto& e : desc.elements) { + bgfx::Attrib::Enum attr; + switch(e.attrib) { + case Attrib::Position: attr = bgfx::Attrib::Position; break; + case Attrib::Color0: attr = bgfx::Attrib::Color0; break; + case Attrib::TexCoord0: attr = bgfx::Attrib::TexCoord0; break; + case Attrib::Normal: attr = bgfx::Attrib::Normal; break; + case Attrib::Tangent: attr = bgfx::Attrib::Tangent; break; + } + + bgfx::AttribType::Enum type = (e.type == AttribType::Float) + ? bgfx::AttribType::Float : bgfx::AttribType::Uint8; + + layout.add(attr, e.num, type, e.normalized); + } + layout.end(); + g_layouts.push_back(layout); + return static_cast(g_layouts.size() - 1); + } + + SamplerHandle create_sampler(bool linear, bool clamp) { + uint32_t flags = 0; + flags |= linear ? (BGFX_SAMPLER_MIN_POINT | BGFX_SAMPLER_MAG_POINT) : 0; + flags |= clamp ? (BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP) : 0; + // In bgfx, samplers are often just flags passed to setTexture, + // but we'll return them as a handle for API consistency. + return static_cast(flags); + } + + void set_scissor(uint16_t x, uint16_t y, uint16_t width, uint16_t height) { + bgfx::setScissor(x, y, width, height); + } + + void set_view_projection(uint16_t view, const float* view_mtx, const float* proj_mtx) { + bgfx::setViewTransform(view, view_mtx, proj_mtx); + } + + uint64_t map_extra_states(BlendMode blend, DepthTest depth, CullMode cull) { + uint64_t state = BGFX_STATE_WRITE_RGB | BGFX_STATE_WRITE_A | BGFX_STATE_MSAA; + + + switch (blend) { + case BlendMode::Alpha: state |= BGFX_STATE_BLEND_ALPHA; break; + case BlendMode::Additive: state |= BGFX_STATE_BLEND_ADD; break; + case BlendMode::Multiply: state |= BGFX_STATE_BLEND_MULTIPLY; break; + default: break; + } + + switch (depth) { + case DepthTest::Less: state |= BGFX_STATE_DEPTH_TEST_LESS | BGFX_STATE_WRITE_Z; break; + case DepthTest::Equal: state |= BGFX_STATE_DEPTH_TEST_EQUAL | BGFX_STATE_WRITE_Z; break; + case DepthTest::Always: state |= BGFX_STATE_DEPTH_TEST_ALWAYS; break; + default: break; + } + + switch (cull) { + case CullMode::CW: state |= BGFX_STATE_CULL_CW; break; + case CullMode::CCW: state |= BGFX_STATE_CULL_CCW; break; + default: break; + } + + return state; + } + + void destroy_resource(auto handle) { + if (!bgfx::isValid(handle)) return; + + g_deletion_queue.push_back({ + bgfx::getStats()->gpuFrameNum, + [handle]() { + if constexpr (std::is_same_v) { + bgfx::destroy(handle); + } else if constexpr (std::is_same_v) { + bgfx::destroy(handle); + } else if constexpr (std::is_same_v) { + bgfx::destroy(handle); + } else if constexpr (std::is_same_v) { + bgfx::destroy(handle); + } else if constexpr (std::is_same_v) { + bgfx::destroy(handle); + } else if constexpr (std::is_same_v) { + bgfx::destroy(handle); + } + } + }); + } + + void process_deletions() { + // Use the frame count from bgfx stats to track GPU time + uint64_t current_frame = bgfx::getStats()->gpuFrameNum; + + std::erase_if(g_deletion_queue, [current_frame](const auto& req) { + // A 2-frame delay is industry standard for ensuring the GPU/Driver + // is no longer referencing the memory. + if (current_frame >= req.frame + 2) { + req.cleanup(); + return true; + } + return false; + }); + } + void identity_matrix(float* _mtx) { bx::mtxIdentity(_mtx); diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/native/rendering/rhi/vertex.cppm index 82c5629..421a20a 100644 --- a/engine/native/rendering/rhi/vertex.cppm +++ b/engine/native/rendering/rhi/vertex.cppm @@ -1,23 +1,50 @@ module; -#include + +#include export module rendering.rhi.vertex; import std; +export namespace draco::rhi { + enum class Attrib { + Position, + Color0, + TexCoord0, + Normal, + Tangent + }; + + enum class AttribType { + Float, + Uint8 + }; -export namespace draco::rhi -{ - struct PosColorVertex - { - float x, y, z; // Position - uint32_t agbr; // Color, stored as AGBR + struct VertexElement { + Attrib attrib; + uint8_t num; + AttribType type; + bool normalized = false; }; - struct TexturedVertex - { - float x, y, z; // Position - uint32_t agbr; // Color, stored as AGBR - float u, v; // Texture coordinates + struct VertexLayoutDesc { + std::vector elements; }; + + struct TexturedVertex { + float x, y, z; + uint32_t abgr; + float u, v; + }; + + // Helper to get the standard layout for the current vertex struct + inline VertexLayoutDesc get_textured_vertex_layout() { + return { + .elements = { + { Attrib::Position, 3, AttribType::Float }, + { Attrib::Color0, 4, AttribType::Uint8, true }, + { Attrib::TexCoord0, 2, AttribType::Float } + } + }; + } } \ No newline at end of file diff --git a/engine/native/thirdparty/bgfx b/engine/native/thirdparty/bgfx index 78076b0..cceedb6 160000 --- a/engine/native/thirdparty/bgfx +++ b/engine/native/thirdparty/bgfx @@ -1 +1 @@ -Subproject commit 78076b02eb50edc5d2b28c16fe00f6ad600135b5 +Subproject commit cceedb60cfe43dcde9786949e3beeef9b1da2944 diff --git a/engine/native/thirdparty/bimg b/engine/native/thirdparty/bimg index 2317bb6..abc7dea 160000 --- a/engine/native/thirdparty/bimg +++ b/engine/native/thirdparty/bimg @@ -1 +1 @@ -Subproject commit 2317bb623af11505062a59f5ee9fbaaf4a878928 +Subproject commit abc7dea0503d778a94d7af8f223366571c76b299 diff --git a/engine/native/thirdparty/bx b/engine/native/thirdparty/bx index c6131ec..0f575d5 160000 --- a/engine/native/thirdparty/bx +++ b/engine/native/thirdparty/bx @@ -1 +1 @@ -Subproject commit c6131ec6761abf4b5b8e83a9fd0348023c86028e +Subproject commit 0f575d58808ca0837c3754d9902b754db6c25416 diff --git a/engine/native/thirdparty/sdl b/engine/native/thirdparty/sdl index 03ceaca..47d1449 160000 --- a/engine/native/thirdparty/sdl +++ b/engine/native/thirdparty/sdl @@ -1 +1 @@ -Subproject commit 03ceaca19c06732381b39d5353f05d1d1805199d +Subproject commit 47d14491a6e89322b2a649cdbfb854fccce12cd3 From d1694ef6a8a403d39ebbe86811cc183e02c72958 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Tue, 5 May 2026 19:49:48 +0500 Subject: [PATCH 09/41] Draco is 3D! --- CMakeLists.txt | 40 +- engine/native/CMakeLists.txt | 5 +- engine/native/core/CMakeLists.txt | 27 +- engine/native/core/io/io.cppm | 4 + engine/native/core/memory/handle.cppm | 59 ++ .../native/core/memory/handle_registry.cppm | 49 ++ engine/native/core/memory/memory.cppm | 5 + engine/native/core/memory/slot_array.cppm | 95 +++ engine/native/main/main.cpp | 215 ++---- engine/native/platform/CMakeLists.txt | 29 + engine/native/platform/linux/linux.cpp | 28 + engine/native/platform/mac/mac.mm | 23 + engine/native/platform/platform.cppm | 18 + engine/native/platform/win32/win32.cpp | 22 + engine/native/rendering/CMakeLists.txt | 56 +- engine/native/rendering/renderer/renderer.cpp | 67 ++ .../native/rendering/renderer/renderer.cppm | 40 + .../rendering/rendergraph/rendergraph.cpp | 38 + .../rendering/rendergraph/rendergraph.cppm | 40 + engine/native/rendering/rhi/rhi.cppm | 225 ++++-- engine/native/rendering/rhi/rhi_bgfx.cpp | 728 +++++++++--------- engine/native/rendering/rhi/vertex.cppm | 4 +- engine/native/thirdparty/bgfx | 2 +- engine/native/thirdparty/bimg | 2 +- engine/native/thirdparty/sdl | 2 +- 25 files changed, 1192 insertions(+), 631 deletions(-) create mode 100644 engine/native/core/io/io.cppm create mode 100644 engine/native/core/memory/handle.cppm create mode 100644 engine/native/core/memory/handle_registry.cppm create mode 100644 engine/native/core/memory/memory.cppm create mode 100644 engine/native/core/memory/slot_array.cppm create mode 100644 engine/native/platform/CMakeLists.txt create mode 100644 engine/native/platform/linux/linux.cpp create mode 100644 engine/native/platform/mac/mac.mm create mode 100644 engine/native/platform/platform.cppm create mode 100644 engine/native/platform/win32/win32.cpp create mode 100644 engine/native/rendering/renderer/renderer.cpp create mode 100644 engine/native/rendering/renderer/renderer.cppm create mode 100644 engine/native/rendering/rendergraph/rendergraph.cpp create mode 100644 engine/native/rendering/rendergraph/rendergraph.cppm diff --git a/CMakeLists.txt b/CMakeLists.txt index 66a3c95..424549e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,55 +25,57 @@ endif() project(DraconicEngine LANGUAGES C CXX) -# Ensure that everyone is on the same page hardware wise or else we get errors -if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - add_compile_options(-mavx2 -mfma) -endif() - -# Only have safe global rules here +# Global Rules set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_MODULE_STD ON) -set(CMAKE_POSITION_INDEPENDENT_CODE ON) # bgfx & deps give error if this isn't set, this is a temp workaround -# Force all to use Clang or else a mismatch occurs -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi") +set(CMAKE_POSITION_INDEPENDENT_CODE ON) -list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") +# Force Clang/libc++ to avoid ABI mismatch +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + add_compile_options(-mavx2 -mfma -stdlib=libc++) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi") +endif() -include(CTest) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +# Subdirectories for engine libs add_subdirectory(engine/native) -find_package(PkgConfig REQUIRED) -pkg_check_modules(X11_LIBS REQUIRED IMPORTED_TARGET x11 xext xcursor xrandr xrender xi xfixes) - +# Main Executable add_executable(draconic engine/native/main/main.cpp) + enable_modules(draconic) + +set_target_properties(draconic PROPERTIES CXX_SCAN_FOR_MODULES ON) + target_link_libraries(draconic PRIVATE - rhi core io + memory image_loader + platform + rhi + renderer + rendergraph bgfx bx bimg -Wl,--whole-archive SDL3::SDL3-static -Wl,--no-whole-archive c++ c++abi - PkgConfig::X11_LIBS dl pthread m ) -# Shader copying +# Asset sync set(ENGINE_SHADER_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") add_custom_command( TARGET draconic POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${ENGINE_SHADER_DIR}" "$" - COMMENT "Copying shaders to build directory..." + COMMENT "Syncing shaders to build directory..." ) \ No newline at end of file diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index f9abc9a..da7157e 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -4,6 +4,7 @@ include(Modules) add_subdirectory(thirdparty) add_modules_library(core SHARED) -target_link_libraries(core PUBLIC definitions math io) +target_link_libraries(core PUBLIC definitions math io memory) -add_subdirectory(rendering) \ No newline at end of file +add_subdirectory(rendering) +add_subdirectory(platform) \ No newline at end of file diff --git a/engine/native/core/CMakeLists.txt b/engine/native/core/CMakeLists.txt index 83e45a6..618ccdc 100644 --- a/engine/native/core/CMakeLists.txt +++ b/engine/native/core/CMakeLists.txt @@ -1,24 +1,27 @@ add_modules_library(definitions) -add_modules_library(math) -add_modules_library(io) +add_modules_library(math) target_link_libraries(math PUBLIC definitions) + +add_modules_library(io) target_link_libraries(io PUBLIC definitions stb_image) -add_library(image_loader SHARED) +add_modules_library(memory) +target_link_libraries(memory PUBLIC definitions) -target_sources(image_loader - PUBLIC - FILE_SET CXX_MODULES FILES - io/image_loader.cppm -) +# image_loader is a FEATURE module built on io +add_library(image_loader) target_sources(image_loader + PUBLIC + FILE_SET CXX_MODULES FILES io/image_loader.cppm PRIVATE - io/image_loader.cpp + io/image_loader.cpp ) -target_link_libraries(image_loader - PRIVATE - stb_image +target_link_libraries(image_loader + PRIVATE + stb_image + io + definitions ) \ No newline at end of file diff --git a/engine/native/core/io/io.cppm b/engine/native/core/io/io.cppm new file mode 100644 index 0000000..64c775d --- /dev/null +++ b/engine/native/core/io/io.cppm @@ -0,0 +1,4 @@ +export module core.io; + +export import core.io.filesystem; +export import core.io.image_loader; \ No newline at end of file diff --git a/engine/native/core/memory/handle.cppm b/engine/native/core/memory/handle.cppm new file mode 100644 index 0000000..1741330 --- /dev/null +++ b/engine/native/core/memory/handle.cppm @@ -0,0 +1,59 @@ +module; + +#include + +export module core.memory.handle; + +export namespace draco::core::memory +{ + // Packed generation handle: + // [ 16 bits generation | 16 bits index ] + template + struct Handle + { + uint32_t value = UINT32_MAX; + + static constexpr uint32_t INVALID = UINT32_MAX; + + constexpr Handle() = default; + constexpr explicit Handle(uint32_t v) : value(v) {} + + constexpr uint16_t index() const + { + return static_cast(value & 0xFFFF); + } + + constexpr uint16_t generation() const + { + return static_cast(value >> 16); + } + + constexpr explicit operator bool() const + { + return value != INVALID; + } + + constexpr bool operator==(const Handle& other) const + { + return value == other.value; + } + + constexpr bool operator!=(const Handle& other) const + { + return value != other.value; + } + + static constexpr Handle invalid() + { + return Handle{ INVALID }; + } + + static constexpr Handle make(uint16_t index, uint16_t generation) + { + return Handle{ + (static_cast(generation) << 16) | + static_cast(index) + }; + } + }; +} \ No newline at end of file diff --git a/engine/native/core/memory/handle_registry.cppm b/engine/native/core/memory/handle_registry.cppm new file mode 100644 index 0000000..bf18bf6 --- /dev/null +++ b/engine/native/core/memory/handle_registry.cppm @@ -0,0 +1,49 @@ +export module core.memory.handle_registry; + +import core.memory.slot_array; +import core.memory.handle; + +export namespace draco::core::memory +{ + // Manager layer so other subsystems don't touch raw storage logic + + template + class HandleRegistry + { + public: + using Handle = Handle; + + Handle create(const T& value) + { + return storage.create(value); + } + + bool valid(Handle h) const + { + return storage.valid(h); + } + + T* get(Handle h) + { + return storage.get(h); + } + + const T* get(Handle h) const + { + return storage.get(h); + } + + void destroy(Handle h) + { + storage.destroy(h); + } + + SlotArray& internal() + { + return storage; + } + + private: + SlotArray storage; + }; +} \ No newline at end of file diff --git a/engine/native/core/memory/memory.cppm b/engine/native/core/memory/memory.cppm new file mode 100644 index 0000000..476e065 --- /dev/null +++ b/engine/native/core/memory/memory.cppm @@ -0,0 +1,5 @@ +export module core.memory; + +export import core.memory.handle; +export import core.memory.slot_array; +export import core.memory.handle_registry; \ No newline at end of file diff --git a/engine/native/core/memory/slot_array.cppm b/engine/native/core/memory/slot_array.cppm new file mode 100644 index 0000000..6bcdafd --- /dev/null +++ b/engine/native/core/memory/slot_array.cppm @@ -0,0 +1,95 @@ +module; + +#include + +export module core.memory.slot_array; + +import std; +import core.memory.handle; + +export namespace draco::core::memory +{ + template + struct Slot + { + T value{}; + uint16_t generation = 0; + bool alive = false; + }; + + template + class SlotArray + { + public: + using Handle = Handle; + + Handle create(const T& value) + { + uint16_t idx; + + if (!free_list.empty()) + { + idx = free_list.back(); + free_list.pop_back(); + } + else + { + idx = static_cast(slots.size()); + slots.push_back({}); + } + + Slot& slot = slots[idx]; + + slot.value = value; + slot.alive = true; + + return Handle::make(idx, slot.generation); + } + + bool valid(Handle h) const + { + uint16_t i = h.index(); + + return i < slots.size() + && slots[i].alive + && slots[i].generation == h.generation(); + } + + T* get(Handle h) + { + if (!valid(h)) + return nullptr; + + return &slots[h.index()].value; + } + + const T* get(Handle h) const + { + if (!valid(h)) + return nullptr; + + return &slots[h.index()].value; + } + + void destroy(Handle h) + { + if (!valid(h)) + return; + + auto& s = slots[h.index()]; + + s.alive = false; + s.generation++; // Invalidate all old handles + free_list.push_back(h.index()); + } + + std::vector>& raw() + { + return slots; + } + + private: + std::vector> slots; + std::vector free_list; + }; +} \ No newline at end of file diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 66e5615..4cf286c 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -1,12 +1,16 @@ import std; #include +#include import core.io.filesystem; import core.io.image_loader; +import platform; + import rendering.rhi; import rendering.rhi.vertex; +import rendering.renderer; int main(int argc, char* argv[]) { @@ -23,205 +27,146 @@ int main(int argc, char* argv[]) if (!window) { std::println("Failed to create window: {}", SDL_GetError()); - SDL_DestroyWindow(window); SDL_Quit(); return -1; } - const char* driver = SDL_GetCurrentVideoDriver(); - std::println("Driver: {}", driver ? driver : "Unknown"); - - void* nwh = nullptr; // Native window handle - void* ndt = nullptr; // Native display type - -#if defined(__linux__) - - SDL_PropertiesID props = SDL_GetWindowProperties(window); - - if (driver && std::string_view(driver) == "x11") - { - ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_X11_DISPLAY_POINTER, nullptr); // Get the X11 display pointer - nwh = (void*)(uintptr_t)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0); // Get the X11 window number and cast it to a pointer - } - else if (driver && std::string_view(driver) == "wayland") - { - ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_DISPLAY_POINTER, nullptr); // Get the Wayland display pointer - nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_SURFACE_POINTER, nullptr); // Get the Wayland surface pointer - } - else { - std::println("Unsupported video driver: {}", driver); - SDL_DestroyWindow(window); - SDL_Quit(); - return -1; - } - -#endif + auto handles = draco::platform::get_native_handles(window); - if (!nwh) { - std::println("Failed to get native window handle"); + if (!handles.valid) { + std::println("Failed to get native handles"); SDL_DestroyWindow(window); SDL_Quit(); return -1; } - if(!ndt) { - std::println("Failed to get native display type"); + // Init the RHI & Renderer + if (!draco::rendering::rhi::init(handles.ndt, handles.nwh, 1280, 720)) { + std::println("RHI init failed"); SDL_DestroyWindow(window); SDL_Quit(); return -1; } - // Init the RHI with the native window handle and initial size - if (!draco::rhi::init(ndt, nwh, 1280, 720)) { - std::println("Failed to initialize RHI"); - SDL_DestroyWindow(window); - SDL_Quit(); - return -1; - } + draco::rendering::renderer::init(1280, 720); draco::rhi::TexturedVertex quad[] = { - { -0.5f, 0.5f, 0.0f, 0xffffffff, 0.0f, 0.0f }, - { 0.5f, 0.5f, 0.0f, 0xffffffff, 1.0f, 0.0f }, - { 0.5f, -0.5f, 0.0f, 0xffffffff, 1.0f, 1.0f }, - { -0.5f, -0.5f, 0.0f, 0xffffffff, 0.0f, 1.0f } + { -0.5f, 0.5f, 0.1f, 0xffffffff, 0.0f, 0.0f }, + { 0.5f, 0.5f, -0.1f, 0xffffffff, 1.0f, 0.0f }, + { 0.5f, -0.5f, 0.1f, 0xffffffff, 1.0f, 1.0f }, + { -0.5f, -0.5f, -0.1f, 0xffffffff, 0.0f, 1.0f } }; - uint16_t indices[] = { - 0, 1, 2, - 2, 3, 0 - }; + uint16_t indices[] = { 0,1,2, 2,3,0 }; - auto vbh = draco::rhi::create_vertex_buffer(quad, sizeof(quad)); - auto ibh = draco::rhi::create_index_buffer(indices, sizeof(indices)); + auto vbh = draco::rendering::rhi::create_vertex_buffer(quad, sizeof(quad)); + auto ibh = draco::rendering::rhi::create_index_buffer(indices, sizeof(indices)); auto img = draco::core::io::image_loader::load_image("test.png"); - draco::rhi::TextureHandle tex = draco::rhi::InvalidTexture; - + + draco::rendering::rhi::TextureHandle tex = draco::rendering::rhi::InvalidTexture; if (img.is_valid) { - tex = draco::rhi::create_texture(img.pixels.data(), img.width, img.height); - } else { - std::println("Failed to load texture!"); + tex = draco::rendering::rhi::create_texture(img.pixels.data(), img.width, img.height); } - auto s_texColor = draco::rhi::create_uniform("s_texColor", draco::rhi::UniformType::Sampler); + auto s_texColor = draco::rendering::rhi::create_uniform("s_texColor", draco::rendering::rhi::UniformType::Sampler); - // Load the vertex & fragment shaders - auto vs_data = draco::core::io::filesystem::load_binary("vs_triangle.bin"); - auto fs_data = draco::core::io::filesystem::load_binary("fs_triangle.bin"); + auto vs = draco::core::io::filesystem::load_binary("vs_triangle.bin"); + auto fs = draco::core::io::filesystem::load_binary("fs_triangle.bin"); - // If the path is empty, return an error - if (vs_data.empty() || fs_data.empty()) { - std::println("Failed to load shaders"); - std::println("Working dir: {}", std::filesystem::current_path().string()); - draco::rhi::shutdown(); + if (vs.empty() || fs.empty()) { + std::println("Shader load failed"); + draco::rendering::rhi::shutdown(); SDL_DestroyWindow(window); SDL_Quit(); return -1; } - auto vsh = draco::rhi::create_shader(vs_data.data(), (uint32_t)vs_data.size()); - auto fsh = draco::rhi::create_shader(fs_data.data(), (uint32_t)fs_data.size()); - - auto pipeline = draco::rhi::create_pipeline({ - vsh, - fsh, - draco::rhi::PipelineState::WriteRGB | - draco::rhi::PipelineState::WriteAlpha | - draco::rhi::PipelineState::MSAA - }); + auto vsh = draco::rendering::rhi::create_shader(vs.data(), (uint32_t)vs.size()); + auto fsh = draco::rendering::rhi::create_shader(fs.data(), (uint32_t)fs.size()); - // Create a uniform for a color tint - auto u_tint = draco::rhi::create_uniform("u_tint", draco::rhi::UniformType::Vec4); + auto pipeline = draco::rendering::rhi::create_pipeline({ + vsh, + fsh, + draco::rendering::rhi::PipelineState::WriteRGB | + draco::rendering::rhi::PipelineState::WriteAlpha | + draco::rendering::rhi::PipelineState::MSAA + }); - // Create a uniform for an offset - auto u_offset = draco::rhi::create_uniform("u_offset", draco::rhi::UniformType::Vec4); + auto u_tint = draco::rendering::rhi::create_uniform("u_tint", draco::rendering::rhi::UniformType::Vec4); + auto u_offset = draco::rendering::rhi::create_uniform("u_offset", draco::rendering::rhi::UniformType::Vec4); - auto offscreen_fb = draco::rhi::create_framebuffer(1280, 720, draco::rhi::TextureFormat::RGBA8); + float tint[4] = {1,1,1,1}; + float offset[4] = {0,0,0,0}; bool running = true; - auto layout_desc = draco::rhi::get_textured_vertex_layout(); - auto layout_handle = draco::rhi::create_vertex_layout(layout_desc); - - auto point_sampler = draco::rhi::create_sampler(false, true); + float angle = 0.0f; - float time = 0.0f; while (running) { - SDL_Event event; - while (SDL_PollEvent(&event)) - { - if (event.type == SDL_EVENT_QUIT) + SDL_Event e; + while (SDL_PollEvent(&e)) { + if (e.type == SDL_EVENT_QUIT) running = false; } int w, h; SDL_GetWindowSize(window, &w, &h); - draco::rhi::resize(uint16_t(w), uint16_t(h)); - time += 0.01f; + draco::rendering::rhi::resize((uint16_t)w, (uint16_t)h); + draco::rendering::renderer::resize((uint16_t)w, (uint16_t)h); - draco::rhi::begin_frame(); + draco::rendering::renderer::Camera cam; - float view[16]; - draco::rhi::identity_matrix(view); + cam.position = { 0.0f, 0.0f, -2.0f }; // camera pulled back + cam.target = { 0.0f, 0.0f, 0.0f }; // looking at origin + cam.up = { 0.0f, 1.0f, 0.0f }; - float proj[16]; - draco::rhi::identity_matrix(proj); - // Basic Ortho: Right=1.6, Left=-1.6, Top=0.9, Bottom=-0.9 (16:9 Aspect) - proj[0] = 1.0f / 1.6f; - proj[5] = 1.0f / 0.9f; - proj[10] = 1.0f / (100.0f - 0.0f); - proj[14] = -0.0f / (100.0f - 0.0f); + cam.fov = 60.0f; + cam.near_plane = 0.1f; + cam.far_plane = 100.0f; - // Upload Camera Data (Global Uniforms) - draco::rhi::set_view_projection(0, view, proj); - draco::rhi::set_view_projection(1, view, proj); + draco::rendering::renderer::begin_frame(cam); - draco::rhi::set_view_framebuffer(0, offscreen_fb); + draco::rendering::rhi::RenderPacket pkt; + pkt.vertex_buffer = vbh; + pkt.index_buffer = ibh; + pkt.pipeline = pipeline; + pkt.texture_handle = tex; + pkt.texture_unit = 0; + pkt.sampler_uniform = s_texColor; - float tint[4] = { 1.0f, 0.5f, 0.2f, 1.0f }; - float offset[4] = { std::sin(time), std::cos(time), 0.0f, 0.0f }; + pkt.uniforms.push_back({ u_tint, tint, 1 }); + pkt.uniforms.push_back({ u_offset, offset, 1 }); - draco::rhi::set_uniform(u_tint, tint); - draco::rhi::set_uniform(u_offset, offset); + angle += 0.01f; - draco::rhi::RenderPacket packet{}; - packet.vertex_buffer = vbh; - packet.index_buffer = ibh; - packet.pipeline = pipeline; - packet.texture_handle = tex; - packet.uniform_handle = s_texColor; - packet.texture_unit = 0; - - draco::rhi::identity_matrix(packet.model); - draco::rhi::submit(packet, 0); + float model[16]; + bx::mtxRotateY(model, angle); - draco::rhi::set_view_framebuffer(1, draco::rhi::InvalidFramebuffer); + std::memcpy(pkt.model, model, sizeof(model)); - uint16_t scissorW = w / 2; - uint16_t scissorH = h / 2; - draco::rhi::set_scissor((w - scissorW) / 2, (h - scissorH) / 2, scissorW, scissorH); + draco::rendering::renderer::submit_entity(pkt, 0); - draco::rhi::RenderPacket display_packet{}; - display_packet.vertex_buffer = vbh; - display_packet.index_buffer = ibh; - display_packet.pipeline = pipeline; - display_packet.texture_handle = draco::rhi::get_framebuffer_texture(offscreen_fb); - display_packet.uniform_handle = s_texColor; - display_packet.texture_unit = 0; + for (int i = 0; i < 10; i++) + { + auto p = pkt; - draco::rhi::identity_matrix(display_packet.model); - draco::rhi::submit(display_packet, 1); + float model[16]; + bx::mtxTranslate(model, i * 0.6f - 3.0f, 0.0f, 0.0f); - draco::rhi::end_frame(); + std::memcpy(p.model, model, sizeof(model)); - draco::rhi::process_deletions(); + draco::rendering::renderer::submit_entity(p, 0); } - draco::rhi::shutdown(); + draco::rendering::renderer::end_frame(); + } + draco::rendering::rhi::shutdown(); SDL_DestroyWindow(window); SDL_Quit(); + return 0; -} +} \ No newline at end of file diff --git a/engine/native/platform/CMakeLists.txt b/engine/native/platform/CMakeLists.txt new file mode 100644 index 0000000..c9ff8a8 --- /dev/null +++ b/engine/native/platform/CMakeLists.txt @@ -0,0 +1,29 @@ +# Platform-specific source selection +if(WIN32) + set(PLATFORM_SRC "win32/win32.cpp") + set(PLATFORM_DEPS "") +elseif(APPLE) + set(PLATFORM_SRC "mac/mac.mm") + set(PLATFORM_DEPS "-framework Cocoa -framework Metal -framework QuartzCore") +else() + set(PLATFORM_SRC "linux/linux.cpp") + find_package(PkgConfig REQUIRED) + pkg_check_modules(X11_LIBS REQUIRED IMPORTED_TARGET x11 xext xcursor xrandr xrender xi xfixes) + pkg_check_modules(WAYLAND_LIBS REQUIRED IMPORTED_TARGET wayland-client wayland-egl wayland-cursor egl) + set(PLATFORM_DEPS PkgConfig::X11_LIBS PkgConfig::WAYLAND_LIBS) +endif() + +add_library(platform SHARED) + +target_sources(platform + PUBLIC FILE_SET CXX_MODULES + BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" + FILES platform.cppm + + PRIVATE + ${PLATFORM_SRC} +) + +target_include_directories(platform INTERFACE $) + +target_link_libraries(platform PRIVATE SDL3::SDL3-static ${PLATFORM_DEPS}) \ No newline at end of file diff --git a/engine/native/platform/linux/linux.cpp b/engine/native/platform/linux/linux.cpp new file mode 100644 index 0000000..4b73db9 --- /dev/null +++ b/engine/native/platform/linux/linux.cpp @@ -0,0 +1,28 @@ +module; + +#include +import std; + +module platform; + +namespace draco::platform { + NativeWindowFrame get_native_handles(void* sdl_window_ptr) { + SDL_Window* window = static_cast(sdl_window_ptr); + NativeWindowFrame frame; + + const char* driver = SDL_GetCurrentVideoDriver(); + SDL_PropertiesID props = SDL_GetWindowProperties(window); + + if (std::string_view(driver) == "x11") { + frame.ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_X11_DISPLAY_POINTER, nullptr); + frame.nwh = (void*)(uintptr_t)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0); + } else if (std::string_view(driver) == "wayland") { + frame.ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_DISPLAY_POINTER, nullptr); + frame.nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_SURFACE_POINTER, nullptr); + } + + SDL_GetWindowSize(window, &frame.width, &frame.height); + frame.valid = (frame.nwh != nullptr); + return frame; + } +} \ No newline at end of file diff --git a/engine/native/platform/mac/mac.mm b/engine/native/platform/mac/mac.mm new file mode 100644 index 0000000..9d3caa8 --- /dev/null +++ b/engine/native/platform/mac/mac.mm @@ -0,0 +1,23 @@ +module; + +#include +import std; + +module platform; + +namespace draco::platform { + NativeWindowFrame get_native_handles(void* sdl_window_ptr) { + SDL_Window* window = static_cast(sdl_window_ptr); + NativeWindowFrame frame; + + SDL_PropertiesID props = SDL_GetWindowProperties(window); + + // We grab the NSView pointer for the native window handle + frame.nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_COCOA_VIEW_POINTER, nullptr); + frame.ndt = nullptr; + + SDL_GetWindowSize(window, &frame.width, &frame.height); + frame.valid = (frame.nwh != nullptr); + return frame; + } +} \ No newline at end of file diff --git a/engine/native/platform/platform.cppm b/engine/native/platform/platform.cppm new file mode 100644 index 0000000..67deebc --- /dev/null +++ b/engine/native/platform/platform.cppm @@ -0,0 +1,18 @@ +export module platform; + +import std; + +export namespace draco::platform { + struct NativeWindowFrame + { + void* nwh = nullptr; // Native Window Handle + void* ndt = nullptr; // Native Display Type + + int width = 0; + int height = 0; + + bool valid = false; + }; + + NativeWindowFrame get_native_handles(void* sdl_window_ptr); +} \ No newline at end of file diff --git a/engine/native/platform/win32/win32.cpp b/engine/native/platform/win32/win32.cpp new file mode 100644 index 0000000..1578964 --- /dev/null +++ b/engine/native/platform/win32/win32.cpp @@ -0,0 +1,22 @@ +module; + +#include +import std; + +module platform; + +namespace draco::platform { + NativeWindowFrame get_native_handles(void* sdl_window_ptr) { + SDL_Window* window = static_cast(sdl_window_ptr); + NativeWindowFrame frame; + + SDL_PropertiesID props = SDL_GetWindowProperties(window); + + frame.nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WIN32_HWND_POINTER, nullptr); + frame.ndt = nullptr; // Note: On Windows, ndt isn't required by bgfx for the Vulkan & DX backends which is why we leave it as a nullptr + + SDL_GetWindowSize(window, &frame.width, &frame.height); + frame.valid = (frame.nwh != nullptr); + return frame; + } +} \ No newline at end of file diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index ff421b0..cdb8219 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -1,3 +1,53 @@ -add_modules_library(rhi SHARED) -target_sources(rhi PRIVATE rhi/rhi_bgfx.cpp rhi/vertex.cppm) -target_link_libraries(rhi PUBLIC core bgfx bx) +add_modules_library(rhi) + +target_sources(rhi + PUBLIC + FILE_SET CXX_MODULES FILES + rhi/vertex.cppm + rhi/rhi.cppm + PRIVATE + rhi/rhi_bgfx.cpp +) + +target_link_libraries(rhi + PUBLIC + core + memory + bgfx + bx +) + +add_modules_library(rendergraph) + +target_sources(rendergraph + PUBLIC + FILE_SET CXX_MODULES FILES + rendergraph/rendergraph.cppm + PRIVATE + rendergraph/rendergraph.cpp +) + +target_link_libraries(rendergraph + PUBLIC + rhi + bx +) + +add_modules_library(renderer) + +target_sources(renderer + PUBLIC + FILE_SET CXX_MODULES FILES + renderer/renderer.cppm + PRIVATE + renderer/renderer.cpp +) + +target_link_libraries(renderer + PUBLIC + core + rhi + rendergraph + bgfx + bx +) \ No newline at end of file diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp new file mode 100644 index 0000000..0d144da --- /dev/null +++ b/engine/native/rendering/renderer/renderer.cpp @@ -0,0 +1,67 @@ +module; + +#include +#include + +import std; +import rendering.rhi; +import rendering.rendergraph; + +module rendering.renderer; + +namespace draco::rendering::renderer +{ + void init(uint16_t width, uint16_t height) { + g_ctx.screen_width = width; + g_ctx.screen_height = height; + } + + void resize(uint16_t width, uint16_t height) { + g_ctx.screen_width = width; + g_ctx.screen_height = height; + } + + void begin_frame(const Camera& cam) { + draco::rendering::rhi::begin_frame(); + + g_ctx.main_camera = cam; + + g_ctx.graph.reset(); + } + + void submit_entity(draco::rendering::rhi::RenderPacket& packet, uint16_t view) + { + auto& main_pass = g_ctx.graph.add_pass(); + + main_pass.name = "MainPass"; + main_pass.view = view; + main_pass.framebuffer = draco::rendering::rhi::InvalidFramebuffer; + + main_pass.width = g_ctx.screen_width; + main_pass.height = g_ctx.screen_height; + + main_pass.clear_flags = BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH; + main_pass.clear_color = 0x303030ff; + + // Build camera every frame + float view_mtx[16]; + float proj_mtx[16]; + + draco::rendering::rhi::look_at(view_mtx, g_ctx.main_camera.position.data(), g_ctx.main_camera.target.data(), g_ctx.main_camera.up.data()); + + float aspect = float(g_ctx.screen_width) / float(g_ctx.screen_height); + + draco::rendering::rhi::perspective(proj_mtx, g_ctx.main_camera.fov, aspect, g_ctx.main_camera.near_plane, g_ctx.main_camera.far_plane); + + std::memcpy(main_pass.view_mtx, view_mtx, sizeof(view_mtx)); + std::memcpy(main_pass.proj_mtx, proj_mtx, sizeof(proj_mtx)); + + main_pass.packets.push_back(packet); + } + + void end_frame() { + g_ctx.graph.execute(); + + draco::rendering::rhi::end_frame(); + } +} \ No newline at end of file diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/native/rendering/renderer/renderer.cppm new file mode 100644 index 0000000..b02eec5 --- /dev/null +++ b/engine/native/rendering/renderer/renderer.cppm @@ -0,0 +1,40 @@ +module; + +#include + +export module rendering.renderer; + +import std; +import rendering.rhi; +import rendering.rendergraph; + +export namespace draco::rendering::renderer { + + struct Camera { + std::array position; + std::array target; + std::array up; + float fov; + float near_plane; + float far_plane; + }; + + struct SceneContext { + uint16_t screen_width; + uint16_t screen_height; + Camera main_camera; + + draco::rendering::rendergraph::RenderGraph graph; + }; + + SceneContext g_ctx; + + void init(uint16_t width, uint16_t height); + void resize(uint16_t width, uint16_t height); + + void begin_frame(const Camera& cam); + + void submit_entity(draco::rendering::rhi::RenderPacket& packet, uint16_t view); + + void end_frame(); +} \ No newline at end of file diff --git a/engine/native/rendering/rendergraph/rendergraph.cpp b/engine/native/rendering/rendergraph/rendergraph.cpp new file mode 100644 index 0000000..4024db4 --- /dev/null +++ b/engine/native/rendering/rendergraph/rendergraph.cpp @@ -0,0 +1,38 @@ +module; + +#include + +module rendering.rendergraph; + +import rendering.rhi; + +namespace draco::rendering::rendergraph { + + void RenderGraph::reset() { + m_passes.clear(); + } + + Pass& RenderGraph::add_pass() { + m_passes.emplace_back(); + return m_passes.back(); + } + + void RenderGraph::execute() { + for (auto& pass : m_passes) { + + std::println("[RenderGraph] Executing pass: {}", pass.name); // Debug + + draco::rendering::rhi::apply_view(pass.view, {pass.framebuffer, 0, 0, pass.width, pass.height, pass.clear_flags, pass.clear_color}); + + draco::rendering::rhi::set_view_projection(pass.view, pass.view_mtx, pass.proj_mtx); + + if (pass.clear_flags != 0) { + bgfx::setViewClear(pass.view, pass.clear_flags, pass.clear_color); + } + + for (auto& pkt : pass.packets) { + draco::rendering::rhi::submit(pkt, pass.view); + } + } + } +} \ No newline at end of file diff --git a/engine/native/rendering/rendergraph/rendergraph.cppm b/engine/native/rendering/rendergraph/rendergraph.cppm new file mode 100644 index 0000000..adc34c8 --- /dev/null +++ b/engine/native/rendering/rendergraph/rendergraph.cppm @@ -0,0 +1,40 @@ +module; + +#include + +export module rendering.rendergraph; + +import rendering.rhi; +import std; + +export namespace draco::rendering::rendergraph { + + struct Pass { + std::string name; + + draco::rendering::rhi::ViewID view; + draco::rendering::rhi::FramebufferHandle framebuffer; + + std::vector packets; + + float view_mtx[16]; + float proj_mtx[16]; + + uint16_t width; + uint16_t height; + + uint32_t clear_flags; + uint32_t clear_color; + }; + + class RenderGraph { + public: + void reset(); + + Pass& add_pass(); + + void execute(); + private: + std::vector m_passes; + }; +} diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index d3f5151..fea6088 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -1,52 +1,86 @@ module; #include +#include export module rendering.rhi; -import rendering.rhi.vertex; // For the vertex layout +import std; +import core.memory; +import rendering.rhi.vertex; -export namespace draco::rhi +export namespace draco::rendering::rhi { - using BufferHandle = uint16_t; - using PipelineHandle = uint16_t; - using ShaderHandle = uint16_t; - using UniformHandle = uint16_t; - using TextureHandle = uint16_t; - using FramebufferHandle = uint16_t; - using SamplerHandle = uint16_t; - using LayoutHandle = uint16_t; - using ViewID = uint16_t; - - inline constexpr BufferHandle InvalidBuffer = 0xFFFF; - inline constexpr PipelineHandle InvalidPipeline = 0xFFFF; - inline constexpr ShaderHandle InvalidShader = 0xFFFF; - inline constexpr UniformHandle InvalidUniform = 0xFFFF; - inline constexpr TextureHandle InvalidTexture = 0xFFFF; - inline constexpr FramebufferHandle InvalidFramebuffer = 0xFFFF; - inline constexpr SamplerHandle InvalidSampler = 0xFFFF; - inline constexpr ViewID InvalidView = 0xFFFF; + struct BufferTag {}; + struct PipelineTag {}; + struct ShaderTag {}; + struct UniformTag {}; + struct TextureTag {}; + struct FramebufferTag {}; + struct LayoutTag {}; + + using BufferHandle = core::memory::Handle; + using PipelineHandle = core::memory::Handle; + using ShaderHandle = core::memory::Handle; + using UniformHandle = core::memory::Handle; + using TextureHandle = core::memory::Handle; + using FramebufferHandle = core::memory::Handle; + using LayoutHandle = core::memory::Handle; + + using ViewID = uint16_t; // bgfx native + using SamplerHandle = uint64_t; // bgfx sampler flags + + inline constexpr BufferHandle InvalidBuffer{}; + inline constexpr PipelineHandle InvalidPipeline{}; + inline constexpr ShaderHandle InvalidShader{}; + inline constexpr UniformHandle InvalidUniform{}; + inline constexpr TextureHandle InvalidTexture{}; + inline constexpr FramebufferHandle InvalidFramebuffer{}; + inline constexpr LayoutHandle InvalidLayout{}; + inline constexpr SamplerHandle InvalidSampler = 0; + inline constexpr ViewID InvalidView = UINT16_MAX; enum class PipelineState : uint64_t { - Default = 0, - WriteRGB = 1 << 0, - WriteAlpha = 1 << 1, - MSAA = 1 << 2, - PrimitiveTriStrip = 1 << 3, + Default = 0, + WriteRGB = 1ULL << 0, + WriteAlpha = 1ULL << 1, + MSAA = 1ULL << 2, + PrimitiveTriStrip = 1ULL << 3, + }; + + enum class ClearFlags : uint32_t { + Color = BGFX_CLEAR_COLOR, + Depth = BGFX_CLEAR_DEPTH, + Stencil = BGFX_CLEAR_STENCIL + }; + + struct ViewDesc { + FramebufferHandle fb = InvalidFramebuffer; + uint16_t x, y, w, h; + uint32_t clear_flags; + uint32_t clear_color; }; enum class UniformType { - Sampler, // For textures - Vec4, // For colors or simple data - Mat3, // For normal matrices - Mat4, // For transform matrices + Sampler, + Vec4, + Mat3, + Mat4, + }; + + struct UniformBind { + UniformHandle handle; + const void* data; + uint16_t num; }; enum class TextureFormat { RGBA8, + BGRA8, D16, D24, + D24S8, D32 }; @@ -70,28 +104,33 @@ export namespace draco::rhi CCW }; - struct TransientBuffer { - const void* data; - uint32_t size; - uint16_t stride; + struct Buffer + { + bgfx::VertexBufferHandle vbh = BGFX_INVALID_HANDLE; + bgfx::DynamicVertexBufferHandle dvbh = BGFX_INVALID_HANDLE; + bgfx::IndexBufferHandle ibh = BGFX_INVALID_HANDLE; + bool is_dynamic = false; + bool is_index = false; }; - struct RenderPacket - { - uint64_t sort_key; + struct FramebufferResource { + bgfx::FrameBufferHandle fbh; + TextureHandle texture; + }; - BufferHandle vertex_buffer = InvalidBuffer; - BufferHandle index_buffer = InvalidBuffer; - PipelineHandle pipeline = InvalidPipeline; - UniformHandle uniform_handle = InvalidUniform; - TextureHandle texture_handle = InvalidTexture; - - const void* uniform_data = nullptr; + struct VertexLayoutResource + { + bgfx::VertexLayout layout; + }; - uint8_t texture_unit = 0; // Which slot the texture goes into + struct ScissorRect { + uint16_t x, y, w, h; + bool enabled = true; + }; - float model[16]; - uint32_t draw_tags; + struct DeletionReq { + uint64_t frame; + std::function cleanup; }; struct PipelineDesc @@ -99,32 +138,59 @@ export namespace draco::rhi ShaderHandle vs; ShaderHandle fs; PipelineState state; + + BlendMode blend = BlendMode::None; + DepthTest depth = DepthTest::Less; + CullMode cull = CullMode::CCW; + + bool depth_write = true; }; - bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height); - void shutdown(); + struct RenderPacket + { + uint64_t sort_key = 0; - void resize(uint16_t width, uint16_t height); + BufferHandle vertex_buffer = InvalidBuffer; + BufferHandle index_buffer = InvalidBuffer; + PipelineHandle pipeline = InvalidPipeline; - // Create the shader from the given data & size - // Note: The data should be in the format expected by the underlying graphics API - ShaderHandle create_shader(const void* data, uint32_t size); + UniformHandle sampler_uniform = InvalidUniform; + SamplerHandle sampler_flags = InvalidSampler; + TextureHandle texture_handle = InvalidTexture; + + float color[4] = {1,1,1,1}; + + std::vector uniforms; + uint8_t texture_unit = 0; + + float model[16] = { + 1,0,0,0, + 0,1,0,0, + 0,0,1,0, + 0,0,0,1 + }; + + uint32_t draw_tags = 0; + }; + + struct Pipeline { + bgfx::ProgramHandle program; + uint64_t state; + }; + + bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height); + void resize(uint16_t width, uint16_t height); + void shutdown(); - // Create a pipeline from the give description PipelineHandle create_pipeline(const PipelineDesc&); - // Create a vertex or index buffer from the given data & size BufferHandle create_vertex_buffer(const void* data, uint32_t size); BufferHandle create_index_buffer(const void* data, uint32_t size); - // Create a uniform with the given name, type & count UniformHandle create_uniform(const char* name, UniformType type, uint16_t num = 1); void destroy_uniform(UniformHandle handle); - - // Set the value of a uniform with the given handle, value & count void set_uniform(UniformHandle handle, const void* value, uint16_t num = 1); - // Create a texture from the given data, width, height & flags TextureHandle create_texture(const void* data, uint16_t width, uint16_t height, uint32_t flags = 0); void destroy_texture(TextureHandle handle); @@ -132,33 +198,46 @@ export namespace draco::rhi void destroy_framebuffer(FramebufferHandle handle); TextureHandle get_framebuffer_texture(FramebufferHandle handle); - // Dynamic Buffer functions (For data that changes often) - BufferHandle create_dynamic_vertex_buffer(uint32_t size, uint16_t stride); + BufferHandle create_dynamic_vertex_buffer(uint32_t size, LayoutHandle layout); void update_dynamic_vertex_buffer(BufferHandle handle, uint32_t start_vertex, const void* data, uint32_t size); - // Set the render target for a specific view - void set_view_framebuffer(ViewID view, FramebufferHandle handle); - LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc); SamplerHandle create_sampler(bool linear, bool clamp); - void set_view_projection(uint16_t view, const float* view_mtx, const float* proj_mtx); - void set_scissor(uint16_t x, uint16_t y, uint16_t width, uint16_t height); - - // Helper function to set a 4x4 matrix to the identity matrix + // Expects bgfx compiled shader binary (shaderc output) + ShaderHandle create_shader(const void* data, uint32_t size); + bgfx::ShaderHandle resolve(ShaderHandle h); + // For debugging/tooling + bgfx::ShaderHandle* get_shader_native(ShaderHandle h); + void destroy_shader(ShaderHandle h); + + void perspective(float* out, float fov, float aspect, float nearp, float farp); + void look_at(float* out, const float* eye, const float* at, const float* up); + + // Note: Internal use only, use apply_view() instead + void set_view_rect(ViewID view, uint16_t x, uint16_t y, uint16_t w, uint16_t h); + void set_view_framebuffer(ViewID view, FramebufferHandle handle); + + void set_view_projection(ViewID view, const float* view_mtx, const float* proj_mtx); + void set_scissor(const ScissorRect& r); + void set_stencil(uint32_t f_stencil, uint32_t b_stencil); + + void apply_view(ViewID view, const ViewDesc& desc); + void identity_matrix(float* _mtx); - // Submit a render packet to the given view for rendering + uint64_t map_state(PipelineState s, BlendMode, DepthTest, CullMode, bool depth_write); + bgfx::UniformType::Enum map_uniform_type(UniformType t); + void submit(const RenderPacket&, ViewID); - // Begin and end the rendering of a frame void begin_frame(); void end_frame(); - // We need a resource management system - // but since we don't have any yet, let's just use this - void destroy_resource(auto handle); + template + void destroy_resource(T handle); + void process_deletions(); constexpr PipelineState operator|(PipelineState a, PipelineState b) { @@ -168,4 +247,4 @@ export namespace draco::rhi constexpr PipelineState operator&(PipelineState a, PipelineState b) { return static_cast(static_cast(a) & static_cast(b)); } -} \ No newline at end of file +} diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 150b37a..3120964 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -8,110 +8,107 @@ import std; module rendering.rhi; -namespace draco::rhi +namespace draco::rendering::rhi { - struct Buffer - { - bgfx::VertexBufferHandle vbh = BGFX_INVALID_HANDLE; // Stores vertex data, but it can be null if this buffer is an index buffer - bgfx::IndexBufferHandle ibh = BGFX_INVALID_HANDLE; // Stores index data, but it can be null if this buffer is a vertex buffer - bool is_index = false; // Allows us to know which type of buffer this is without needing to check the handles - }; - - struct Pipeline - { - bgfx::ProgramHandle program = BGFX_INVALID_HANDLE; - uint64_t state = 0; // Stored as raw bgfx bitmask - }; - - struct DeletionReq { - uint64_t frame; - std::function cleanup; - }; - - // Static globals - // Note: We need to replace it with a more robust resource management system later, but this'll work for now - static std::vector g_buffers; - static std::vector g_pipelines; - static std::vector g_uniforms; - static std::vector g_textures; - static std::vector g_framebuffers; - static std::vector g_dynamic_vbs; - static std::map g_fb_to_tex; - static std::vector g_layouts; + #ifndef DRACO_RHI_VALIDATION + #define DRACO_RHI_VALIDATION 1 + #endif + + #if DRACO_RHI_VALIDATION + #define RHI_ASSERT(cond, msg, ...) \ + if (!(cond)) { std::println("[RHI ERROR] " msg, ##__VA_ARGS__); std::abort(); } + + #define RHI_WARN(cond, msg, ...) \ + if (!(cond)) { std::println("[RHI WARNING] " msg, ##__VA_ARGS__); } + #else + #define RHI_ASSERT(cond, msg, ...) + #define RHI_WARN(cond, msg, ...) + #endif + + using namespace draco::core::memory; + + static HandleRegistry g_buffers; + static HandleRegistry g_pipelines; + static HandleRegistry g_uniforms; + static HandleRegistry g_textures; + static HandleRegistry g_framebuffers; + static HandleRegistry g_shaders; + static HandleRegistry g_layouts; + + // Deferred destruction queue (GPU-safe deletion) static std::vector g_deletion_queue; static uint16_t g_width = 0; static uint16_t g_height = 0; + // Ensures a handle is valid before use + // TODO: Replace with something better + template + auto* get_checked(Registry& reg, HandleT h, const char* name) + { + if (!reg.valid(h)) + { + RHI_WARN(false, "{} handle invalid or stale!", name); + return (decltype(reg.get(h)))nullptr; + } + + return reg.get(h); + } + + // GPU-safe destruction (delayed by 2 frames) + // This is the industry standard + template + void destroy_later(T handle) + { + if (!bgfx::isValid(handle)) + return; + + g_deletion_queue.push_back({ + bgfx::getStats()->gpuFrameNum, + [handle]() { bgfx::destroy(handle); } + }); + } + + void process_deletions() + { + uint64_t frame = bgfx::getStats()->gpuFrameNum; + + std::erase_if(g_deletion_queue, [frame](const auto& d) + { + if (frame >= d.frame + 2) + { + d.cleanup(); + return true; + } + return false; + }); + } + bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height) { g_width = width; g_height = height; bgfx::Init init{}; + init.type = bgfx::RendererType::Vulkan; - // TODO: Replace this - init.type = bgfx::RendererType::Count; // Auto-selects the renderer - - // Pass the handles directly into the init struct - // So, ndt is the native display type & nwh is the native window handle init.platformData.ndt = display_type; init.platformData.nwh = window_handle; - + init.resolution.width = width; init.resolution.height = height; init.resolution.reset = BGFX_RESET_VSYNC; - if (!bgfx::init(init)) { - std::println("bgfx failed to init!"); + if (!bgfx::init(init)) + { + RHI_ASSERT(false, "bgfx initialization failed"); return false; } bgfx::setDebug(BGFX_DEBUG_TEXT); - bgfx::setViewClear(0, - BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, - 0x303030ff, 1.0f, 0); - return true; } - void shutdown() - { - for (auto& b : g_buffers) - { - // Destroy the buffers - if (bgfx::isValid(b.vbh)) bgfx::destroy(b.vbh); - if (bgfx::isValid(b.ibh)) bgfx::destroy(b.ibh); - } - - for (auto& p : g_pipelines) - { - // Destroy the pipeline - if (bgfx::isValid(p.program)) bgfx::destroy(p.program); - } - - for (auto& u : g_uniforms) - { - // Destroy the uniforms - if (bgfx::isValid(u)) bgfx::destroy(u); - } - - for (auto& t : g_textures) - { - // Destroy the textures - if (bgfx::isValid(t)) bgfx::destroy(t); - } - - // Clear everything so we don't have dangling handles - g_buffers.clear(); - g_pipelines.clear(); - g_uniforms.clear(); - g_textures.clear(); - - // Have bgfx destroy the context and everything it holds internally - bgfx::shutdown(); - } - void resize(uint16_t width, uint16_t height) { if(width == 0 || height == 0) @@ -126,423 +123,390 @@ namespace draco::rhi bgfx::reset(width, height, BGFX_RESET_VSYNC); } - uint64_t map_state(PipelineState state) + void shutdown() { - uint64_t bgfx_state = BGFX_STATE_NONE; - // Cast to uint64_t so the 'if' can treat it as a boolean check - // Otherwise, the bitwise check would fail since PipelineState is an enum class and doesn't implicitly convert to uint64_t - if (static_cast(state & PipelineState::WriteRGB)) bgfx_state |= BGFX_STATE_WRITE_RGB; - if (static_cast(state & PipelineState::WriteAlpha)) bgfx_state |= BGFX_STATE_WRITE_A; - if (static_cast(state & PipelineState::MSAA)) bgfx_state |= BGFX_STATE_MSAA; - if (static_cast(state & PipelineState::PrimitiveTriStrip)) bgfx_state |= BGFX_STATE_PT_TRISTRIP; - return bgfx_state; - } + // Walk all registries and destroy live GPU objects + for (auto& slot : g_buffers.internal().raw()) + { + if (!slot.alive) continue; - ShaderHandle create_shader(const void* data, uint32_t size) - { - // Check the input data before trying to create the shader - // If it's invalid, print an error & return an invalid handle except for crashing - if(!data || size == 0) + if (bgfx::isValid(slot.value.vbh)) + bgfx::destroy(slot.value.vbh); + + if (bgfx::isValid(slot.value.ibh)) + bgfx::destroy(slot.value.ibh); + } + + for (auto& slot : g_pipelines.internal().raw()) { - std::println("Error: Invalid shader data or size"); - return InvalidShader; + if (!slot.alive) continue; + + if (bgfx::isValid(slot.value.program)) + bgfx::destroy(slot.value.program); } - const bgfx::Memory* mem = bgfx::copy(data, size); - return bgfx::createShader(mem).idx; - } + for (auto& slot : g_uniforms.internal().raw()) + { + if (!slot.alive) continue; - PipelineHandle create_pipeline(const PipelineDesc& desc) - { - // Check the input data before trying to create the pipeline - // If it's invalid, print an error & return an invalid handle except for crashing - if(!desc.vs || !desc.fs) + if (bgfx::isValid(slot.value)) + bgfx::destroy(slot.value); + } + + for (auto& slot : g_textures.internal().raw()) { - std::println("Error: Invalid shader handles in PipelineDesc"); - return InvalidPipeline; + if (!slot.alive) continue; + + if (bgfx::isValid(slot.value)) + bgfx::destroy(slot.value); } + bgfx::shutdown(); + } + + PipelineHandle create_pipeline(const PipelineDesc& desc) + { + RHI_ASSERT(desc.vs != InvalidShader, "Pipeline missing vertex shader"); + RHI_ASSERT(desc.fs != InvalidShader, "Pipeline missing fragment shader"); - bgfx::ShaderHandle vs{ desc.vs }; - bgfx::ShaderHandle fs{ desc.fs }; + bgfx::ProgramHandle prog = bgfx::createProgram(resolve(desc.vs), resolve(desc.fs), true); - bgfx::ProgramHandle prog = bgfx::createProgram(vs, fs, true); + uint64_t state = map_state(desc.state, desc.blend, desc.depth, desc.cull, desc.depth_write); - g_pipelines.push_back({ prog, map_state(desc.state) }); - return (PipelineHandle)(g_pipelines.size() - 1); + return g_pipelines.create({ prog, state }); } BufferHandle create_vertex_buffer(const void* data, uint32_t size) { - // Check the input data before trying to create the buffer - // If it's invalid, print an error & return an invalid handle except for crashing - if(!data || size == 0) - { - std::println("Error: Invalid vertex buffer data or size"); - return InvalidBuffer; - } + RHI_ASSERT(data != nullptr, "Vertex buffer data is null"); + RHI_ASSERT(size > 0, "Vertex buffer size is zero"); bgfx::VertexLayout layout; layout.begin() - .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) - .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) // normalized - .add(bgfx::Attrib::TexCoord0, 2, bgfx::AttribType::Float) + .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) + .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) + .add(bgfx::Attrib::TexCoord0,2, bgfx::AttribType::Float) .end(); - bgfx::VertexBufferHandle vbh = bgfx::createVertexBuffer( - bgfx::copy(data, size), - layout - ); + auto vbh = bgfx::createVertexBuffer(bgfx::copy(data, size), layout); - g_buffers.push_back({ vbh, BGFX_INVALID_HANDLE, false }); - return (BufferHandle)(g_buffers.size() - 1); + return g_buffers.create({ vbh, BGFX_INVALID_HANDLE, false }); } BufferHandle create_index_buffer(const void* data, uint32_t size) { - // Check the input data before trying to create the buffer - // If it's invalid, print an error & return an invalid handle except for crashing - if(!data || size == 0) - { - std::println("Error: Invalid index buffer data or size"); - return InvalidBuffer; - } + RHI_ASSERT(data != nullptr, "Index buffer data is null"); + RHI_ASSERT(size > 0, "Index buffer size is zero"); - bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer( - bgfx::copy(data, size) - ); + bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer(bgfx::copy(data, size)); - g_buffers.push_back({ BGFX_INVALID_HANDLE, ibh, true }); - return (BufferHandle)(g_buffers.size() - 1); - } + Buffer buf; // Idk why I named it this, it just sounds funny ;) + buf.ibh = ibh; + buf.is_index = true; - static bgfx::UniformType::Enum map_uniform_type(UniformType type) { - switch (type) { - case UniformType::Sampler: return bgfx::UniformType::Sampler; - case UniformType::Vec4: return bgfx::UniformType::Vec4; - case UniformType::Mat3: return bgfx::UniformType::Mat3; - case UniformType::Mat4: return bgfx::UniformType::Mat4; - } - return bgfx::UniformType::Count; + return g_buffers.create(buf); } - UniformHandle create_uniform(const char* name, UniformType type, uint16_t num) { - bgfx::UniformHandle handle = bgfx::createUniform(name, map_uniform_type(type), num); - g_uniforms.push_back(handle); - return static_cast(g_uniforms.size() - 1); + BufferHandle create_dynamic_vertex_buffer(uint32_t size, LayoutHandle layout_h) + { + auto* layout = get_checked(g_layouts, layout_h, "Layout"); + RHI_ASSERT(layout, "Invalid layout"); + + bgfx::DynamicVertexBufferHandle dvbh = bgfx::createDynamicVertexBuffer(size, layout->layout); + + Buffer buf; + buf.dvbh = dvbh; + buf.is_dynamic = true; + + return g_buffers.create(buf); } - void set_uniform(UniformHandle handle, const void* value, uint16_t num) { - // Check for null/invalid handles - if (handle == InvalidUniform) return; + LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc) + { + bgfx::VertexLayout layout; + layout.begin(); - // Check for out of bound handles - if (handle >= g_uniforms.size()) { - std::println("Error: Uniform handle out of bounds!"); - return; + for (const auto& e : desc.elements) + { + layout.add((bgfx::Attrib::Enum)e.attrib, e.count, (bgfx::AttribType::Enum)e.type, e.normalized); } - bgfx::setUniform(g_uniforms[handle], value, num); + layout.end(); + + return g_layouts.create({ layout }); } - void destroy_uniform(UniformHandle handle) { - if (handle < g_uniforms.size() && bgfx::isValid(g_uniforms[handle])) { - bgfx::destroy(g_uniforms[handle]); - // We don't remove from vector to keep indices stable, - // just invalidate the handle - g_uniforms[handle] = BGFX_INVALID_HANDLE; - } + UniformHandle create_uniform(const char* name, UniformType type, uint16_t num) + { + RHI_ASSERT(name != nullptr, "Uniform name is null"); + + auto u = bgfx::createUniform(name, map_uniform_type(type), num); + return g_uniforms.create(u); } - bgfx::TextureFormat::Enum map_format(TextureFormat format) { - switch(format) { - case TextureFormat::RGBA8: return bgfx::TextureFormat::RGBA8; - case TextureFormat::D24: return bgfx::TextureFormat::D24; - default: return bgfx::TextureFormat::RGBA8; - } + void set_uniform(UniformHandle h, const void* data, uint16_t num) + { + auto* u = get_checked(g_uniforms, h, "Uniform"); + if (!u) return; + + RHI_ASSERT(data != nullptr, "Uniform data is null"); + + bgfx::setUniform(*u, data, num); } - TextureHandle create_texture(const void* data, uint16_t width, uint16_t height, uint32_t flags) + void destroy_uniform(UniformHandle h) { - if (!data || width == 0 || height == 0) { - std::println("Error: Invalid texture data or dimensions"); - return InvalidTexture; - } + auto* u = get_checked(g_uniforms, h, "Uniform"); + if (!u) return; - // Default flags are linear filtering & clamp to edge - uint64_t bgfx_flags = BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP | BGFX_SAMPLER_MIN_POINT | BGFX_SAMPLER_MAG_POINT; - - const bgfx::Memory* mem = bgfx::copy(data, width * height * 4); // Assuming RGBA8, but this should be calculated based on the actual format - bgfx::TextureHandle handle = bgfx::createTexture2D( - width, height, false, 1, - bgfx::TextureFormat::RGBA8, - bgfx_flags, mem + destroy_later(*u); + g_uniforms.destroy(h); + } + + TextureHandle create_texture(const void* data, uint16_t w, uint16_t h, uint32_t) + { + RHI_ASSERT(data != nullptr, "Texture data is null"); + RHI_ASSERT(w > 0 && h > 0, "Invalid texture dimensions"); + + auto tex = bgfx::createTexture2D( + w, h, false, 1, + bgfx::TextureFormat::RGBA8, + BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP, + bgfx::copy(data, w * h * 4) ); - g_textures.push_back(handle); - return static_cast(g_textures.size() - 1); + return g_textures.create(tex); } - FramebufferHandle create_framebuffer(uint16_t width, uint16_t height, TextureFormat format) { - // Create the texture that will be the color attachment - // We use BGFX_TEXTURE_RT to tell bgfx this is a Render Target - bgfx::TextureHandle th = bgfx::createTexture2D( - width, height, false, 1, bgfx::TextureFormat::RGBA8, - BGFX_TEXTURE_RT | BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP - ); + ShaderHandle create_shader(const void* data, uint32_t size) + { + RHI_ASSERT(data && size > 0, "Invalid shader data"); - // Create the framebuffer using that texture - bgfx::FrameBufferHandle fbh = bgfx::createFrameBuffer(1, &th, true); - draco::rhi::g_framebuffers.push_back(fbh); - - draco::rhi::FramebufferHandle handle = static_cast(draco::rhi::g_framebuffers.size() - 1); - - // Register the texture - draco::rhi::g_textures.push_back(th); - draco::rhi::TextureHandle tex_handle = static_cast(draco::rhi::g_textures.size() - 1); - - draco::rhi::g_fb_to_tex[handle] = tex_handle; - - return handle; + bgfx::ShaderHandle sh = bgfx::createShader(bgfx::copy(data, size)); + + return g_shaders.create(sh); } - TextureHandle get_framebuffer_texture(FramebufferHandle handle) { - if (draco::rhi::g_fb_to_tex.contains(handle)) { - return draco::rhi::g_fb_to_tex[handle]; - } - return draco::rhi::InvalidTexture; + bgfx::ShaderHandle resolve(ShaderHandle h) + { + auto* sh = g_shaders.get(h); + return sh ? *sh : bgfx::ShaderHandle{ bgfx::kInvalidHandle }; + } + + // For debugging/tooling + bgfx::ShaderHandle* get_shader_native(ShaderHandle h) + { + return get_checked(g_shaders, h, "Shader"); } - void set_view_framebuffer(ViewID view, FramebufferHandle handle) { - if (handle == draco::rhi::InvalidFramebuffer) { - bgfx::setViewFrameBuffer(view, { bgfx::kInvalidHandle }); - } else { - bgfx::setViewFrameBuffer(view, draco::rhi::g_framebuffers[handle]); + void destroy_shader(ShaderHandle h) + { + if (auto* sh = get_checked(g_shaders, h, "Shader")) + { + destroy_later(*sh); + g_shaders.destroy(h); } } - - BufferHandle create_dynamic_vertex_buffer(uint32_t size) { - bgfx::VertexLayout layout; - layout.begin() - .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) - .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) - .add(bgfx::Attrib::TexCoord0, 2, bgfx::AttribType::Float) - .end(); - bgfx::DynamicVertexBufferHandle dvb = bgfx::createDynamicVertexBuffer(size / 24, layout); - // For now, let's just push it to a new specialized vector - g_dynamic_vbs.push_back(dvb); - return static_cast(g_dynamic_vbs.size() - 1); + void perspective(float* out, float fov, float aspect, float nearp, float farp) + { + bx::mtxProj(out, fov, aspect, nearp, farp, bgfx::getCaps()->homogeneousDepth); } - void submit_transient(const RenderPacket& p, ViewID view, const void* data, uint32_t size) { - bgfx::TransientVertexBuffer tvb; - bgfx::VertexLayout layout; - layout.begin() - .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) - .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) - .add(bgfx::Attrib::TexCoord0, 2, bgfx::AttribType::Float) - .end(); + void look_at(float* out, const float* eye, const float* at, const float* up) + { + bx::Vec3 eye_v { eye[0], eye[1], eye[2] }; + bx::Vec3 at_v { at[0], at[1], at[2] }; + bx::Vec3 up_v { up[0], up[1], up[2] }; - // Allocate from the transient pool for this frame - bgfx::allocTransientVertexBuffer(&tvb, size / 24, layout); - - if (tvb.data != nullptr) { // Check if the pointer is valid - std::memcpy(tvb.data, data, size); - } - bgfx::setVertexBuffer(0, &tvb); - - // Apply uniforms, state, etc. - bgfx::setState(g_pipelines[p.pipeline].state); - bgfx::submit(view, g_pipelines[p.pipeline].program); + bx::mtxLookAt(out, eye_v, at_v, up_v); } - LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc) { - bgfx::VertexLayout layout; - layout.begin(); - for (const auto& e : desc.elements) { - bgfx::Attrib::Enum attr; - switch(e.attrib) { - case Attrib::Position: attr = bgfx::Attrib::Position; break; - case Attrib::Color0: attr = bgfx::Attrib::Color0; break; - case Attrib::TexCoord0: attr = bgfx::Attrib::TexCoord0; break; - case Attrib::Normal: attr = bgfx::Attrib::Normal; break; - case Attrib::Tangent: attr = bgfx::Attrib::Tangent; break; - } - - bgfx::AttribType::Enum type = (e.type == AttribType::Float) - ? bgfx::AttribType::Float : bgfx::AttribType::Uint8; - - layout.add(attr, e.num, type, e.normalized); - } - layout.end(); - g_layouts.push_back(layout); - return static_cast(g_layouts.size() - 1); - } + // Note: Internal use only, use apply_view() instead + void set_view_framebuffer(ViewID view, FramebufferHandle h) + { + auto* fb = get_checked(g_framebuffers, h, "Framebuffer"); + + if (!fb) + return; - SamplerHandle create_sampler(bool linear, bool clamp) { - uint32_t flags = 0; - flags |= linear ? (BGFX_SAMPLER_MIN_POINT | BGFX_SAMPLER_MAG_POINT) : 0; - flags |= clamp ? (BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP) : 0; - // In bgfx, samplers are often just flags passed to setTexture, - // but we'll return them as a handle for API consistency. - return static_cast(flags); + bgfx::setViewFrameBuffer(view, fb->fbh); } - void set_scissor(uint16_t x, uint16_t y, uint16_t width, uint16_t height) { - bgfx::setScissor(x, y, width, height); + // Note: Internal use only, use apply_view() instead + void set_view_rect(ViewID view, uint16_t x, uint16_t y, uint16_t w, uint16_t h) + { + bgfx::setViewRect(view, x, y, w, h); } - void set_view_projection(uint16_t view, const float* view_mtx, const float* proj_mtx) { + void set_view_projection(ViewID view, const float* view_mtx, const float* proj_mtx) + { bgfx::setViewTransform(view, view_mtx, proj_mtx); } - uint64_t map_extra_states(BlendMode blend, DepthTest depth, CullMode cull) { - uint64_t state = BGFX_STATE_WRITE_RGB | BGFX_STATE_WRITE_A | BGFX_STATE_MSAA; + void set_scissor(const ScissorRect& r) + { + if (!r.enabled) + bgfx::setScissor(UINT16_MAX); + else + bgfx::setScissor(r.x, r.y, r.w, r.h); + } - - switch (blend) { - case BlendMode::Alpha: state |= BGFX_STATE_BLEND_ALPHA; break; - case BlendMode::Additive: state |= BGFX_STATE_BLEND_ADD; break; - case BlendMode::Multiply: state |= BGFX_STATE_BLEND_MULTIPLY; break; - default: break; - } + void set_stencil(uint32_t fstencil, uint32_t bstencil) + { + bgfx::setStencil(fstencil, bstencil); + } - switch (depth) { - case DepthTest::Less: state |= BGFX_STATE_DEPTH_TEST_LESS | BGFX_STATE_WRITE_Z; break; - case DepthTest::Equal: state |= BGFX_STATE_DEPTH_TEST_EQUAL | BGFX_STATE_WRITE_Z; break; + uint64_t map_state(PipelineState s, BlendMode blend, DepthTest depth, CullMode cull, bool depth_write) + { + uint64_t state = 0; + + if ((s & PipelineState::WriteRGB) != PipelineState::Default) + state |= BGFX_STATE_WRITE_RGB; + + if ((s & PipelineState::WriteAlpha) != PipelineState::Default) + state |= BGFX_STATE_WRITE_A; + + if (depth_write) + state |= BGFX_STATE_WRITE_Z; + + switch (depth) + { + case DepthTest::Less: state |= BGFX_STATE_DEPTH_TEST_LESS; break; + case DepthTest::Equal: state |= BGFX_STATE_DEPTH_TEST_EQUAL; break; case DepthTest::Always: state |= BGFX_STATE_DEPTH_TEST_ALWAYS; break; - default: break; + case DepthTest::None: break; } - switch (cull) { + + switch (cull) + { case CullMode::CW: state |= BGFX_STATE_CULL_CW; break; case CullMode::CCW: state |= BGFX_STATE_CULL_CCW; break; - default: break; + case CullMode::None: break; + } + + switch (blend) + { + case BlendMode::Alpha: + state |= BGFX_STATE_BLEND_ALPHA; + break; + + case BlendMode::Additive: + state |= BGFX_STATE_BLEND_ADD; + break; + + case BlendMode::Multiply: + state |= BGFX_STATE_BLEND_MULTIPLY; + break; + + case BlendMode::None: + break; } + if ((s & PipelineState::MSAA) != PipelineState::Default) + state |= BGFX_STATE_MSAA; + return state; } - void destroy_resource(auto handle) { - if (!bgfx::isValid(handle)) return; - - g_deletion_queue.push_back({ - bgfx::getStats()->gpuFrameNum, - [handle]() { - if constexpr (std::is_same_v) { - bgfx::destroy(handle); - } else if constexpr (std::is_same_v) { - bgfx::destroy(handle); - } else if constexpr (std::is_same_v) { - bgfx::destroy(handle); - } else if constexpr (std::is_same_v) { - bgfx::destroy(handle); - } else if constexpr (std::is_same_v) { - bgfx::destroy(handle); - } else if constexpr (std::is_same_v) { - bgfx::destroy(handle); - } - } - }); + bgfx::UniformType::Enum map_uniform_type(UniformType t) + { + switch (t) + { + case UniformType::Sampler: return bgfx::UniformType::Sampler; + case UniformType::Vec4: return bgfx::UniformType::Vec4; + case UniformType::Mat3: return bgfx::UniformType::Mat3; + case UniformType::Mat4: return bgfx::UniformType::Mat4; + } + return bgfx::UniformType::Vec4; } - void process_deletions() { - // Use the frame count from bgfx stats to track GPU time - uint64_t current_frame = bgfx::getStats()->gpuFrameNum; - - std::erase_if(g_deletion_queue, [current_frame](const auto& req) { - // A 2-frame delay is industry standard for ensuring the GPU/Driver - // is no longer referencing the memory. - if (current_frame >= req.frame + 2) { - req.cleanup(); - return true; + void apply_view(ViewID view, const ViewDesc& desc) + { + if (desc.fb != InvalidFramebuffer) + { + auto* fb = get_checked(g_framebuffers, desc.fb, "Framebuffer"); + + if (fb && bgfx::isValid(fb->fbh)) + { + bgfx::setViewFrameBuffer(view, fb->fbh); } - return false; - }); + else + { + RHI_WARN(false, "Framebuffer invalid at apply_view"); + } + } + + bgfx::setViewRect(view, desc.x, desc.y, desc.w, desc.h); + + if (desc.clear_flags != 0) + { + bgfx::setViewClear(view, desc.clear_flags, desc.clear_color); + } } - void identity_matrix(float* _mtx) + void identity_matrix(float* mtx) { - bx::mtxIdentity(_mtx); + bx::mtxIdentity(mtx); } - void submit(const draco::rhi::RenderPacket& p, ViewID view) + void submit(const RenderPacket& p, ViewID view) { - // Check for null/invalid handles - if (p.pipeline == draco::rhi::InvalidPipeline || p.vertex_buffer == draco::rhi::InvalidBuffer) { - std::println("Error: Attempted to submit RenderPacket with unitialized handles."); - return; - } + auto* pipeline = get_checked(g_pipelines, p.pipeline, "Pipeline"); + auto* vb = get_checked(g_buffers, p.vertex_buffer, "VertexBuffer"); - // Check for out of bounds handles - if (p.pipeline >= draco::rhi::g_pipelines.size() || p.vertex_buffer >= draco::rhi::g_buffers.size()) { - std::println("Error: Handle out of bounds! The resource may have been destroyed already or it was never created. Pipeline Handle: {}, Vertex Buffer Handle: {}", p.pipeline, p.vertex_buffer); + if (!pipeline || !vb) return; - } - - draco::rhi::Pipeline& pipeline = draco::rhi::g_pipelines[p.pipeline]; - draco::rhi::Buffer& vb = draco::rhi::g_buffers[p.vertex_buffer]; + // Transform matrix (model) bgfx::setTransform(p.model); - bgfx::setVertexBuffer(0, draco::rhi::g_buffers[p.vertex_buffer].vbh); - if (p.index_buffer != draco::rhi::InvalidBuffer) + // Vertex buffer binding + if (vb->is_dynamic) + bgfx::setVertexBuffer(0, vb->dvbh); + else + bgfx::setVertexBuffer(0, vb->vbh); + + // Index buffer binding + if (auto* ib = get_checked(g_buffers, p.index_buffer, "IndexBuffer")) { - if (p.index_buffer >= draco::rhi::g_buffers.size()) { - std::println("Error: Invalid index buffer handle in RenderPacket"); - return; - } - draco::rhi::Buffer& ib = draco::rhi::g_buffers[p.index_buffer]; - if (ib.is_index) - bgfx::setIndexBuffer(ib.ibh); + if (ib->is_index) + bgfx::setIndexBuffer(ib->ibh); } - if (p.uniform_handle != draco::rhi::InvalidUniform && p.uniform_data != nullptr) + // Uniforms + for (const auto& u : p.uniforms) { - bgfx::setUniform(draco::rhi::g_uniforms[p.uniform_handle], p.uniform_data, 1); + if (auto* handle = get_checked(g_uniforms, u.handle, "UniformBind")) + { + bgfx::setUniform(*handle, u.data, u.num); + } } - // Bind Texture if valid - if (p.texture_handle != draco::rhi::InvalidTexture && p.texture_handle < draco::rhi::g_textures.size()) + // Texture binding + if (auto* tex = get_checked(g_textures, p.texture_handle, "Texture")) { - // TODO: Use a dedicated sampler handle later - // For now, we'll assume the uniform_handle passed is the sampler. - if (p.uniform_handle != draco::rhi::InvalidUniform) { - bgfx::setTexture(p.texture_unit, draco::rhi::g_uniforms[p.uniform_handle], draco::rhi::g_textures[p.texture_handle]); + if (auto* sampler = get_checked(g_uniforms, p.sampler_uniform, "Sampler")) + { + bgfx::setTexture(p.texture_unit, *sampler, *tex, p.sampler_flags); } } - bgfx::setState(pipeline.state); - bgfx::submit(view, pipeline.program); + // Apply pipeline state & submit draw call + bgfx::setState(pipeline->state); + bgfx::submit(view, pipeline->program); } void begin_frame() { - // Initialize View 0 (Offscreen) - bgfx::setViewRect(0, 0, 0, g_width, g_height); - bgfx::setViewClear(0, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x303030ff, 1.0f, 0); - - // Initialize View 1 (Backbuffer/Screen) - bgfx::setViewRect(1, 0, 0, g_width, g_height); - bgfx::setViewClear(1, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x000000ff, 1.0f, 0); - - // Set transforms for both views - float view[16]; - bx::mtxIdentity(view); - float proj[16]; - bx::mtxOrtho(proj, -1.0f, 1.0f, -1.0f, 1.0f, 0.0f, 100.0f, 0.0f, bgfx::getCaps()->homogeneousDepth); - - bgfx::setViewTransform(0, view, proj); - bgfx::setViewTransform(1, view, proj); - - // Touch both views so they definitely render - bgfx::touch(0); - bgfx::touch(1); + // Clean up GPU resources safely + process_deletions(); } void end_frame() { + // Submit frame to GPU bgfx::frame(); } } diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/native/rendering/rhi/vertex.cppm index 421a20a..c43a7c1 100644 --- a/engine/native/rendering/rhi/vertex.cppm +++ b/engine/native/rendering/rhi/vertex.cppm @@ -6,7 +6,7 @@ export module rendering.rhi.vertex; import std; -export namespace draco::rhi { +export namespace draco::rendering::rhi { enum class Attrib { Position, Color0, @@ -22,7 +22,7 @@ export namespace draco::rhi { struct VertexElement { Attrib attrib; - uint8_t num; + uint16_t count; AttribType type; bool normalized = false; }; diff --git a/engine/native/thirdparty/bgfx b/engine/native/thirdparty/bgfx index cceedb6..58faaad 160000 --- a/engine/native/thirdparty/bgfx +++ b/engine/native/thirdparty/bgfx @@ -1 +1 @@ -Subproject commit cceedb60cfe43dcde9786949e3beeef9b1da2944 +Subproject commit 58faaadf1cd0f734f6dd56160c6073fc928e3c64 diff --git a/engine/native/thirdparty/bimg b/engine/native/thirdparty/bimg index abc7dea..e429424 160000 --- a/engine/native/thirdparty/bimg +++ b/engine/native/thirdparty/bimg @@ -1 +1 @@ -Subproject commit abc7dea0503d778a94d7af8f223366571c76b299 +Subproject commit e4294241cd6ee295bac10f9c7b1b92d8a7dc14aa diff --git a/engine/native/thirdparty/sdl b/engine/native/thirdparty/sdl index 47d1449..1aa7224 160000 --- a/engine/native/thirdparty/sdl +++ b/engine/native/thirdparty/sdl @@ -1 +1 @@ -Subproject commit 47d14491a6e89322b2a649cdbfb854fccce12cd3 +Subproject commit 1aa72247af95802d897dabd51b29311e87c41ae0 From 64615cdfa33648685e19793f42bcf401f86f4e74 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Wed, 6 May 2026 19:13:58 +0500 Subject: [PATCH 10/41] Add camera controller & remove all std imports (replaced by the traditional headers) --- CMakeLists.txt | 2 + engine/native/CMakeLists.txt | 7 +- engine/native/core/io/filesystem.cpp | 6 +- engine/native/core/io/filesystem.cppm | 11 +- engine/native/core/io/image_loader.cpp | 7 +- engine/native/core/io/image_loader.cppm | 5 +- engine/native/core/memory/slot_array.cppm | 2 +- engine/native/input/CMakeLists.txt | 10 ++ engine/native/input/input.cpp | 97 +++++++++++++++++ engine/native/input/input.cppm | 36 +++++++ engine/native/main/main.cpp | 75 +++++++------ engine/native/platform/linux/linux.cpp | 4 +- engine/native/platform/mac/mac.mm | 3 +- engine/native/platform/platform.cppm | 6 +- engine/native/platform/win32/win32.cpp | 3 +- engine/native/rendering/renderer/renderer.cpp | 10 +- .../native/rendering/renderer/renderer.cppm | 9 +- .../rendering/rendergraph/rendergraph.cpp | 2 + .../rendering/rendergraph/rendergraph.cppm | 7 +- engine/native/rendering/rhi/rhi.cppm | 8 +- engine/native/rendering/rhi/rhi_bgfx.cpp | 9 +- engine/native/rendering/rhi/vertex.cppm | 3 +- engine/native/scene/CMakeLists.txt | 17 +++ .../native/scene/camera/camera_controller.cpp | 100 ++++++++++++++++++ .../scene/camera/camera_controller.cppm | 23 ++++ 25 files changed, 406 insertions(+), 56 deletions(-) create mode 100644 engine/native/input/CMakeLists.txt create mode 100644 engine/native/input/input.cpp create mode 100644 engine/native/input/input.cppm create mode 100644 engine/native/scene/CMakeLists.txt create mode 100644 engine/native/scene/camera/camera_controller.cpp create mode 100644 engine/native/scene/camera/camera_controller.cppm diff --git a/CMakeLists.txt b/CMakeLists.txt index 424549e..2ee9738 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,8 @@ target_link_libraries(draconic memory image_loader platform + input + camera # Camera controller rhi renderer rendergraph diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index da7157e..38d8419 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -1,10 +1,11 @@ include(Compiler) include(Modules) -add_subdirectory(thirdparty) - add_modules_library(core SHARED) target_link_libraries(core PUBLIC definitions math io memory) +add_subdirectory(thirdparty) +add_subdirectory(platform) +add_subdirectory(input) add_subdirectory(rendering) -add_subdirectory(platform) \ No newline at end of file +add_subdirectory(scene) \ No newline at end of file diff --git a/engine/native/core/io/filesystem.cpp b/engine/native/core/io/filesystem.cpp index 427fcb3..70dec29 100644 --- a/engine/native/core/io/filesystem.cpp +++ b/engine/native/core/io/filesystem.cpp @@ -1,6 +1,10 @@ module; -import std; +#include +#include +#include +#include +#include module core.io.filesystem; diff --git a/engine/native/core/io/filesystem.cppm b/engine/native/core/io/filesystem.cppm index 7814695..74bd029 100644 --- a/engine/native/core/io/filesystem.cppm +++ b/engine/native/core/io/filesystem.cppm @@ -1,9 +1,14 @@ -export module core.io.filesystem; +module; + +#include +#include +#include +#include -import std; +export module core.io.filesystem; export namespace draco::core::io::filesystem { // Returns a buffer of the file data - std::vector load_binary(const std::string& path); + std::vector load_binary(const std::string& path); } diff --git a/engine/native/core/io/image_loader.cpp b/engine/native/core/io/image_loader.cpp index 9345ce7..7222c23 100644 --- a/engine/native/core/io/image_loader.cpp +++ b/engine/native/core/io/image_loader.cpp @@ -1,10 +1,13 @@ module; +#include +#include +#include +#include + #define STB_IMAGE_IMPLEMENTATION #include -#include - module core.io.image_loader; // TODO: I'm too lazy to write code so we need somethin' better diff --git a/engine/native/core/io/image_loader.cppm b/engine/native/core/io/image_loader.cppm index 6f72dd7..1d1bba8 100644 --- a/engine/native/core/io/image_loader.cppm +++ b/engine/native/core/io/image_loader.cppm @@ -1,12 +1,11 @@ module; -#include #include +#include +#include export module core.io.image_loader; -import std; - export namespace draco::core::io::image_loader { struct ImageData diff --git a/engine/native/core/memory/slot_array.cppm b/engine/native/core/memory/slot_array.cppm index 6bcdafd..8859fa0 100644 --- a/engine/native/core/memory/slot_array.cppm +++ b/engine/native/core/memory/slot_array.cppm @@ -1,10 +1,10 @@ module; +#include #include export module core.memory.slot_array; -import std; import core.memory.handle; export namespace draco::core::memory diff --git a/engine/native/input/CMakeLists.txt b/engine/native/input/CMakeLists.txt new file mode 100644 index 0000000..f7cc136 --- /dev/null +++ b/engine/native/input/CMakeLists.txt @@ -0,0 +1,10 @@ +add_library(input) + +target_sources(input + PUBLIC + FILE_SET CXX_MODULES FILES input.cppm + PRIVATE + input.cpp +) + +target_link_libraries(input PRIVATE SDL3::SDL3-static) \ No newline at end of file diff --git a/engine/native/input/input.cpp b/engine/native/input/input.cpp new file mode 100644 index 0000000..b7a538f --- /dev/null +++ b/engine/native/input/input.cpp @@ -0,0 +1,97 @@ +module; + +#include + +module input; + +namespace draco::input +{ + // Static globals + static bool g_keys[256]{}; + static bool g_mouse_captured; + static float g_mouse_dx = 0; + static float g_mouse_dy = 0; + + static Key map_sdl_key(SDL_Keycode k) + { + switch (k) + { + case SDLK_W: return Key::W; + case SDLK_A: return Key::A; + case SDLK_S: return Key::S; + case SDLK_D: return Key::D; + case SDLK_SPACE: return Key::Space; + case SDLK_LCTRL: return Key::Ctrl; + case SDLK_LSHIFT: return Key::Shift; + case SDLK_ESCAPE: return Key::Escape; + default: return Key::Invalid; + } + } + + void begin_frame() + { + g_mouse_dx = 0; + g_mouse_dy = 0; + } + + void end_frame() + { + } + + void set_key(Key key, bool down) + { + if (key == Key::Invalid) return; + + g_keys[(uint16_t)key] = down; + } + + bool is_down(Key key) + { + return g_keys[(uint16_t)key]; + } + + void process_event(const SDL_Event& e) + { + switch (e.type) + { + case SDL_EVENT_KEY_DOWN: + set_key(map_sdl_key(e.key.key), true); + break; + + case SDL_EVENT_KEY_UP: + set_key(map_sdl_key(e.key.key), false); + break; + + case SDL_EVENT_MOUSE_MOTION: + set_mouse_delta((float)e.motion.xrel, (float)e.motion.yrel); + break; + } + } + + void set_mouse_captured(SDL_Window* window, bool enabled) + { + g_mouse_captured = enabled; + + SDL_SetWindowRelativeMouseMode(window, enabled); + SDL_SetWindowMouseGrab(window, enabled); + } + + bool is_mouse_captured() + { + return g_mouse_captured; + } + + void set_mouse_delta(float dx, float dy) + { + g_mouse_dx += dx; + g_mouse_dy += dy; + } + + float get_mouse_dx() { + return g_mouse_dx; + } + + float get_mouse_dy() { + return g_mouse_dy; + } +} \ No newline at end of file diff --git a/engine/native/input/input.cppm b/engine/native/input/input.cppm new file mode 100644 index 0000000..1943d36 --- /dev/null +++ b/engine/native/input/input.cppm @@ -0,0 +1,36 @@ +module; + +#include +#include + +export module input; + +export namespace draco::input +{ + enum class Key : uint16_t + { + // TODO: A small set of keys should be okay for now but this needs to be updated later as per our needs + W, A, S, D, + Space, Ctrl, + Shift, + Escape, + Invalid + }; + + // Note: This isn't the same as RHI + void begin_frame(); + void end_frame(); + + void set_key(Key key, bool down); + bool is_down(Key key); + + void process_event(const SDL_Event& e); + + void set_mouse_captured(SDL_Window* window, bool enabled); + bool is_mouse_captured(); + + void set_mouse_delta(float dx, float dy); + + float get_mouse_dx(); + float get_mouse_dy(); +} \ No newline at end of file diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 4cf286c..d51b03f 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -1,4 +1,6 @@ -import std; +#include +#include +#include #include #include @@ -6,7 +8,9 @@ import std; import core.io.filesystem; import core.io.image_loader; +import input; import platform; +import scene.camera.controller; import rendering.rhi; import rendering.rhi.vertex; @@ -31,6 +35,8 @@ int main(int argc, char* argv[]) return -1; } + draco::input::set_mouse_captured(window, true); + auto handles = draco::platform::get_native_handles(window); if (!handles.valid) { @@ -50,7 +56,7 @@ int main(int argc, char* argv[]) draco::rendering::renderer::init(1280, 720); - draco::rhi::TexturedVertex quad[] = { + draco::rendering::rhi::TexturedVertex quad[] = { { -0.5f, 0.5f, 0.1f, 0xffffffff, 0.0f, 0.0f }, { 0.5f, 0.5f, -0.1f, 0xffffffff, 1.0f, 0.0f }, { 0.5f, -0.5f, 0.1f, 0xffffffff, 1.0f, 1.0f }, @@ -93,6 +99,9 @@ int main(int argc, char* argv[]) draco::rendering::rhi::PipelineState::MSAA }); + draco::scene::CameraController camera; + camera.init(); + auto u_tint = draco::rendering::rhi::create_uniform("u_tint", draco::rendering::rhi::UniformType::Vec4); auto u_offset = draco::rendering::rhi::create_uniform("u_offset", draco::rendering::rhi::UniformType::Vec4); @@ -100,15 +109,35 @@ int main(int argc, char* argv[]) float offset[4] = {0,0,0,0}; bool running = true; - - float angle = 0.0f; + bool mouse_captured = true; while (running) { + // Delta time + static uint64_t last = SDL_GetTicks(); + uint64_t now = SDL_GetTicks(); + float dt = (now - last) / 1000.0f; + last = now; + SDL_Event e; - while (SDL_PollEvent(&e)) { + draco::input::begin_frame(); + + while (SDL_PollEvent(&e)) + { if (e.type == SDL_EVENT_QUIT) running = false; + + if (e.type == SDL_EVENT_KEY_DOWN) + { + if (e.key.key == SDLK_ESCAPE) + { + mouse_captured = !mouse_captured; + + draco::input::set_mouse_captured(window, mouse_captured); + } + } + + draco::input::process_event(e); } int w, h; @@ -117,16 +146,9 @@ int main(int argc, char* argv[]) draco::rendering::rhi::resize((uint16_t)w, (uint16_t)h); draco::rendering::renderer::resize((uint16_t)w, (uint16_t)h); - draco::rendering::renderer::Camera cam; - - cam.position = { 0.0f, 0.0f, -2.0f }; // camera pulled back - cam.target = { 0.0f, 0.0f, 0.0f }; // looking at origin - cam.up = { 0.0f, 1.0f, 0.0f }; - - cam.fov = 60.0f; - cam.near_plane = 0.1f; - cam.far_plane = 100.0f; + camera.update(dt); + auto cam = camera.get_camera(); draco::rendering::renderer::begin_frame(cam); draco::rendering::rhi::RenderPacket pkt; @@ -140,26 +162,17 @@ int main(int argc, char* argv[]) pkt.uniforms.push_back({ u_tint, tint, 1 }); pkt.uniforms.push_back({ u_offset, offset, 1 }); - angle += 0.01f; - - float model[16]; - bx::mtxRotateY(model, angle); - - std::memcpy(pkt.model, model, sizeof(model)); - - draco::rendering::renderer::submit_entity(pkt, 0); - for (int i = 0; i < 10; i++) - { - auto p = pkt; + { + auto p = pkt; - float model[16]; - bx::mtxTranslate(model, i * 0.6f - 3.0f, 0.0f, 0.0f); + float model[16]; + bx::mtxTranslate(model, i * 0.6f - 3.0f, 0.0f, 0.0f); - std::memcpy(p.model, model, sizeof(model)); + std::memcpy(p.model, model, sizeof(model)); - draco::rendering::renderer::submit_entity(p, 0); - } + draco::rendering::renderer::submit_entity(p, 0); + } draco::rendering::renderer::end_frame(); } @@ -169,4 +182,4 @@ int main(int argc, char* argv[]) SDL_Quit(); return 0; -} \ No newline at end of file +} diff --git a/engine/native/platform/linux/linux.cpp b/engine/native/platform/linux/linux.cpp index 4b73db9..d3b1596 100644 --- a/engine/native/platform/linux/linux.cpp +++ b/engine/native/platform/linux/linux.cpp @@ -1,7 +1,9 @@ module; +#include +#include + #include -import std; module platform; diff --git a/engine/native/platform/mac/mac.mm b/engine/native/platform/mac/mac.mm index 9d3caa8..93bf4f6 100644 --- a/engine/native/platform/mac/mac.mm +++ b/engine/native/platform/mac/mac.mm @@ -1,7 +1,8 @@ module; +#include + #include -import std; module platform; diff --git a/engine/native/platform/platform.cppm b/engine/native/platform/platform.cppm index 67deebc..c395cdf 100644 --- a/engine/native/platform/platform.cppm +++ b/engine/native/platform/platform.cppm @@ -1,6 +1,8 @@ -export module platform; +module; + +#include -import std; +export module platform; export namespace draco::platform { struct NativeWindowFrame diff --git a/engine/native/platform/win32/win32.cpp b/engine/native/platform/win32/win32.cpp index 1578964..569259b 100644 --- a/engine/native/platform/win32/win32.cpp +++ b/engine/native/platform/win32/win32.cpp @@ -1,7 +1,8 @@ module; +#include + #include -import std; module platform; diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp index 0d144da..fab5442 100644 --- a/engine/native/rendering/renderer/renderer.cpp +++ b/engine/native/rendering/renderer/renderer.cpp @@ -1,9 +1,17 @@ module; +#include +#include +#include +#include +#include +#include +#include +#include + #include #include -import std; import rendering.rhi; import rendering.rendergraph; diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/native/rendering/renderer/renderer.cppm index b02eec5..539b769 100644 --- a/engine/native/rendering/renderer/renderer.cppm +++ b/engine/native/rendering/renderer/renderer.cppm @@ -1,10 +1,17 @@ module; +#include +#include +#include +#include +#include +#include +#include + #include export module rendering.renderer; -import std; import rendering.rhi; import rendering.rendergraph; diff --git a/engine/native/rendering/rendergraph/rendergraph.cpp b/engine/native/rendering/rendergraph/rendergraph.cpp index 4024db4..bac4a74 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cpp +++ b/engine/native/rendering/rendergraph/rendergraph.cpp @@ -1,5 +1,7 @@ module; +#include + #include module rendering.rendergraph; diff --git a/engine/native/rendering/rendergraph/rendergraph.cppm b/engine/native/rendering/rendergraph/rendergraph.cppm index adc34c8..5953ecf 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cppm +++ b/engine/native/rendering/rendergraph/rendergraph.cppm @@ -1,11 +1,16 @@ module; +#include +#include +#include #include +#include +#include +#include export module rendering.rendergraph; import rendering.rhi; -import std; export namespace draco::rendering::rendergraph { diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index fea6088..153622d 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -1,11 +1,17 @@ module; +#include +#include +#include #include +#include +#include +#include + #include export module rendering.rhi; -import std; import core.memory; import rendering.rhi.vertex; diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 3120964..08827be 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -1,6 +1,13 @@ module; -import std; +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/native/rendering/rhi/vertex.cppm index c43a7c1..79211a8 100644 --- a/engine/native/rendering/rhi/vertex.cppm +++ b/engine/native/rendering/rhi/vertex.cppm @@ -1,11 +1,10 @@ module; #include +#include export module rendering.rhi.vertex; -import std; - export namespace draco::rendering::rhi { enum class Attrib { Position, diff --git a/engine/native/scene/CMakeLists.txt b/engine/native/scene/CMakeLists.txt new file mode 100644 index 0000000..263873d --- /dev/null +++ b/engine/native/scene/CMakeLists.txt @@ -0,0 +1,17 @@ +add_modules_library(camera) + +target_sources(camera + PUBLIC + FILE_SET CXX_MODULES FILES + camera/camera_controller.cppm + + PRIVATE + camera/camera_controller.cpp +) + +target_link_libraries(camera + PUBLIC + input + renderer + bx +) \ No newline at end of file diff --git a/engine/native/scene/camera/camera_controller.cpp b/engine/native/scene/camera/camera_controller.cpp new file mode 100644 index 0000000..72d757a --- /dev/null +++ b/engine/native/scene/camera/camera_controller.cpp @@ -0,0 +1,100 @@ +module; + +#include +#include + +module scene.camera.controller; + +import input; + +namespace draco::scene +{ + void CameraController::init(float x, float y, float z) + { + m_x = x; + m_y = y; + m_z = z; + + m_yaw = 0.0f; + m_pitch = 0.0f; + + m_speed = 5.0f; // units per second + m_sensitivity = 0.002f; // mouse sensitivity + } + + void CameraController::update(float dt) + { + m_yaw += draco::input::get_mouse_dx() * m_sensitivity; + m_pitch -= draco::input::get_mouse_dy() * m_sensitivity; // Temp fix to flip mouse input + + // Clamp pitch + if (m_pitch > 1.5f) m_pitch = 1.5f; + if (m_pitch < -1.5f) m_pitch = -1.5f; + + bx::Vec3 forward = { + cosf(m_pitch) * sinf(m_yaw), + sinf(m_pitch), + cosf(m_pitch) * cosf(m_yaw) + }; + + bx::Vec3 right = { + sinf(m_yaw - bx::kPiHalf), + 0.0f, + cosf(m_yaw - bx::kPiHalf) + }; + + float velocity = m_speed * dt; + + if (draco::input::is_down(draco::input::Key::W)) + { + m_x += forward.x * velocity; + m_y += forward.y * velocity; + m_z += forward.z * velocity; + } + + if (draco::input::is_down(draco::input::Key::S)) + { + m_x -= forward.x * velocity; + m_y -= forward.y * velocity; + m_z -= forward.z * velocity; + } + + if (draco::input::is_down(draco::input::Key::A)) + { + m_x += right.x * velocity; + m_z += right.z * velocity; + } + + if (draco::input::is_down(draco::input::Key::D)) + { + m_x -= right.x * velocity; + m_z -= right.z * velocity; + } + } + + draco::rendering::renderer::Camera CameraController::get_camera() const + { + bx::Vec3 forward = { + cosf(m_pitch) * sinf(m_yaw), + sinf(m_pitch), + cosf(m_pitch) * cosf(m_yaw) + }; + + draco::rendering::renderer::Camera cam{}; + + cam.position = { m_x, m_y, m_z }; + cam.target = { + m_x + forward.x, + m_y + forward.y, + m_z + forward.z + }; + + cam.up = { 0.0f, 1.0f, 0.0f }; + + cam.fov = 60.0f; + cam.near_plane = 0.1f; + cam.far_plane = 100.0f; + + return cam; + } +} \ No newline at end of file diff --git a/engine/native/scene/camera/camera_controller.cppm b/engine/native/scene/camera/camera_controller.cppm new file mode 100644 index 0000000..2cdbc5e --- /dev/null +++ b/engine/native/scene/camera/camera_controller.cppm @@ -0,0 +1,23 @@ +export module scene.camera.controller; + +import rendering.renderer; + +export namespace draco::scene +{ + struct CameraController + { + void init(float x = 0.0f, float y = 0.0f, float z = -2.0f); + + void update(float dt); + + draco::rendering::renderer::Camera get_camera() const; + + private: + float m_x, m_y, m_z; + float m_yaw; + float m_pitch; + + float m_speed; + float m_sensitivity; + }; +} \ No newline at end of file From 27f83bc5cfc1ec6744e49c38891462964c026d80 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Wed, 6 May 2026 20:11:18 +0500 Subject: [PATCH 11/41] Apply suggestions --- engine/native/platform/linux/linux.cpp | 5 +++++ engine/native/scene/camera/camera_controller.cppm | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/engine/native/platform/linux/linux.cpp b/engine/native/platform/linux/linux.cpp index d3b1596..da4b08b 100644 --- a/engine/native/platform/linux/linux.cpp +++ b/engine/native/platform/linux/linux.cpp @@ -1,5 +1,6 @@ module; +#include #include #include @@ -21,6 +22,10 @@ namespace draco::platform { } else if (std::string_view(driver) == "wayland") { frame.ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_DISPLAY_POINTER, nullptr); frame.nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_SURFACE_POINTER, nullptr); + } else { + std::println("No video driver was found"); + SDL_Quit(); + return -1; } SDL_GetWindowSize(window, &frame.width, &frame.height); diff --git a/engine/native/scene/camera/camera_controller.cppm b/engine/native/scene/camera/camera_controller.cppm index 2cdbc5e..f0b0109 100644 --- a/engine/native/scene/camera/camera_controller.cppm +++ b/engine/native/scene/camera/camera_controller.cppm @@ -13,11 +13,11 @@ export namespace draco::scene draco::rendering::renderer::Camera get_camera() const; private: - float m_x, m_y, m_z; - float m_yaw; - float m_pitch; - - float m_speed; - float m_sensitivity; + // Init with default values + float m_x = 0.0f, m_y = 0.0f, m_z = 0.0f; + float m_yaw = 0.0f; + float m_pitch = 0.0f; + float m_speed = 5.0f; + float m_sensitivity = 0.1f; }; } \ No newline at end of file From 80af02665a0b1fb2629d0058c6b6abe7352acb6f Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Wed, 6 May 2026 21:11:07 +0500 Subject: [PATCH 12/41] Fix issues --- engine/native/main/main.cpp | 10 +++++----- engine/native/platform/linux/linux.cpp | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index d51b03f..631ef86 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -57,10 +57,10 @@ int main(int argc, char* argv[]) draco::rendering::renderer::init(1280, 720); draco::rendering::rhi::TexturedVertex quad[] = { - { -0.5f, 0.5f, 0.1f, 0xffffffff, 0.0f, 0.0f }, - { 0.5f, 0.5f, -0.1f, 0xffffffff, 1.0f, 0.0f }, - { 0.5f, -0.5f, 0.1f, 0xffffffff, 1.0f, 1.0f }, - { -0.5f, -0.5f, -0.1f, 0xffffffff, 0.0f, 1.0f } + { -0.5f, 0.5f, 0.0f, 0xffffffff, 0.0f, 0.0f }, + { 0.5f, 0.5f, 0.0f, 0xffffffff, 1.0f, 0.0f }, + { 0.5f, -0.5f, 0.0f, 0xffffffff, 1.0f, 1.0f }, + { -0.5f, -0.5f, 0.0f, 0xffffffff, 0.0f, 1.0f } }; uint16_t indices[] = { 0,1,2, 2,3,0 }; @@ -167,7 +167,7 @@ int main(int argc, char* argv[]) auto p = pkt; float model[16]; - bx::mtxTranslate(model, i * 0.6f - 3.0f, 0.0f, 0.0f); + bx::mtxTranslate(model, i * 1.5f - 7.5f, 0.0f, 0.0f); std::memcpy(p.model, model, sizeof(model)); diff --git a/engine/native/platform/linux/linux.cpp b/engine/native/platform/linux/linux.cpp index da4b08b..49c9767 100644 --- a/engine/native/platform/linux/linux.cpp +++ b/engine/native/platform/linux/linux.cpp @@ -25,7 +25,6 @@ namespace draco::platform { } else { std::println("No video driver was found"); SDL_Quit(); - return -1; } SDL_GetWindowSize(window, &frame.width, &frame.height); From 43141d245df5be30cd525bbfee2cfeb2517413f0 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Thu, 7 May 2026 18:12:08 +0500 Subject: [PATCH 13/41] Minor improvements & fixes --- CMakeLists.txt | 18 ++++++++++++------ cmake/Compiler.cmake | 10 ++++++++++ engine/native/core/io/filesystem.cpp | 6 +++++- engine/native/core/io/image_loader.cpp | 18 +++++++++++++++--- engine/native/core/io/image_loader.cppm | 4 ++-- engine/native/core/memory/slot_array.cppm | 12 ++++++------ engine/native/main/main.cpp | 11 +++++++++-- engine/native/platform/CMakeLists.txt | 13 ++++++++++--- engine/native/rendering/renderer/renderer.cpp | 3 ++- engine/native/rendering/renderer/renderer.cppm | 18 +++++++++--------- .../rendering/rendergraph/rendergraph.cpp | 3 --- engine/native/rendering/rhi/rhi.cppm | 12 ++++++------ engine/native/rendering/rhi/rhi_bgfx.cpp | 14 ++++++++++---- engine/native/thirdparty/CMakeLists.txt | 8 ++++---- 14 files changed, 100 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ee9738..4b531ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,14 +64,20 @@ target_link_libraries(draconic bgfx bx bimg - -Wl,--whole-archive SDL3::SDL3-static -Wl,--no-whole-archive - c++ - c++abi - dl - pthread - m ) +find_package(Threads REQUIRED) + +if(UNIX AND NOT APPLE) + target_link_libraries(draconic PRIVATE SDL3::SDL3-static Threads::Threads dl) + target_link_options(draconic PRIVATE -Wl,--whole-archive $ -Wl,--no-whole-archive) +elseif(APPLE) + target_link_libraries(draconic PRIVATE SDL3::SDL3-static) + target_link_options(draconic PRIVATE -Wl,-force_load,$) +else() + target_link_libraries(draconic PRIVATE SDL3::SDL3-static) +endif() + # Asset sync set(ENGINE_SHADER_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") add_custom_command( diff --git a/cmake/Compiler.cmake b/cmake/Compiler.cmake index 4525885..d158854 100644 --- a/cmake/Compiler.cmake +++ b/cmake/Compiler.cmake @@ -20,4 +20,14 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") # TODO: Make SIMD level configurable or detect at runtime add_compile_options(-mavx2 -mfma) endif() + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.0) + message(FATAL_ERROR "GCC version must be at least 14 for C++23 support") + endif() + endif() + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0) + message(FATAL_ERROR "Clang version must be at least 18 for C++23 support") + endif() + endif() endif() \ No newline at end of file diff --git a/engine/native/core/io/filesystem.cpp b/engine/native/core/io/filesystem.cpp index 70dec29..a7e2f72 100644 --- a/engine/native/core/io/filesystem.cpp +++ b/engine/native/core/io/filesystem.cpp @@ -22,11 +22,15 @@ namespace draco::core::io::filesystem } std::streamsize size = file.tellg(); - if (size <= 0) { + if (size < 0) { std::println("Error: File is empty or unreadable: {}", path); return {}; } + if (size == 0) { + return {}; + } + file.seekg(0, std::ios::beg); std::vector buffer(static_cast(size)); diff --git a/engine/native/core/io/image_loader.cpp b/engine/native/core/io/image_loader.cpp index 7222c23..4f799e7 100644 --- a/engine/native/core/io/image_loader.cpp +++ b/engine/native/core/io/image_loader.cpp @@ -18,7 +18,8 @@ namespace draco::core::io::image_loader { ImageData result; - if (!std::filesystem::exists(path)) { + std::error_code ec; + if (!std::filesystem::exists(path, ec) || ec) { std::println("Error: Image path does not exist: {}", path.string()); return result; } @@ -32,8 +33,19 @@ namespace draco::core::io::image_loader return result; } - // Calculate the total size: width * height * 4 (RGBA) - size_t size = static_cast(width) * height * 4; + if (width <= 0 || height <= 0) { + stbi_image_free(data); + return result; + } + + const size_t w = static_cast(width); + const size_t h = static_cast(height); + if (w > (std::numeric_limits::max() / 4) / h) { + stbi_image_free(data); + return result; + } + + size_t size = w * h * 4; result.pixels.assign(data, data + size); result.width = static_cast(width); diff --git a/engine/native/core/io/image_loader.cppm b/engine/native/core/io/image_loader.cppm index 1d1bba8..5dce247 100644 --- a/engine/native/core/io/image_loader.cppm +++ b/engine/native/core/io/image_loader.cppm @@ -11,8 +11,8 @@ export namespace draco::core::io::image_loader struct ImageData { std::vector pixels; - uint16_t width = 0; - uint16_t height = 0; + uint32_t width = 0; + uint32_t height = 0; uint8_t channels = 0; bool is_valid = false; }; diff --git a/engine/native/core/memory/slot_array.cppm b/engine/native/core/memory/slot_array.cppm index 8859fa0..5ab9488 100644 --- a/engine/native/core/memory/slot_array.cppm +++ b/engine/native/core/memory/slot_array.cppm @@ -13,7 +13,7 @@ export namespace draco::core::memory struct Slot { T value{}; - uint16_t generation = 0; + uint32_t generation = 0; bool alive = false; }; @@ -25,7 +25,7 @@ export namespace draco::core::memory Handle create(const T& value) { - uint16_t idx; + uint32_t idx; if (!free_list.empty()) { @@ -34,7 +34,7 @@ export namespace draco::core::memory } else { - idx = static_cast(slots.size()); + idx = static_cast(slots.size()); slots.push_back({}); } @@ -48,7 +48,7 @@ export namespace draco::core::memory bool valid(Handle h) const { - uint16_t i = h.index(); + uint32_t i = h.index(); return i < slots.size() && slots[i].alive @@ -83,13 +83,13 @@ export namespace draco::core::memory free_list.push_back(h.index()); } - std::vector>& raw() + const std::vector>& raw() const { return slots; } private: std::vector> slots; - std::vector free_list; + std::vector free_list; }; } \ No newline at end of file diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 631ef86..12df991 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -140,11 +140,18 @@ int main(int argc, char* argv[]) draco::input::process_event(e); } + static int dw = 1280; // Default width, it shouldn't be modified + static int dh = 720; // Default height, it shouldn't be modified + int w, h; SDL_GetWindowSize(window, &w, &h); - draco::rendering::rhi::resize((uint16_t)w, (uint16_t)h); - draco::rendering::renderer::resize((uint16_t)w, (uint16_t)h); + if (w != dw || h != dh) { + draco::rendering::rhi::resize(static_cast(w), static_cast(h)); + draco::rendering::renderer::resize(static_cast(w), static_cast(h)); + dw = w; + dh = h; + } camera.update(dt); diff --git a/engine/native/platform/CMakeLists.txt b/engine/native/platform/CMakeLists.txt index c9ff8a8..66d16d4 100644 --- a/engine/native/platform/CMakeLists.txt +++ b/engine/native/platform/CMakeLists.txt @@ -9,8 +9,11 @@ else() set(PLATFORM_SRC "linux/linux.cpp") find_package(PkgConfig REQUIRED) pkg_check_modules(X11_LIBS REQUIRED IMPORTED_TARGET x11 xext xcursor xrandr xrender xi xfixes) - pkg_check_modules(WAYLAND_LIBS REQUIRED IMPORTED_TARGET wayland-client wayland-egl wayland-cursor egl) - set(PLATFORM_DEPS PkgConfig::X11_LIBS PkgConfig::WAYLAND_LIBS) + pkg_check_modules(WAYLAND_LIBS IMPORTED_TARGET wayland-client wayland-egl wayland-cursor egl) + set(PLATFORM_DEPS PkgConfig::X11_LIBS) + if(WAYLAND_LIBS_FOUND) + list(APPEND PLATFORM_DEPS PkgConfig::WAYLAND_LIBS) + endif() endif() add_library(platform SHARED) @@ -26,4 +29,8 @@ target_sources(platform target_include_directories(platform INTERFACE $) -target_link_libraries(platform PRIVATE SDL3::SDL3-static ${PLATFORM_DEPS}) \ No newline at end of file +target_link_libraries(platform PRIVATE SDL3::SDL3-static ${PLATFORM_DEPS}) + +if(DRACO_HAS_WAYLAND) + target_compile_definitions(platform PRIVATE DRACO_HAS_WAYLAND=1) +endif() \ No newline at end of file diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp index fab5442..abdc3c8 100644 --- a/engine/native/rendering/renderer/renderer.cpp +++ b/engine/native/rendering/renderer/renderer.cpp @@ -57,7 +57,8 @@ namespace draco::rendering::renderer draco::rendering::rhi::look_at(view_mtx, g_ctx.main_camera.position.data(), g_ctx.main_camera.target.data(), g_ctx.main_camera.up.data()); - float aspect = float(g_ctx.screen_width) / float(g_ctx.screen_height); + const auto safe_height = std::max(g_ctx.screen_height, 1); + float aspect = float(g_ctx.screen_width) / float(safe_height); draco::rendering::rhi::perspective(proj_mtx, g_ctx.main_camera.fov, aspect, g_ctx.main_camera.near_plane, g_ctx.main_camera.far_plane); diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/native/rendering/renderer/renderer.cppm index 539b769..b843a27 100644 --- a/engine/native/rendering/renderer/renderer.cppm +++ b/engine/native/rendering/renderer/renderer.cppm @@ -18,23 +18,23 @@ import rendering.rendergraph; export namespace draco::rendering::renderer { struct Camera { - std::array position; - std::array target; - std::array up; - float fov; - float near_plane; - float far_plane; + std::array position {0.0f, 0.0f, 0.0f}; + std::array target {0.0f, 0.0f, 0.0f}; + std::array up {0.0f, 1.0f, 0.0f}; + float fov = 60.0f; + float near_plane = 0.1f; + float far_plane = 1000.0f; }; struct SceneContext { - uint16_t screen_width; - uint16_t screen_height; + uint16_t screen_width = 0; + uint16_t screen_height = 0; Camera main_camera; draco::rendering::rendergraph::RenderGraph graph; }; - SceneContext g_ctx; + inline SceneContext g_ctx; void init(uint16_t width, uint16_t height); void resize(uint16_t width, uint16_t height); diff --git a/engine/native/rendering/rendergraph/rendergraph.cpp b/engine/native/rendering/rendergraph/rendergraph.cpp index bac4a74..3bad017 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cpp +++ b/engine/native/rendering/rendergraph/rendergraph.cpp @@ -21,9 +21,6 @@ namespace draco::rendering::rendergraph { void RenderGraph::execute() { for (auto& pass : m_passes) { - - std::println("[RenderGraph] Executing pass: {}", pass.name); // Debug - draco::rendering::rhi::apply_view(pass.view, {pass.framebuffer, 0, 0, pass.width, pass.height, pass.clear_flags, pass.clear_color}); draco::rendering::rhi::set_view_projection(pass.view, pass.view_mtx, pass.proj_mtx); diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 153622d..8a42c62 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -62,9 +62,9 @@ export namespace draco::rendering::rhi struct ViewDesc { FramebufferHandle fb = InvalidFramebuffer; - uint16_t x, y, w, h; - uint32_t clear_flags; - uint32_t clear_color; + uint16_t x = 0, y = 0, w = 0, h = 0; + uint32_t clear_flags = 0; + uint32_t clear_color = 0; }; enum class UniformType @@ -143,7 +143,7 @@ export namespace draco::rendering::rhi { ShaderHandle vs; ShaderHandle fs; - PipelineState state; + PipelineState state = PipelineState::Default; BlendMode blend = BlendMode::None; DepthTest depth = DepthTest::Less; @@ -197,10 +197,10 @@ export namespace draco::rendering::rhi void destroy_uniform(UniformHandle handle); void set_uniform(UniformHandle handle, const void* value, uint16_t num = 1); - TextureHandle create_texture(const void* data, uint16_t width, uint16_t height, uint32_t flags = 0); + TextureHandle create_texture(const void* data, uint32_t width, uint32_t height, uint32_t flags = 0); void destroy_texture(TextureHandle handle); - FramebufferHandle create_framebuffer(uint16_t width, uint16_t height, TextureFormat format); + FramebufferHandle create_framebuffer(uint32_t width, uint32_t height, TextureFormat format); void destroy_framebuffer(FramebufferHandle handle); TextureHandle get_framebuffer_texture(FramebufferHandle handle); diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 08827be..112ebdd 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -97,7 +97,7 @@ namespace draco::rendering::rhi g_height = height; bgfx::Init init{}; - init.type = bgfx::RendererType::Vulkan; + init.type = bgfx::RendererType::Count; init.platformData.ndt = display_type; init.platformData.nwh = window_handle; @@ -142,6 +142,9 @@ namespace draco::rendering::rhi if (bgfx::isValid(slot.value.ibh)) bgfx::destroy(slot.value.ibh); + + if (bgfx::isValid(slot.value.dvbh)) + bgfx::destroy(slot.value.dvbh); } for (auto& slot : g_pipelines.internal().raw()) @@ -270,7 +273,7 @@ namespace draco::rendering::rhi g_uniforms.destroy(h); } - TextureHandle create_texture(const void* data, uint16_t w, uint16_t h, uint32_t) + TextureHandle create_texture(const void* data, uint32_t w, uint32_t h, uint32_t flags) { RHI_ASSERT(data != nullptr, "Texture data is null"); RHI_ASSERT(w > 0 && h > 0, "Invalid texture dimensions"); @@ -278,7 +281,7 @@ namespace draco::rendering::rhi auto tex = bgfx::createTexture2D( w, h, false, 1, bgfx::TextureFormat::RGBA8, - BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP, + flags == 0 ? (BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP) : flags, bgfx::copy(data, w * h * 4) ); @@ -414,6 +417,9 @@ namespace draco::rendering::rhi if ((s & PipelineState::MSAA) != PipelineState::Default) state |= BGFX_STATE_MSAA; + if ((s & PipelineState::PrimitiveTriStrip) != PipelineState::Default) + state |= BGFX_STATE_PT_TRISTRIP; + return state; } @@ -431,7 +437,7 @@ namespace draco::rendering::rhi void apply_view(ViewID view, const ViewDesc& desc) { - if (desc.fb != InvalidFramebuffer) + if (desc.fb != InvalidFramebuffer) { auto* fb = get_checked(g_framebuffers, desc.fb, "Framebuffer"); diff --git a/engine/native/thirdparty/CMakeLists.txt b/engine/native/thirdparty/CMakeLists.txt index d0a506c..a206716 100644 --- a/engine/native/thirdparty/CMakeLists.txt +++ b/engine/native/thirdparty/CMakeLists.txt @@ -23,10 +23,10 @@ set(SDL_WAYLAND ON CACHE BOOL "" FORCE) set(SDL_LIBDECOR OFF CACHE BOOL "" FORCE) set(SDL_X11 ON CACHE BOOL "" FORCE) set(SDL_X11_XSCRNSAVER OFF CACHE BOOL "" FORCE) -set(SDL_WAYLAND_SHARED OFF) -set(SDL_X11_SHARED OFF) -set(SDL_ALSA_SHARED OFF) -set(SDL_PULSEAUDIO_SHARED OFF) +set(SDL_WAYLAND_SHARED OFF CACHE BOOL "" FORCE) +set(SDL_X11_SHARED OFF CACHE BOOL "" FORCE) +set(SDL_ALSA_SHARED OFF CACHE BOOL "" FORCE) +set(SDL_PULSEAUDIO_SHARED OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdl sdl-build) From b448c469396a0d0f7c54e2fa92a00fc124b39b22 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Fri, 8 May 2026 09:12:50 +0500 Subject: [PATCH 14/41] Add mesh abstraction + compilation of shaders when building --- CMakeLists.txt | 110 ++++- engine/native/main/main.cpp | 89 ++-- engine/native/rendering/CMakeLists.txt | 16 + engine/native/rendering/mesh/mesh.cpp | 416 ++++++++++++++++++ engine/native/rendering/mesh/mesh.cppm | 69 +++ engine/native/rendering/rhi/rhi.cppm | 5 +- engine/native/rendering/rhi/rhi_bgfx.cpp | 69 ++- engine/native/rendering/rhi/vertex.cppm | 2 +- engine/native/rendering/shaders/fs.sc | 19 +- .../native/rendering/shaders/fs_triangle.bin | Bin 1148 -> 0 bytes .../native/rendering/shaders/varying.def.sc | 6 +- engine/native/rendering/shaders/vs.sc | 13 +- .../native/rendering/shaders/vs_triangle.bin | Bin 1457 -> 0 bytes 13 files changed, 748 insertions(+), 66 deletions(-) create mode 100644 engine/native/rendering/mesh/mesh.cpp create mode 100644 engine/native/rendering/mesh/mesh.cppm delete mode 100644 engine/native/rendering/shaders/fs_triangle.bin delete mode 100644 engine/native/rendering/shaders/vs_triangle.bin diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b531ac..b6486bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,7 @@ target_link_libraries(draconic rhi renderer rendergraph + mesh bgfx bx bimg @@ -78,12 +79,109 @@ else() target_link_libraries(draconic PRIVATE SDL3::SDL3-static) endif() -# Asset sync -set(ENGINE_SHADER_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") +set(SHADER_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") + +set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src") + +if(WIN32) + + set(SHADERC + "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build/win64_vs2022/bin/shadercRelease.exe" + ) + + set(SHADER_PLATFORM windows) + set(SHADER_PROFILE spirv) + +elseif(APPLE) + + set(SHADERC + "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build/osx-arm64_clang/bin/shadercRelease" + ) + + set(SHADER_PLATFORM osx) + set(SHADER_PROFILE metal) + +elseif(UNIX) + + set(SHADERC + "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build/linux64_gcc/bin/shadercRelease" + ) + + set(SHADER_PLATFORM linux) + set(SHADER_PROFILE spirv) + +endif() + +# Shader source files +set(VERTEX_SHADER "${SHADER_DIR}/vs.sc") +set(FRAGMENT_SHADER "${SHADER_DIR}/fs.sc") +set(VARYING_DEF "${SHADER_DIR}/varying.def.sc") + +# Output binaries +set(VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs.bin") +set(FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs.bin") + +# Compile vertex shader +add_custom_command( + OUTPUT ${VERTEX_OUTPUT} + + COMMAND ${SHADERC} + -f ${VERTEX_SHADER} + -o ${VERTEX_OUTPUT} + --type vertex + --platform ${SHADER_PLATFORM} + -p ${SHADER_PROFILE} + --varyingdef ${VARYING_DEF} + -i ${BGFX_INCLUDE} + + DEPENDS + ${VERTEX_SHADER} + ${VARYING_DEF} + + COMMENT "Compiling vertex shader..." +) + +# Compile fragment shader +add_custom_command( + OUTPUT ${FRAGMENT_OUTPUT} + + COMMAND ${SHADERC} + -f ${FRAGMENT_SHADER} + -o ${FRAGMENT_OUTPUT} + --type fragment + --platform ${SHADER_PLATFORM} + -p ${SHADER_PROFILE} + --varyingdef ${VARYING_DEF} + -i ${BGFX_INCLUDE} + + DEPENDS + ${FRAGMENT_SHADER} + ${VARYING_DEF} + + COMMENT "Compiling fragment shader..." +) + +# Shader target +add_custom_target(shaders ALL + DEPENDS + ${VERTEX_OUTPUT} + ${FRAGMENT_OUTPUT} +) + +# Make executable depend on shaders +add_dependencies(draconic shaders) + +# Copy shader binaries to executable dir add_custom_command( TARGET draconic POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - "${ENGINE_SHADER_DIR}" - "$" - COMMENT "Syncing shaders to build directory..." + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${VERTEX_OUTPUT} + $ + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${FRAGMENT_OUTPUT} + $ + + COMMENT "Copying compiled shaders..." ) \ No newline at end of file diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 12df991..44ff30d 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -15,6 +15,7 @@ import scene.camera.controller; import rendering.rhi; import rendering.rhi.vertex; import rendering.renderer; +import rendering.mesh; int main(int argc, char* argv[]) { @@ -56,17 +57,11 @@ int main(int argc, char* argv[]) draco::rendering::renderer::init(1280, 720); - draco::rendering::rhi::TexturedVertex quad[] = { - { -0.5f, 0.5f, 0.0f, 0xffffffff, 0.0f, 0.0f }, - { 0.5f, 0.5f, 0.0f, 0xffffffff, 1.0f, 0.0f }, - { 0.5f, -0.5f, 0.0f, 0xffffffff, 1.0f, 1.0f }, - { -0.5f, -0.5f, 0.0f, 0xffffffff, 0.0f, 1.0f } - }; - - uint16_t indices[] = { 0,1,2, 2,3,0 }; - - auto vbh = draco::rendering::rhi::create_vertex_buffer(quad, sizeof(quad)); - auto ibh = draco::rendering::rhi::create_index_buffer(indices, sizeof(indices)); + auto cube_mesh = draco::rendering::mesh::create_cube(); + auto plane_mesh = draco::rendering::mesh::create_plane(5.0f); + auto sphere_mesh = draco::rendering::mesh::create_sphere(24, 16); + auto cylinder_mesh = draco::rendering::mesh::create_cylinder(24, 2.0f); + auto capsule_mesh = draco::rendering::mesh::create_capsule(24, 12, 2.0f); auto img = draco::core::io::image_loader::load_image("test.png"); @@ -77,8 +72,8 @@ int main(int argc, char* argv[]) auto s_texColor = draco::rendering::rhi::create_uniform("s_texColor", draco::rendering::rhi::UniformType::Sampler); - auto vs = draco::core::io::filesystem::load_binary("vs_triangle.bin"); - auto fs = draco::core::io::filesystem::load_binary("fs_triangle.bin"); + auto vs = draco::core::io::filesystem::load_binary("vs.bin"); + auto fs = draco::core::io::filesystem::load_binary("fs.bin"); if (vs.empty() || fs.empty()) { std::println("Shader load failed"); @@ -96,7 +91,12 @@ int main(int argc, char* argv[]) fsh, draco::rendering::rhi::PipelineState::WriteRGB | draco::rendering::rhi::PipelineState::WriteAlpha | - draco::rendering::rhi::PipelineState::MSAA + draco::rendering::rhi::PipelineState::MSAA, + + draco::rendering::rhi::BlendMode::None, + draco::rendering::rhi::DepthTest::Less, + draco::rendering::rhi::CullMode::CCW, + true }); draco::scene::CameraController camera; @@ -157,33 +157,62 @@ int main(int argc, char* argv[]) auto cam = camera.get_camera(); draco::rendering::renderer::begin_frame(cam); + + struct TestMesh + { + draco::rendering::mesh::MeshHandle handle; + float x, y, z; + }; - draco::rendering::rhi::RenderPacket pkt; - pkt.vertex_buffer = vbh; - pkt.index_buffer = ibh; - pkt.pipeline = pipeline; - pkt.texture_handle = tex; - pkt.texture_unit = 0; - pkt.sampler_uniform = s_texColor; + TestMesh tests[] = + { + { cube_mesh, -12.0f, 0.0f, 0.0f }, + { plane_mesh, -6.0f, 0.0f, 0.0f }, + { sphere_mesh, 0.0f, 0.0f, 0.0f }, + { cylinder_mesh, 6.0f, 0.0f, 0.0f }, + { capsule_mesh, 12.0f, 0.0f, 0.0f }, + }; + + for (auto& t : tests) + { + const auto* mesh = draco::rendering::mesh::get(t.handle); + if (!mesh) continue; - pkt.uniforms.push_back({ u_tint, tint, 1 }); - pkt.uniforms.push_back({ u_offset, offset, 1 }); + draco::rendering::rhi::RenderPacket p{}; - for (int i = 0; i < 10; i++) - { - auto p = pkt; + p.vertex_buffer = mesh->vbh; + p.index_buffer = mesh->ibh; - float model[16]; - bx::mtxTranslate(model, i * 1.5f - 7.5f, 0.0f, 0.0f); + p.pipeline = pipeline; + p.texture_handle = tex; + p.texture_unit = 0; + p.sampler_uniform = s_texColor; + p.uniforms.push_back({ u_tint, tint, 1 }); + p.uniforms.push_back({ u_offset, offset, 1 }); + + float translate[16]; + bx::mtxTranslate(translate, t.x, t.y, t.z); + + float rotate[16]; + if (t.handle == plane_mesh) { + // Rotate the plane -90 degrees on the X-axis so it lays flat + bx::mtxRotateX(rotate, -bx::kPiHalf); + } else { + // Everything else stays upright + bx::mtxIdentity(rotate); + } + + float model[16]; + bx::mtxMul(model, rotate, translate); + std::memcpy(p.model, model, sizeof(model)); draco::rendering::renderer::submit_entity(p, 0); } - + draco::rendering::renderer::end_frame(); } - draco::rendering::rhi::shutdown(); SDL_DestroyWindow(window); SDL_Quit(); diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index cdb8219..1e79518 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -50,4 +50,20 @@ target_link_libraries(renderer rendergraph bgfx bx +) + +add_modules_library(mesh) + +target_sources(mesh + PUBLIC + FILE_SET CXX_MODULES FILES + mesh/mesh.cppm + PRIVATE + mesh/mesh.cpp +) + +target_link_libraries(mesh + PUBLIC + memory + rhi ) \ No newline at end of file diff --git a/engine/native/rendering/mesh/mesh.cpp b/engine/native/rendering/mesh/mesh.cpp new file mode 100644 index 0000000..b633310 --- /dev/null +++ b/engine/native/rendering/mesh/mesh.cpp @@ -0,0 +1,416 @@ +module; + +#include +#include +#include +#include +#include + +module rendering.mesh; + +import core.memory; +import rendering.rhi; +import rendering.rhi.vertex; + +namespace draco::rendering::mesh +{ + using namespace draco::rendering; + + static std::unordered_map g_mesh_cache; + static draco::core::memory::HandleRegistry g_meshes; + static rhi::LayoutHandle g_mesh_layout = rhi::InvalidLayout; + + static size_t hash_combine(size_t a, size_t b) + { + return a ^ (b + 0x9e3779b9 + (a << 6) + (a >> 2)); + } + + static size_t hash_mesh_params(int a, int b = 0, float c = 0.0f) + { + size_t h1 = std::hash{}(a); + size_t h2 = std::hash{}(b); + size_t h3 = std::hash{}(c); + + return hash_combine(hash_combine(h1, h2), h3); + } + + MeshHandle create( + const void* vertex_data, + uint32_t vertex_size, + uint32_t vertex_count, + const std::vector& indices, + rhi::LayoutHandle layout + ) + { + Mesh mesh{}; + + mesh.vbh = rhi::create_vertex_buffer(vertex_data, vertex_size, layout); + + mesh.ibh = rhi::create_index_buffer( + indices.data(), + static_cast(indices.size() * sizeof(uint32_t)) + ); + + mesh.layout = layout; + mesh.vertex_count = vertex_count; + mesh.index_count = static_cast(indices.size()); + mesh.valid = true; + + return g_meshes.create(mesh); + } + + MeshHandle create_cube() + { + size_t key = 1; + + if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) + return it->second; + + if (g_mesh_layout == rhi::InvalidLayout) + { + rhi::VertexLayoutDesc desc; + desc.elements = + { + { rhi::Attrib::Position, 3, rhi::AttribType::Float }, + { rhi::Attrib::Normal, 3, rhi::AttribType::Float }, + { rhi::Attrib::TexCoord0,2, rhi::AttribType::Float } + }; + + g_mesh_layout = rhi::create_vertex_layout(desc); + } + + auto v = gen::cube_vertices(); + auto i = gen::cube_indices(); + + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + + g_mesh_cache[key] = h; + return h; + } + + MeshHandle create_plane(float size) + { + size_t key = hash_mesh_params(1000, 0, size); + + if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) + return it->second; + + auto v = gen::plane_vertices(size); + auto i = gen::plane_indices(); + + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + + g_mesh_cache[key] = h; + return h; + } + + MeshHandle create_sphere(int segments, int rings) + { + size_t key = hash_combine(std::hash{}(segments), std::hash{}(rings)); + + if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) + return it->second; + + auto v = gen::sphere_vertices(segments, rings); + auto i = gen::sphere_indices(segments, rings); + + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + + g_mesh_cache[key] = h; + return h; + } + + MeshHandle create_cylinder(int segments, float height) + { + size_t key = hash_mesh_params(2000, segments, height); + + if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) + return it->second; + + auto v = gen::cylinder_vertices(segments, height); + auto i = gen::cylinder_indices(segments); + + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + + g_mesh_cache[key] = h; + return h; + } + + MeshHandle create_capsule(int segments, int rings, float height) + { + size_t key = hash_combine(hash_combine(std::hash{}(segments), std::hash{}(rings)), std::hash{}(height)); + + if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) + return it->second; + + auto v = gen::capsule_vertices(segments, rings, height); + auto i = gen::capsule_indices(segments, rings); + + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + + g_mesh_cache[key] = h; + return h; + } + + void destroy(MeshHandle handle) + { + auto* mesh = g_meshes.get(handle); + if (!mesh) return; + + rhi::destroy_buffer(mesh->vbh); + rhi::destroy_buffer(mesh->ibh); + + // Remove from cache + for (auto it = g_mesh_cache.begin(); it != g_mesh_cache.end(); ) + { + if (it->second == handle) + it = g_mesh_cache.erase(it); + else + ++it; + } + + g_meshes.destroy(handle); + } + + const Mesh* get(MeshHandle handle) + { + return g_meshes.get(handle); + } +} + +namespace draco::rendering::mesh::gen +{ + constexpr float PI = 3.1415926535f; + + Vertex make(float px, float py, float pz, + float nx, float ny, float nz, + float u, float v) + { + return { px, py, pz, nx, ny, nz, u, v }; + } + + std::vector cube_vertices() + { + return { + make(-1,-1, 1, 0,0,1, 0,0), + make( 1,-1, 1, 0,0,1, 1,0), + make( 1, 1, 1, 0,0,1, 1,1), + make(-1, 1, 1, 0,0,1, 0,1), + + make( 1,-1,-1, 0,0,-1, 0,0), + make(-1,-1,-1, 0,0,-1, 1,0), + make(-1, 1,-1, 0,0,-1, 1,1), + make( 1, 1,-1, 0,0,-1, 0,1), + + make(-1,-1,-1,-1,0,0, 0,0), + make(-1,-1, 1,-1,0,0, 1,0), + make(-1, 1, 1,-1,0,0, 1,1), + make(-1, 1,-1,-1,0,0, 0,1), + + make( 1,-1, 1, 1,0,0, 0,0), + make( 1,-1,-1, 1,0,0, 1,0), + make( 1, 1,-1, 1,0,0, 1,1), + make( 1, 1, 1, 1,0,0, 0,1), + + make(-1, 1, 1, 0,1,0, 0,0), + make( 1, 1, 1, 0,1,0, 1,0), + make( 1, 1,-1, 0,1,0, 1,1), + make(-1, 1,-1, 0,1,0, 0,1), + + make(-1,-1,-1, 0,-1,0, 0,0), + make( 1,-1,-1, 0,-1,0, 1,0), + make( 1,-1, 1, 0,-1,0, 1,1), + make(-1,-1, 1, 0,-1,0, 0,1), + }; + } + + std::vector cube_indices() + { + return { + 0,1,2, 2,3,0, + 4,5,6, 6,7,4, + 8,9,10, 10,11,8, + 12,13,14, 14,15,12, + 16,17,18, 18,19,16, + 20,21,22, 22,23,20 + }; + } + + std::vector plane_vertices(float size) + { + float s = size * 0.5f; + + return { + make(-s,0,-s, 0,1,0, 0,0), + make( s,0,-s, 0,1,0, 1,0), + make( s,0, s, 0,1,0, 1,1), + make(-s,0, s, 0,1,0, 0,1), + }; + } + + std::vector plane_indices() + { + return { 0,1,2, 2,3,0 }; + } + + std::vector sphere_vertices(int segments, int rings) + { + std::vector v; + + for (int y = 0; y <= rings; y++) + { + float v01 = (float)y / rings; + float theta = v01 * PI; + + for (int x = 0; x <= segments; x++) + { + float u01 = (float)x / segments; + float phi = u01 * 2.0f * PI; + + float px = sinf(theta) * cosf(phi); + float py = cosf(theta); + float pz = sinf(theta) * sinf(phi); + + v.push_back(make(px,py,pz, px,py,pz, u01,v01)); + } + } + + return v; + } + + std::vector sphere_indices(int segments, int rings) + { + std::vector i; + + for (int y = 0; y < rings; y++) + { + for (int x = 0; x < segments; x++) + { + int a = y * (segments + 1) + x; + int b = a + segments + 1; + + i.push_back(a); + i.push_back(b); + i.push_back(a + 1); + + i.push_back(b); + i.push_back(b + 1); + i.push_back(a + 1); + } + } + + return i; + } + + std::vector cylinder_vertices(int segments, float height) + { + std::vector v; + float half = height * 0.5f; + + // Side walls (Outward normals) + for (int y = 0; y <= 1; y++) { + float py = (y ? half : -half); + for (int x = 0; x <= segments; x++) { + float t = (float)x / segments; + float a = t * 2.0f * PI; + float cx = cosf(a); + float cz = sinf(a); + // Normal is strictly horizontal for side walls + v.push_back(make(cx, py, cz, cx, 0, cz, t, (float)y)); + } + } + + // Top cap (Upward normals) + // Center vertex + v.push_back(make(0, half, 0, 0, 1, 0, 0.5f, 0.5f)); + for (int x = 0; x <= segments; x++) { + float t = (float)x / segments; + float a = t * 2.0f * PI; + v.push_back(make(cosf(a), half, sinf(a), 0, 1, 0, (cosf(a)+1)*0.5f, (sinf(a)+1)*0.5f)); + } + + // Bottom cap (Downward Normals) + // Center vertex + v.push_back(make(0, -half, 0, 0, -1, 0, 0.5f, 0.5f)); + for (int x = 0; x <= segments; x++) { + float t = (float)x / segments; + float a = t * 2.0f * PI; + v.push_back(make(cosf(a), -half, sinf(a), 0, -1, 0, (cosf(a)+1)*0.5f, (sinf(a)+1)*0.5f)); + } + + return v; + } + + std::vector cylinder_indices(int segments) + { + std::vector i; + int side_start = 0; + int top_start = (segments + 1) * 2; + int bottom_start = top_start + (segments + 2); + + // Sides + for (int s = 0; s < segments; s++) { + int b0 = s; int b1 = s + 1; + int t0 = b0 + segments + 1; int t1 = b1 + segments + 1; + i.push_back(b0); i.push_back(t0); i.push_back(t1); + i.push_back(b0); i.push_back(t1); i.push_back(b1); + } + + // Top Cap (Triangle Fan style) + for (int s = 0; s < segments; s++) { + i.push_back(top_start); // Center + i.push_back(top_start + s + 2); + i.push_back(top_start + s + 1); + } + + // Bottom Cap + for (int s = 0; s < segments; s++) { + i.push_back(bottom_start); // Center + i.push_back(bottom_start + s + 1); + i.push_back(bottom_start + s + 2); + } + return i; + } + + std::vector capsule_vertices(int segments, int rings, float height) + { + std::vector v; + float half = height * 0.5f; + + // One continuous loop from bottom pole to top pole + // Total rings for a capsule = rings (bottom cap) + rings (top cap) + for (int r = 0; r <= rings; r++) { + float v_uv = (float)r / rings; + float theta = v_uv * PI; // 0 to PI + + // Adjust Y for the cylinder section + float y_offset = (theta < PI * 0.5f) ? half : -half; + + for (int s = 0; s <= segments; s++) { + float u_uv = (float)s / segments; + float phi = u_uv * 2.0f * PI; + + float nx = sinf(theta) * cosf(phi); + float ny = cosf(theta); + float nz = sinf(theta) * sinf(phi); + + v.push_back(make(nx, ny + y_offset, nz, nx, ny, nz, u_uv, v_uv)); + } + } + return v; + } + + std::vector capsule_indices(int segments, int rings) + { + std::vector i; + for (int r = 0; r < rings; r++) { + for (int s = 0; s < segments; s++) { + int a = r * (segments + 1) + s; + int b = a + segments + 1; + i.push_back(a); i.push_back(b); i.push_back(a + 1); + i.push_back(b); i.push_back(b + 1); i.push_back(a + 1); + } + } + return i; + } +} diff --git a/engine/native/rendering/mesh/mesh.cppm b/engine/native/rendering/mesh/mesh.cppm new file mode 100644 index 0000000..86f82a7 --- /dev/null +++ b/engine/native/rendering/mesh/mesh.cppm @@ -0,0 +1,69 @@ +module; + +#include +#include + +export module rendering.mesh; + +import core.memory; +import rendering.rhi; + +export namespace draco::rendering::mesh +{ + using MeshHandle = draco::core::memory::Handle; + + struct Vertex + { + float px, py, pz; + float nx, ny, nz; + float u, v; + }; + + struct Mesh + { + draco::rendering::rhi::BufferHandle vbh; + draco::rendering::rhi::BufferHandle ibh; + + draco::rendering::rhi::LayoutHandle layout; + + uint32_t vertex_count = 0; + uint32_t index_count = 0; + + bool valid = false; + }; + + MeshHandle create( + const void* vertex_data, + uint32_t vertex_size, + uint32_t vertex_count, + const std::vector& indices, + draco::rendering::rhi::LayoutHandle layout + ); + + MeshHandle create_cube(); + MeshHandle create_plane(float size); + MeshHandle create_sphere(int segments, int rings); + MeshHandle create_cylinder(int segments, float height); + MeshHandle create_capsule(int segments, int rings, float height); + + void destroy(MeshHandle mesh); + const Mesh* get(MeshHandle mesh); +} + +export namespace draco::rendering::mesh::gen +{ + std::vector cube_vertices(); + std::vector cube_indices(); + + std::vector plane_vertices(float size); + std::vector plane_indices(); + + std::vector sphere_vertices(int segments, int rings); + std::vector sphere_indices(int segments, int rings); + + std::vector cylinder_vertices(int segments, float height); + std::vector cylinder_indices(int segments); + + std::vector capsule_vertices(int segments, int rings, float height); + std::vector capsule_indices(int segments, int rings); +} diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 8a42c62..dcd03ad 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -190,8 +190,9 @@ export namespace draco::rendering::rhi PipelineHandle create_pipeline(const PipelineDesc&); - BufferHandle create_vertex_buffer(const void* data, uint32_t size); + BufferHandle create_vertex_buffer(const void* data, uint32_t size, LayoutHandle layout_h); BufferHandle create_index_buffer(const void* data, uint32_t size); + void destroy_buffer(BufferHandle handle); UniformHandle create_uniform(const char* name, UniformType type, uint16_t num = 1); void destroy_uniform(UniformHandle handle); @@ -235,6 +236,8 @@ export namespace draco::rendering::rhi uint64_t map_state(PipelineState s, BlendMode, DepthTest, CullMode, bool depth_write); bgfx::UniformType::Enum map_uniform_type(UniformType t); + bgfx::Attrib::Enum map_attrib(Attrib a); + bgfx::AttribType::Enum map_attrib_type(AttribType t); void submit(const RenderPacket&, ViewID); diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 112ebdd..1bbca2c 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -186,21 +186,21 @@ namespace draco::rendering::rhi return g_pipelines.create({ prog, state }); } - BufferHandle create_vertex_buffer(const void* data, uint32_t size) + BufferHandle create_vertex_buffer(const void* data, uint32_t size, LayoutHandle layout_h) { RHI_ASSERT(data != nullptr, "Vertex buffer data is null"); RHI_ASSERT(size > 0, "Vertex buffer size is zero"); - bgfx::VertexLayout layout; - layout.begin() - .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) - .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) - .add(bgfx::Attrib::TexCoord0,2, bgfx::AttribType::Float) - .end(); + auto* layout = get_checked(g_layouts, layout_h, "Layout"); + + RHI_ASSERT(layout, "Invalid vertex layout"); + + auto vbh = bgfx::createVertexBuffer(bgfx::copy(data, size), layout->layout); - auto vbh = bgfx::createVertexBuffer(bgfx::copy(data, size), layout); + Buffer buf; + buf.vbh = vbh; - return g_buffers.create({ vbh, BGFX_INVALID_HANDLE, false }); + return g_buffers.create(buf); } BufferHandle create_index_buffer(const void* data, uint32_t size) @@ -208,7 +208,7 @@ namespace draco::rendering::rhi RHI_ASSERT(data != nullptr, "Index buffer data is null"); RHI_ASSERT(size > 0, "Index buffer size is zero"); - bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer(bgfx::copy(data, size)); + bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer(bgfx::copy(data, size), BGFX_BUFFER_INDEX32); Buffer buf; // Idk why I named it this, it just sounds funny ;) buf.ibh = ibh; @@ -231,6 +231,25 @@ namespace draco::rendering::rhi return g_buffers.create(buf); } + void destroy_buffer(BufferHandle h) + { + auto* buf = get_checked(g_buffers, h, "Buffer"); + + if (!buf) + return; + + if (bgfx::isValid(buf->vbh)) + destroy_later(buf->vbh); + + if (bgfx::isValid(buf->ibh)) + destroy_later(buf->ibh); + + if (bgfx::isValid(buf->dvbh)) + destroy_later(buf->dvbh); + + g_buffers.destroy(h); + } + LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc) { bgfx::VertexLayout layout; @@ -238,7 +257,7 @@ namespace draco::rendering::rhi for (const auto& e : desc.elements) { - layout.add((bgfx::Attrib::Enum)e.attrib, e.count, (bgfx::AttribType::Enum)e.type, e.normalized); + layout.add(map_attrib(e.attrib), e.count, map_attrib_type(e.type), e.normalized); } layout.end(); @@ -435,6 +454,34 @@ namespace draco::rendering::rhi return bgfx::UniformType::Vec4; } + bgfx::Attrib::Enum map_attrib(Attrib a) + { + switch (a) + { + case Attrib::Position: return bgfx::Attrib::Position; + case Attrib::Color0: return bgfx::Attrib::Color0; + case Attrib::TexCoord0: return bgfx::Attrib::TexCoord0; + case Attrib::Normal: return bgfx::Attrib::Normal; + case Attrib::Tangent: return bgfx::Attrib::Tangent; + } + + return bgfx::Attrib::Position; + } + + bgfx::AttribType::Enum map_attrib_type(AttribType t) + { + switch (t) + { + case AttribType::Float: + return bgfx::AttribType::Float; + + case AttribType::Uint8: + return bgfx::AttribType::Uint8; + } + + return bgfx::AttribType::Float; + } + void apply_view(ViewID view, const ViewDesc& desc) { if (desc.fb != InvalidFramebuffer) diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/native/rendering/rhi/vertex.cppm index 79211a8..d11b18e 100644 --- a/engine/native/rendering/rhi/vertex.cppm +++ b/engine/native/rendering/rhi/vertex.cppm @@ -46,4 +46,4 @@ export namespace draco::rendering::rhi { } }; } -} \ No newline at end of file +} diff --git a/engine/native/rendering/shaders/fs.sc b/engine/native/rendering/shaders/fs.sc index 7e9354c..c707ade 100644 --- a/engine/native/rendering/shaders/fs.sc +++ b/engine/native/rendering/shaders/fs.sc @@ -1,11 +1,18 @@ -$input v_color0, v_texcoord0 -#include +$input v_normal, v_texcoord0 + +#include + +SAMPLER2D(s_texColor, 0); -SAMPLER2D(s_texColor, 0); uniform vec4 u_tint; -void main() { - // Sample the texture and multiply by vertex color and the tint +void main() +{ + vec3 lightDir = normalize(vec3(0.4, 1.0, 0.2)); + + float NdotL = max(dot(normalize(v_normal), lightDir), 0.2); + vec4 texColor = texture2D(s_texColor, v_texcoord0); - gl_FragColor = texColor * v_color0 * u_tint; + + gl_FragColor = texColor * u_tint * NdotL; } \ No newline at end of file diff --git a/engine/native/rendering/shaders/fs_triangle.bin b/engine/native/rendering/shaders/fs_triangle.bin deleted file mode 100644 index 7eba2267cd0424562c01e9616e346f352f2518a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1148 zcmY+CT}vB57=_2IyH!J5t7xeOiS?tDLI|QFl$L6XTFp&KwY4{48xsjlva+s{dnxqe zzUa^MFNhc36ndV?Ok-btnK|eEoU_@eY~=^et}cx%XQGp8*6d_s1IFlIHga6e>fJX< zD@jX=%W@0m^`J39ZuSmIc{5}#;AIb#L0R5J_S`I2%EjaCpt!VLB7V;V95!}eb!ub1 z9XC7hyYhW`Lq4ip;u@k`U_zbOY95M(_cft1W`+BER^s+itDcG@w(wu`+7 zY;>y|X?*xL&SI&ssqNW!Mm{F@_=)Zqn4O8Ex5xc>VD}@or764tqbEi_yHYQ?{^5T8 zpxu93F^qh62m5^V_wjLU!K@kk6?!{OiHXEbisSnfj4=m4hYo}7Ka?C@F6{5^F+gWqy$=<`t=HRp18a=$t5yW{D%CJr5b g$k7H}{k)%!_jSL7sfB-~7w|T?KT=@TsxWH)0(n1Or2qf` diff --git a/engine/native/rendering/shaders/varying.def.sc b/engine/native/rendering/shaders/varying.def.sc index 9b0f7b1..4e4a36e 100644 --- a/engine/native/rendering/shaders/varying.def.sc +++ b/engine/native/rendering/shaders/varying.def.sc @@ -1,6 +1,6 @@ -vec3 a_position : POSITION; -vec4 a_color0 : COLOR0; +vec3 a_position : POSITION; +vec3 a_normal : NORMAL; vec2 a_texcoord0 : TEXCOORD0; -vec4 v_color0 : COLOR0; +vec3 v_normal : NORMAL; vec2 v_texcoord0 : TEXCOORD0; \ No newline at end of file diff --git a/engine/native/rendering/shaders/vs.sc b/engine/native/rendering/shaders/vs.sc index 2492cb8..f9ebb00 100644 --- a/engine/native/rendering/shaders/vs.sc +++ b/engine/native/rendering/shaders/vs.sc @@ -1,15 +1,12 @@ -$input a_position, a_color0, a_texcoord0 -$output v_color0, v_texcoord0 +$input a_position, a_normal, a_texcoord0 +$output v_normal, v_texcoord0 #include -uniform vec4 u_offset; - void main() { - vec3 pos = a_position + u_offset.xyz; - gl_Position = mul(u_modelViewProj, vec4(pos, 1.0)); - - v_color0 = a_color0; + gl_Position = mul(u_modelViewProj, vec4(a_position, 1.0)); + + v_normal = a_normal; v_texcoord0 = a_texcoord0; } \ No newline at end of file diff --git a/engine/native/rendering/shaders/vs_triangle.bin b/engine/native/rendering/shaders/vs_triangle.bin deleted file mode 100644 index 01dcedfb0234195c4d33c5770f5143d04b64550f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1457 zcmZvcU2hUW6ov=r_Cpd|V{A>-O0DsRg!Dp9{b+^WKq3h!v9}uni>?AgmZcwe8vlTQ z(Z684@W#aVncb;Pb;x1P`<{R6pc5R*xYmcAo;d0%S zoG1C$70Dvwq#sYwpGgiR4M|(lk@O@b{dA=HslY%Hmtz8*byv1`(|BZ)$>NQHW}`T zx#sGxN7FPp@7j2pb{6Suk=EXi!|p|>{MKBL|N5O=oJuZc@IRlwCmPdK?aZMlX=y^} zEN0cxNgnIc%*GXNSD5Afm Date: Fri, 8 May 2026 09:32:19 +0500 Subject: [PATCH 15/41] Add transform system --- CMakeLists.txt | 1 + engine/native/main/main.cpp | 39 ++++----- engine/native/scene/CMakeLists.txt | 18 +++- engine/native/scene/transform/transform.cpp | 86 ++++++++++++++++++++ engine/native/scene/transform/transform.cppm | 34 ++++++++ 5 files changed, 156 insertions(+), 22 deletions(-) create mode 100644 engine/native/scene/transform/transform.cpp create mode 100644 engine/native/scene/transform/transform.cppm diff --git a/CMakeLists.txt b/CMakeLists.txt index b6486bb..905bcf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,7 @@ target_link_libraries(draconic platform input camera # Camera controller + transform rhi renderer rendergraph diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 44ff30d..32ece1a 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -11,6 +11,7 @@ import core.io.image_loader; import input; import platform; import scene.camera.controller; +import scene.transform; import rendering.rhi; import rendering.rhi.vertex; @@ -161,18 +162,26 @@ int main(int argc, char* argv[]) struct TestMesh { draco::rendering::mesh::MeshHandle handle; - float x, y, z; + draco::scene::Transform transform; }; TestMesh tests[] = - { - { cube_mesh, -12.0f, 0.0f, 0.0f }, - { plane_mesh, -6.0f, 0.0f, 0.0f }, - { sphere_mesh, 0.0f, 0.0f, 0.0f }, - { cylinder_mesh, 6.0f, 0.0f, 0.0f }, - { capsule_mesh, 12.0f, 0.0f, 0.0f }, + { + { cube_mesh, draco::scene::make_transform() }, + { plane_mesh, draco::scene::make_transform() }, + { sphere_mesh, draco::scene::make_transform() }, + { cylinder_mesh, draco::scene::make_transform() }, + { capsule_mesh, draco::scene::make_transform() }, }; + draco::scene::set_position(tests[0].transform, -12.0f, 0.0f, 0.0f); + draco::scene::set_position(tests[1].transform, -6.0f, 0.0f, 0.0f); + draco::scene::set_position(tests[2].transform, 0.0f, 0.0f, 0.0f); + draco::scene::set_position(tests[3].transform, 6.0f, 0.0f, 0.0f); + draco::scene::set_position(tests[4].transform, 12.0f, 0.0f, 0.0f); + + draco::scene::set_rotation(tests[1].transform, -bx::kPiHalf, 0.0f, 0.0f); // Rotate the plane mesh + for (auto& t : tests) { const auto* mesh = draco::rendering::mesh::get(t.handle); @@ -191,21 +200,9 @@ int main(int argc, char* argv[]) p.uniforms.push_back({ u_tint, tint, 1 }); p.uniforms.push_back({ u_offset, offset, 1 }); - float translate[16]; - bx::mtxTranslate(translate, t.x, t.y, t.z); - - float rotate[16]; - if (t.handle == plane_mesh) { - // Rotate the plane -90 degrees on the X-axis so it lays flat - bx::mtxRotateX(rotate, -bx::kPiHalf); - } else { - // Everything else stays upright - bx::mtxIdentity(rotate); - } - float model[16]; - bx::mtxMul(model, rotate, translate); - + draco::scene::compute_matrix(t.transform, model); + std::memcpy(p.model, model, sizeof(model)); draco::rendering::renderer::submit_entity(p, 0); diff --git a/engine/native/scene/CMakeLists.txt b/engine/native/scene/CMakeLists.txt index 263873d..8477c38 100644 --- a/engine/native/scene/CMakeLists.txt +++ b/engine/native/scene/CMakeLists.txt @@ -14,4 +14,20 @@ target_link_libraries(camera input renderer bx -) \ No newline at end of file +) + +add_modules_library(transform) + +target_sources(transform + PUBLIC + FILE_SET CXX_MODULES FILES + transform/transform.cppm + + PRIVATE + transform/transform.cpp +) + +target_link_libraries(transform + PUBLIC + bx +) diff --git a/engine/native/scene/transform/transform.cpp b/engine/native/scene/transform/transform.cpp new file mode 100644 index 0000000..6927e2b --- /dev/null +++ b/engine/native/scene/transform/transform.cpp @@ -0,0 +1,86 @@ +module; + +#include + +#include + +module scene.transform; + +namespace draco::scene +{ + Transform make_transform() + { + Transform t; + + t.position[0] = 0.0f; + t.position[1] = 0.0f; + t.position[2] = 0.0f; + + t.rotation[0] = 0.0f; + t.rotation[1] = 0.0f; + t.rotation[2] = 0.0f; + + t.scale[0] = 1.0f; + t.scale[1] = 1.0f; + t.scale[2] = 1.0f; + + t.dirty = true; + + return t; + } + + void mark_dirty(Transform& t) + { + t.dirty = true; + } + + void set_position(Transform& t, float x, float y, float z) + { + t.position[0] = x; + t.position[1] = y; + t.position[2] = z; + t.dirty = true; + } + + void set_rotation(Transform& t, float x, float y, float z) + { + t.rotation[0] = x; + t.rotation[1] = y; + t.rotation[2] = z; + t.dirty = true; + } + + void set_scale(Transform& t, float x, float y, float z) + { + t.scale[0] = x; + t.scale[1] = y; + t.scale[2] = z; + t.dirty = true; + } + + void compute_matrix(const Transform& t, float out[16]) + { + float translation[16]; + float rx[16]; + float ry[16]; + float rz[16]; + float scale[16]; + float temp[16]; + + bx::mtxIdentity(out); + + bx::mtxScale(scale, t.scale[0], t.scale[1], t.scale[2]); + + bx::mtxRotateX(rx, t.rotation[0]); + bx::mtxRotateY(ry, t.rotation[1]); + bx::mtxRotateZ(rz, t.rotation[2]); + + bx::mtxTranslate(translation, t.position[0], t.position[1], t.position[2]); + + // scale * rotation * translation + bx::mtxMul(temp, scale, rx); + bx::mtxMul(temp, temp, ry); + bx::mtxMul(temp, temp, rz); + bx::mtxMul(out, temp, translation); + } +} \ No newline at end of file diff --git a/engine/native/scene/transform/transform.cppm b/engine/native/scene/transform/transform.cppm new file mode 100644 index 0000000..7768a6f --- /dev/null +++ b/engine/native/scene/transform/transform.cppm @@ -0,0 +1,34 @@ +module; + +#include +#include +#include + +#include + +export module scene.transform; + +export namespace draco::scene +{ + struct Transform + { + float position[3]; + float rotation[3]; // Euler (radians) + float scale[3]; + + bool dirty = true; + }; + + // Creates a default identity transform + Transform make_transform(); + + // Recompute matrix from transform (column-major, bx compatible) + void compute_matrix(const Transform& t, float out[16]); + + // Helpers + void set_position(Transform& t, float x, float y, float z); + void set_rotation(Transform& t, float x, float y, float z); + void set_scale(Transform& t, float x, float y, float z); + + void mark_dirty(Transform& t); +} \ No newline at end of file From c2c80b5106faf341fe05fc261aeb78844241e0c3 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 10 May 2026 22:15:10 +0500 Subject: [PATCH 16/41] Upgrade render pipeline architecture (material + RenderGraph refactor) - Introduce multi-pass RenderGraph foundation - Move main pass creation into renderer lifecycle - Add material uniform binding system - Add RHI uniform registry + hash lookup - Decouple scene rendering into RenderPacket pipeline - Fix renderer/RHI uniform binding mismatch - Improve frame lifecycle ownership (renderer owns passes) --- CMakeLists.txt | 7 +- engine/native/main/main.cpp | 88 ++++++------- engine/native/rendering/CMakeLists.txt | 35 +++-- .../native/rendering/material/material.cppm | 32 +++++ engine/native/rendering/renderer/renderer.cpp | 123 +++++++++++++----- .../native/rendering/renderer/renderer.cppm | 6 +- .../rendering/rendergraph/rendergraph.cpp | 38 ++++-- .../rendering/rendergraph/rendergraph.cppm | 18 +-- .../rendering/rhi/uniform_registry.cppm | 35 +++++ engine/native/scene/CMakeLists.txt | 28 ++++ .../native/scene/renderable/renderable.cppm | 17 +++ engine/native/scene/scene.cppm | 15 +++ engine/native/scene/transform/transform.cpp | 2 +- engine/native/scene/transform/transform.cppm | 2 +- 14 files changed, 334 insertions(+), 112 deletions(-) create mode 100644 engine/native/rendering/material/material.cppm create mode 100644 engine/native/rendering/rhi/uniform_registry.cppm create mode 100644 engine/native/scene/renderable/renderable.cppm create mode 100644 engine/native/scene/scene.cppm diff --git a/CMakeLists.txt b/CMakeLists.txt index 905bcf2..bdde84b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,12 +57,15 @@ target_link_libraries(draconic image_loader platform input - camera # Camera controller - transform rhi renderer rendergraph mesh + material + scene + camera # Camera controller + transform + renderable bgfx bx bimg diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 32ece1a..f032b38 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -10,13 +10,17 @@ import core.io.image_loader; import input; import platform; +import scene; import scene.camera.controller; import scene.transform; +import scene.renderable; import rendering.rhi; import rendering.rhi.vertex; +import rendering.rhi.uniform_registry; import rendering.renderer; import rendering.mesh; +import rendering.material; int main(int argc, char* argv[]) { @@ -67,6 +71,7 @@ int main(int argc, char* argv[]) auto img = draco::core::io::image_loader::load_image("test.png"); draco::rendering::rhi::TextureHandle tex = draco::rendering::rhi::InvalidTexture; + if (img.is_valid) { tex = draco::rendering::rhi::create_texture(img.pixels.data(), img.width, img.height); } @@ -106,12 +111,43 @@ int main(int argc, char* argv[]) auto u_tint = draco::rendering::rhi::create_uniform("u_tint", draco::rendering::rhi::UniformType::Vec4); auto u_offset = draco::rendering::rhi::create_uniform("u_offset", draco::rendering::rhi::UniformType::Vec4); + draco::rendering::rhi::register_uniform(draco::rendering::rhi::hash_uniform("u_tint"), u_tint); + + draco::rendering::rhi::register_uniform(draco::rendering::rhi::hash_uniform("u_offset"), u_offset); + float tint[4] = {1,1,1,1}; float offset[4] = {0,0,0,0}; bool running = true; bool mouse_captured = true; + draco::rendering::material::Material mat{}; + + mat.pipeline = pipeline; + mat.texture = tex; + mat.sampler = s_texColor; + + mat.uniforms.push_back({.name_hash = draco::rendering::rhi::hash_uniform("u_tint"), .data = tint, .count = 1}); + + mat.uniforms.push_back({.name_hash = draco::rendering::rhi::hash_uniform("u_offset"), .data = offset, .count = 1}); + + draco::scene::Scene scene; + + scene.renderables.push_back({cube_mesh, draco::scene::transform::make_transform(), mat}); + scene.renderables.push_back({plane_mesh, draco::scene::transform::make_transform(), mat}); + scene.renderables.push_back({sphere_mesh, draco::scene::transform::make_transform(), mat}); + scene.renderables.push_back({cylinder_mesh, draco::scene::transform::make_transform(), mat}); + scene.renderables.push_back({capsule_mesh, draco::scene::transform::make_transform(), mat}); + + draco::scene::transform::set_position(scene.renderables[0].transform, -12.0f, 0.0f, 0.0f); + draco::scene::transform::set_position(scene.renderables[1].transform, -6.0f, 0.0f, 0.0f); + draco::scene::transform::set_position(scene.renderables[2].transform, 0.0f, 0.0f, 0.0f); + draco::scene::transform::set_position(scene.renderables[3].transform, 6.0f, 0.0f, 0.0f); + draco::scene::transform::set_position(scene.renderables[4].transform, 12.0f, 0.0f, 0.0f); + + draco::scene::transform::set_rotation(scene.renderables[1].transform, -bx::kPiHalf, 0.0f, 0.0f); + + while (running) { // Delta time @@ -157,57 +193,9 @@ int main(int argc, char* argv[]) camera.update(dt); auto cam = camera.get_camera(); - draco::rendering::renderer::begin_frame(cam); - - struct TestMesh - { - draco::rendering::mesh::MeshHandle handle; - draco::scene::Transform transform; - }; - - TestMesh tests[] = - { - { cube_mesh, draco::scene::make_transform() }, - { plane_mesh, draco::scene::make_transform() }, - { sphere_mesh, draco::scene::make_transform() }, - { cylinder_mesh, draco::scene::make_transform() }, - { capsule_mesh, draco::scene::make_transform() }, - }; - - draco::scene::set_position(tests[0].transform, -12.0f, 0.0f, 0.0f); - draco::scene::set_position(tests[1].transform, -6.0f, 0.0f, 0.0f); - draco::scene::set_position(tests[2].transform, 0.0f, 0.0f, 0.0f); - draco::scene::set_position(tests[3].transform, 6.0f, 0.0f, 0.0f); - draco::scene::set_position(tests[4].transform, 12.0f, 0.0f, 0.0f); - - draco::scene::set_rotation(tests[1].transform, -bx::kPiHalf, 0.0f, 0.0f); // Rotate the plane mesh - - for (auto& t : tests) - { - const auto* mesh = draco::rendering::mesh::get(t.handle); - if (!mesh) continue; - - draco::rendering::rhi::RenderPacket p{}; - - p.vertex_buffer = mesh->vbh; - p.index_buffer = mesh->ibh; - - p.pipeline = pipeline; - p.texture_handle = tex; - p.texture_unit = 0; - p.sampler_uniform = s_texColor; - p.uniforms.push_back({ u_tint, tint, 1 }); - p.uniforms.push_back({ u_offset, offset, 1 }); - - float model[16]; - draco::scene::compute_matrix(t.transform, model); - - std::memcpy(p.model, model, sizeof(model)); - - draco::rendering::renderer::submit_entity(p, 0); - } - + draco::rendering::renderer::begin_frame(cam); + draco::rendering::renderer::render_scene(scene); draco::rendering::renderer::end_frame(); } draco::rendering::rhi::shutdown(); diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index 1e79518..e204c60 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -5,6 +5,7 @@ target_sources(rhi FILE_SET CXX_MODULES FILES rhi/vertex.cppm rhi/rhi.cppm + rhi/uniform_registry.cppm PRIVATE rhi/rhi_bgfx.cpp ) @@ -43,15 +44,6 @@ target_sources(renderer renderer/renderer.cpp ) -target_link_libraries(renderer - PUBLIC - core - rhi - rendergraph - bgfx - bx -) - add_modules_library(mesh) target_sources(mesh @@ -66,4 +58,29 @@ target_link_libraries(mesh PUBLIC memory rhi +) + +add_modules_library(material) + +target_sources(material + PUBLIC + FILE_SET CXX_MODULES FILES + material/material.cppm +) + +target_link_libraries(material + PUBLIC + rhi +) + +target_link_libraries(renderer + PUBLIC + core + rhi + rendergraph + mesh + scene + transform + bgfx + bx ) \ No newline at end of file diff --git a/engine/native/rendering/material/material.cppm b/engine/native/rendering/material/material.cppm new file mode 100644 index 0000000..da74d38 --- /dev/null +++ b/engine/native/rendering/material/material.cppm @@ -0,0 +1,32 @@ +module; + +#include +#include + +export module rendering.material; + +import rendering.rhi; + +export namespace draco::rendering::material +{ + struct Uniform + { + uint32_t name_hash = 0; + const void* data = nullptr; + uint16_t count = 1; + }; + + struct Material + { + uint32_t shader_id = 0; + + rhi::PipelineHandle pipeline = rhi::InvalidPipeline; + + rhi::TextureHandle texture = rhi::InvalidTexture; + rhi::UniformHandle sampler = rhi::InvalidUniform; + + uint8_t texture_unit = 0; + + std::vector uniforms; + }; +} \ No newline at end of file diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp index abdc3c8..7a24ea0 100644 --- a/engine/native/rendering/renderer/renderer.cpp +++ b/engine/native/rendering/renderer/renderer.cpp @@ -12,65 +12,128 @@ module; #include #include +module rendering.renderer; + import rendering.rhi; +import rendering.rhi.uniform_registry; import rendering.rendergraph; +import rendering.mesh; +import rendering.material; -module rendering.renderer; +import scene; +import scene.transform; namespace draco::rendering::renderer { - void init(uint16_t width, uint16_t height) { + static constexpr const char* MAIN_PASS = "MainPass"; + + void init(uint16_t width, uint16_t height) + { g_ctx.screen_width = width; g_ctx.screen_height = height; } - void resize(uint16_t width, uint16_t height) { + void resize(uint16_t width, uint16_t height) + { g_ctx.screen_width = width; g_ctx.screen_height = height; } - void begin_frame(const Camera& cam) { - draco::rendering::rhi::begin_frame(); + void begin_frame(const Camera& cam) + { + rhi::begin_frame(); g_ctx.main_camera = cam; - g_ctx.graph.reset(); - } - - void submit_entity(draco::rendering::rhi::RenderPacket& packet, uint16_t view) - { - auto& main_pass = g_ctx.graph.add_pass(); - main_pass.name = "MainPass"; - main_pass.view = view; - main_pass.framebuffer = draco::rendering::rhi::InvalidFramebuffer; + // Create main pass once per frame + auto& pass = g_ctx.graph.add_pass(MAIN_PASS); + + pass.view = 0; + pass.framebuffer = rhi::InvalidFramebuffer; - main_pass.width = g_ctx.screen_width; - main_pass.height = g_ctx.screen_height; + pass.width = g_ctx.screen_width; + pass.height = g_ctx.screen_height; - main_pass.clear_flags = BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH; - main_pass.clear_color = 0x303030ff; + pass.clear_flags = BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH; + pass.clear_color = 0x303030ff; - // Build camera every frame float view_mtx[16]; float proj_mtx[16]; - draco::rendering::rhi::look_at(view_mtx, g_ctx.main_camera.position.data(), g_ctx.main_camera.target.data(), g_ctx.main_camera.up.data()); + rhi::look_at(view_mtx, cam.position.data(), cam.target.data(), cam.up.data()); + + float aspect = float(g_ctx.screen_width) / float(std::max(g_ctx.screen_height, 1)); + + rhi::perspective(proj_mtx, cam.fov, aspect, cam.near_plane, cam.far_plane); + + std::memcpy(pass.view_mtx, view_mtx, sizeof(view_mtx)); + std::memcpy(pass.proj_mtx, proj_mtx, sizeof(proj_mtx)); + } + + static void build_uniforms(const material::Material& mat, std::vector& out) + { + out.clear(); + out.reserve(mat.uniforms.size()); + + for (const auto& u : mat.uniforms) + { + rhi::UniformBind bind{}; - const auto safe_height = std::max(g_ctx.screen_height, 1); - float aspect = float(g_ctx.screen_width) / float(safe_height); + bind.handle = rhi::get_uniform(u.name_hash); - draco::rendering::rhi::perspective(proj_mtx, g_ctx.main_camera.fov, aspect, g_ctx.main_camera.near_plane, g_ctx.main_camera.far_plane); + bind.data = u.data; + bind.num = u.count; - std::memcpy(main_pass.view_mtx, view_mtx, sizeof(view_mtx)); - std::memcpy(main_pass.proj_mtx, proj_mtx, sizeof(proj_mtx)); + if (bind.handle == rhi::InvalidUniform) + { + std::println("[Renderer] Missing uniform hash: {}", u.name_hash); + continue; + } - main_pass.packets.push_back(packet); + out.push_back(bind); + } } - void end_frame() { - g_ctx.graph.execute(); + void submit_entity(const rhi::RenderPacket& packet) + { + auto* pass = g_ctx.graph.get_pass(MAIN_PASS); + if (!pass) return; + + pass->packets.push_back(packet); + } + + void render_scene(const draco::scene::Scene& scene) + { + for (auto& t : scene.renderables) + { + const auto* mesh = mesh::get(t.mesh); + if (!mesh) continue; + + rhi::RenderPacket p{}; + + p.vertex_buffer = mesh->vbh; + p.index_buffer = mesh->ibh; - draco::rendering::rhi::end_frame(); + p.pipeline = t.material.pipeline; + p.texture_handle = t.material.texture; + p.texture_unit = t.material.texture_unit; + p.sampler_uniform = t.material.sampler; + + build_uniforms(t.material, p.uniforms); + + float model[16]; + draco::scene::transform::compute_matrix(t.transform, model); + + std::memcpy(p.model, model, sizeof(model)); + + submit_entity(p); + } + } + + void end_frame() + { + g_ctx.graph.execute(); + rhi::end_frame(); } -} \ No newline at end of file +} diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/native/rendering/renderer/renderer.cppm index b843a27..a9d59a1 100644 --- a/engine/native/rendering/renderer/renderer.cppm +++ b/engine/native/rendering/renderer/renderer.cppm @@ -15,6 +15,8 @@ export module rendering.renderer; import rendering.rhi; import rendering.rendergraph; +import scene; + export namespace draco::rendering::renderer { struct Camera { @@ -38,10 +40,12 @@ export namespace draco::rendering::renderer { void init(uint16_t width, uint16_t height); void resize(uint16_t width, uint16_t height); - + void begin_frame(const Camera& cam); void submit_entity(draco::rendering::rhi::RenderPacket& packet, uint16_t view); void end_frame(); + + void render_scene(const draco::scene::Scene& scene); } \ No newline at end of file diff --git a/engine/native/rendering/rendergraph/rendergraph.cpp b/engine/native/rendering/rendergraph/rendergraph.cpp index 3bad017..09bf695 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cpp +++ b/engine/native/rendering/rendergraph/rendergraph.cpp @@ -10,27 +10,45 @@ import rendering.rhi; namespace draco::rendering::rendergraph { - void RenderGraph::reset() { - m_passes.clear(); + void RenderGraph::reset() + { + for (auto& p : m_passes) + p.packets.clear(); } - Pass& RenderGraph::add_pass() { + Pass& RenderGraph::add_pass(const std::string& name) + { m_passes.emplace_back(); + m_passes.back().name = name; return m_passes.back(); } - void RenderGraph::execute() { - for (auto& pass : m_passes) { - draco::rendering::rhi::apply_view(pass.view, {pass.framebuffer, 0, 0, pass.width, pass.height, pass.clear_flags, pass.clear_color}); + Pass* RenderGraph::get_pass(const std::string& name) + { + for (auto& p : m_passes) + { + if (p.name == name) + return &p; + } + return nullptr; + } + + void RenderGraph::execute() + { + for (auto& pass : m_passes) + { + rhi::apply_view(pass.view, {pass.framebuffer, 0, 0, pass.width, pass.height, pass.clear_flags, pass.clear_color}); - draco::rendering::rhi::set_view_projection(pass.view, pass.view_mtx, pass.proj_mtx); + rhi::set_view_projection(pass.view, pass.view_mtx, pass.proj_mtx); - if (pass.clear_flags != 0) { + if (pass.clear_flags) + { bgfx::setViewClear(pass.view, pass.clear_flags, pass.clear_color); } - for (auto& pkt : pass.packets) { - draco::rendering::rhi::submit(pkt, pass.view); + for (auto& pkt : pass.packets) + { + rhi::submit(pkt, pass.view); } } } diff --git a/engine/native/rendering/rendergraph/rendergraph.cppm b/engine/native/rendering/rendergraph/rendergraph.cppm index 5953ecf..8edfb30 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cppm +++ b/engine/native/rendering/rendergraph/rendergraph.cppm @@ -17,26 +17,28 @@ export namespace draco::rendering::rendergraph { struct Pass { std::string name; - draco::rendering::rhi::ViewID view; - draco::rendering::rhi::FramebufferHandle framebuffer; + rhi::ViewID view; + rhi::FramebufferHandle framebuffer; - std::vector packets; + std::vector packets; float view_mtx[16]; float proj_mtx[16]; - uint16_t width; - uint16_t height; + uint16_t width = 0; + uint16_t height = 0; - uint32_t clear_flags; - uint32_t clear_color; + uint32_t clear_flags = 0; + uint32_t clear_color = 0; }; class RenderGraph { public: void reset(); - Pass& add_pass(); + Pass& add_pass(const std::string& name); + + Pass* get_pass(const std::string& name); void execute(); private: diff --git a/engine/native/rendering/rhi/uniform_registry.cppm b/engine/native/rendering/rhi/uniform_registry.cppm new file mode 100644 index 0000000..22bf79b --- /dev/null +++ b/engine/native/rendering/rhi/uniform_registry.cppm @@ -0,0 +1,35 @@ +module; + +#include +#include +#include +#include + +export module rendering.rhi.uniform_registry; + +import rendering.rhi; + +export namespace draco::rendering::rhi +{ + inline std::unordered_map g_uniform_map; + + inline uint32_t hash_uniform(const std::string& name) + { + return static_cast(std::hash{}(name)); + } + + inline void register_uniform(uint32_t hash, UniformHandle h) + { + g_uniform_map[hash] = h; + } + + inline UniformHandle get_uniform(uint32_t hash) + { + auto it = g_uniform_map.find(hash); + + if (it == g_uniform_map.end()) + return InvalidUniform; + + return it->second; + } +} diff --git a/engine/native/scene/CMakeLists.txt b/engine/native/scene/CMakeLists.txt index 8477c38..dcf74ce 100644 --- a/engine/native/scene/CMakeLists.txt +++ b/engine/native/scene/CMakeLists.txt @@ -31,3 +31,31 @@ target_link_libraries(transform PUBLIC bx ) + +add_modules_library(renderable) + +target_sources(renderable + PUBLIC + FILE_SET CXX_MODULES FILES + renderable/renderable.cppm +) + +target_link_libraries(renderable + PUBLIC + mesh + transform + material +) + +add_library(scene) + +target_sources(scene + PUBLIC + FILE_SET CXX_MODULES FILES + scene.cppm +) + +target_link_libraries(scene + PUBLIC + renderable +) \ No newline at end of file diff --git a/engine/native/scene/renderable/renderable.cppm b/engine/native/scene/renderable/renderable.cppm new file mode 100644 index 0000000..9bfcdca --- /dev/null +++ b/engine/native/scene/renderable/renderable.cppm @@ -0,0 +1,17 @@ +export module scene.renderable; + +import rendering.mesh; +import rendering.material; +import scene.transform; + +export namespace draco::scene::renderable +{ + struct Renderable + { + draco::rendering::mesh::MeshHandle mesh; + + transform::Transform transform; + + draco::rendering::material::Material material; + }; +} \ No newline at end of file diff --git a/engine/native/scene/scene.cppm b/engine/native/scene/scene.cppm new file mode 100644 index 0000000..5c1ee6d --- /dev/null +++ b/engine/native/scene/scene.cppm @@ -0,0 +1,15 @@ +module; + +#include + +export module scene; + +import scene.renderable; + +export namespace draco::scene +{ + struct Scene + { + std::vector renderables; + }; +} \ No newline at end of file diff --git a/engine/native/scene/transform/transform.cpp b/engine/native/scene/transform/transform.cpp index 6927e2b..134f827 100644 --- a/engine/native/scene/transform/transform.cpp +++ b/engine/native/scene/transform/transform.cpp @@ -6,7 +6,7 @@ module; module scene.transform; -namespace draco::scene +namespace draco::scene::transform { Transform make_transform() { diff --git a/engine/native/scene/transform/transform.cppm b/engine/native/scene/transform/transform.cppm index 7768a6f..4e82576 100644 --- a/engine/native/scene/transform/transform.cppm +++ b/engine/native/scene/transform/transform.cppm @@ -8,7 +8,7 @@ module; export module scene.transform; -export namespace draco::scene +export namespace draco::scene::transform { struct Transform { From 2f2f08ccaf9eb10a81e0a7759906bdfa87844409 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Tue, 12 May 2026 07:20:47 +0500 Subject: [PATCH 17/41] Start working on Quad/Sprite renderer --- .../rendering/quad_renderer/quad_renderer.cpp | 195 ++++++++++++++++++ .../quad_renderer/quad_renderer.cppm | 89 ++++++++ .../rendering/rendergraph/rendergraph.cpp | 73 ++++++- .../rendering/rendergraph/rendergraph.cppm | 29 ++- engine/native/rendering/rhi/vertex.cppm | 2 +- 5 files changed, 383 insertions(+), 5 deletions(-) create mode 100644 engine/native/rendering/quad_renderer/quad_renderer.cpp create mode 100644 engine/native/rendering/quad_renderer/quad_renderer.cppm diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cpp b/engine/native/rendering/quad_renderer/quad_renderer.cpp new file mode 100644 index 0000000..c38384a --- /dev/null +++ b/engine/native/rendering/quad_renderer/quad_renderer.cpp @@ -0,0 +1,195 @@ +module; + +#include +#include + +module rendering.quad_renderer; + +import rendering.rhi; +import rendering.rhi.vertex; +import rendering.rendergraph; + +namespace draco::rendering::quad_renderer { + + static constexpr float QuadUV[4][2] = { + {0.0f, 0.0f}, + {1.0f, 0.0f}, + {1.0f, 1.0f}, + {0.0f, 1.0f} + }; + + void QuadRenderer::init() + { + using namespace draco::rendering::rhi; + + VertexLayoutDesc layout{}; + + layout.attributes.push_back({Attrib::Position, 3, AttribType::Float}); + + layout.attributes.push_back({Attrib::TexCoord0, 2, AttribType::Float}); + + layout.attributes.push_back({Attrib::Color0, 4, AttribType::Uint8, true}); + + m_layout = create_vertex_layout(layout); + + m_vb = create_dynamic_vertex_buffer(sizeof(TexturedVertex) * MaxVertices, m_layout); + + std::vector indices; + indices.reserve(MaxIndices); + + for (uint32_t i = 0; i < MaxQuads; i++) + { + uint16_t b = static_cast(i * 4); + + indices.push_back(b + 0); + indices.push_back(b + 1); + indices.push_back(b + 2); + + indices.push_back(b + 2); + indices.push_back(b + 3); + indices.push_back(b + 0); + } + + m_ib = create_index_buffer(indices.data(), static_cast(indices.size() * sizeof(uint16_t))); + + m_sampler = create_uniform("s_texColor", UniformType::Sampler); + } + + void QuadRenderer::begin() + { + m_vertices.clear(); + m_indices.clear(); + + m_quad_count = 0; + + m_batch_key = {}; + } + + void QuadRenderer::submit(const QuadCommand& cmd) + { + if (m_quad_count >= MaxQuads) + return; + + BatchKey new_key{cmd.texture, m_pipeline, draco::rendering::rhi::InvalidSampler}; + + if (m_batch_key.texture == draco::rendering::rhi::InvalidTexture) + { + m_batch_key = new_key; + } + + bool state_change = !(new_key == m_batch_key); + + if (state_change) + { + // TODO: Flush current batch automatically + + return; + } + + push_quad(cmd); + + m_quad_count++; + } + + void QuadRenderer::push_quad(const QuadCommand& cmd) + { + float hw = cmd.width * 0.5f; + float hh = cmd.height * 0.5f; + + float c = cosf(cmd.rotation); + float s = sinf(cmd.rotation); + + float corners[4][2] = { + {-hw, -hh}, + { hw, -hh}, + { hw, hh}, + {-hw, hh} + }; + + uint32_t start = static_cast(m_vertices.size()); + + for (int i = 0; i < 4; i++) + { + float rx = corners[i][0] * c - corners[i][1] * s; + + float ry = corners[i][0] * s + corners[i][1] * c; + + draco::rendering::rhi::TexturedVertex v{}; + + v.x = cmd.x + rx; + v.y = cmd.y + ry; + v.z = cmd.z; + + v.u = QuadUV[i][0]; + v.v = QuadUV[i][1]; + + v.color = cmd.color; + + m_vertices.push_back(v); + } + + m_indices.push_back(start + 0); + m_indices.push_back(start + 1); + m_indices.push_back(start + 2); + + m_indices.push_back(start + 2); + m_indices.push_back(start + 3); + m_indices.push_back(start + 0); + } + + void QuadRenderer::flush_to_pass(draco::rendering::rendergraph::Pass& pass) + { + using namespace draco::rendering::rhi; + + if (m_vertices.empty()) + return; + + update_dynamic_vertex_buffer(m_vb, 0, m_vertices.data(), static_cast(m_vertices.size() * sizeof(TexturedVertex))); + + RenderPacket pkt{}; + + pkt.vertex_buffer = m_vb; + pkt.index_buffer = m_ib; + + pkt.pipeline = m_pipeline; + + pkt.texture_handle = m_batch_key.texture; + + pkt.sampler_uniform = m_sampler; + + pkt.sort_key = make_sort_key(0, 0, static_cast(m_pipeline.value), static_cast(m_batch_key.texture.value), 0); + + pass.packets.push_back(pkt); + + m_vertices.clear(); + m_indices.clear(); + } + + void QuadRenderer::shutdown() + { + using namespace draco::rendering::rhi; + + destroy_buffer(m_vb); + destroy_buffer(m_ib); + + destroy_uniform(m_sampler); + } + + void QuadRenderer::build_ortho(OrthoCamera& cam, float width, float height) + { + using namespace draco::rendering::rhi; + + identity_matrix(cam.view); + identity_matrix(cam.proj); + + float rl = width; + float tb = height; + + cam.proj[0] = 2.0f / rl; + cam.proj[5] = -2.0f / tb; + cam.proj[10] = -1.0f; + + cam.proj[12] = -1.0f; + cam.proj[13] = 1.0f; + } +} diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cppm b/engine/native/rendering/quad_renderer/quad_renderer.cppm new file mode 100644 index 0000000..0e57743 --- /dev/null +++ b/engine/native/rendering/quad_renderer/quad_renderer.cppm @@ -0,0 +1,89 @@ +module; + +#include +#include +#include + +export module rendering.quad_renderer; + +import rendering.rhi; +import rendering.rhi.vertex; +import rendering.rendergraph; + +export namespace draco::rendering::quad_renderer { + + struct BatchKey { + draco::rendering::rhi::TextureHandle texture = draco::rendering::rhi::InvalidTexture; + + draco::rendering::rhi::PipelineHandle pipeline = draco::rendering::rhi::InvalidPipeline; + + draco::rendering::rhi::SamplerHandle sampler = draco::rendering::rhi::InvalidSampler; + + bool operator==(const BatchKey&) const = default; + }; + + struct QuadCommand { + draco::rendering::rhi::TextureHandle texture = draco::rendering::rhi::InvalidTexture; + + float x = 0.0f; + float y = 0.0f; + float z = 0.0f; + + float width = 1.0f; + float height = 1.0f; + + float rotation = 0.0f; + + uint32_t color = 0xffffffff; + }; + + struct OrthoCamera { + float view[16]; + float proj[16]; + + float x = 0.0f; + float y = 0.0f; + float zoom = 1.0f; + }; + + class QuadRenderer { + public: + static constexpr uint32_t MaxQuads = 10000; + static constexpr uint32_t MaxVertices = MaxQuads * 4; + static constexpr uint32_t MaxIndices = MaxQuads * 6; + + void init(); + + void begin(); + + void submit(const QuadCommand& cmd); + + void flush_to_pass(draco::rendering::rendergraph::Pass& pass); + + void shutdown(); + + static void build_ortho(OrthoCamera& cam, float width, float height); + + private: + void push_quad(const QuadCommand& cmd); + + private: + BatchKey m_batch_key{}; + + std::vector m_vertices; + + std::vector m_indices; + + draco::rendering::rhi::BufferHandle m_vb = draco::rendering::rhi::InvalidBuffer; + + draco::rendering::rhi::BufferHandle m_ib = draco::rendering::rhi::InvalidBuffer; + + draco::rendering::rhi::LayoutHandle m_layout = draco::rendering::rhi::InvalidLayout; + + draco::rendering::rhi::PipelineHandle m_pipeline = draco::rendering::rhi::InvalidPipeline; + + draco::rendering::rhi::UniformHandle m_sampler = draco::rendering::rhi::InvalidUniform; + + uint32_t m_quad_count = 0; + }; +} diff --git a/engine/native/rendering/rendergraph/rendergraph.cpp b/engine/native/rendering/rendergraph/rendergraph.cpp index 09bf695..389fc73 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cpp +++ b/engine/native/rendering/rendergraph/rendergraph.cpp @@ -1,6 +1,7 @@ module; #include +#include #include @@ -10,17 +11,76 @@ import rendering.rhi; namespace draco::rendering::rendergraph { + static void sort_material(std::vector& packets) + { + std::sort(packets.begin(), packets.end(), + [](const rhi::RenderPacket& a, const rhi::RenderPacket& b) + { + // Pipeline first + if (a.pipeline != b.pipeline) + return a.pipeline.value < b.pipeline.value; + + // Texture second + if (a.texture_handle != b.texture_handle) + return a.texture_handle.value < b.texture_handle.value; + + // Vertex buffer third + if (a.vertex_buffer != b.vertex_buffer) + return a.vertex_buffer.value < b.vertex_buffer.value; + + // Index buffer fallback + return a.index_buffer.value < b.index_buffer.value; + }); + } + + // Placeholder until depth sorting exists + static void sort_front_to_back(std::vector& packets) + { + sort_material(packets); + } + + static void sort_back_to_front(std::vector& packets) + { + sort_material(packets); + } + + static void sort_packets(std::vector& packets, SortMode mode) + { + switch (mode) + { + case SortMode::None: + break; + + case SortMode::Material: + sort_material(packets); + break; + + case SortMode::FrontToBack: + sort_front_to_back(packets); + break; + + case SortMode::BackToFront: + sort_back_to_front(packets); + break; + } + } + void RenderGraph::reset() { for (auto& p : m_passes) + { p.packets.clear(); + } } Pass& RenderGraph::add_pass(const std::string& name) { m_passes.emplace_back(); - m_passes.back().name = name; - return m_passes.back(); + + auto& pass = m_passes.back(); + pass.name = name; + + return pass; } Pass* RenderGraph::get_pass(const std::string& name) @@ -30,6 +90,7 @@ namespace draco::rendering::rendergraph { if (p.name == name) return &p; } + return nullptr; } @@ -37,6 +98,14 @@ namespace draco::rendering::rendergraph { { for (auto& pass : m_passes) { + // Future dependency handling hook + for (const auto& dep : pass.dependencies) + { + (void)dep; + } + + sort_packets(pass.packets, pass.sort_mode); + rhi::apply_view(pass.view, {pass.framebuffer, 0, 0, pass.width, pass.height, pass.clear_flags, pass.clear_color}); rhi::set_view_projection(pass.view, pass.view_mtx, pass.proj_mtx); diff --git a/engine/native/rendering/rendergraph/rendergraph.cppm b/engine/native/rendering/rendergraph/rendergraph.cppm index 8edfb30..c38140d 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cppm +++ b/engine/native/rendering/rendergraph/rendergraph.cppm @@ -14,9 +14,32 @@ import rendering.rhi; export namespace draco::rendering::rendergraph { - struct Pass { + enum class PassType : uint8_t + { + Graphics, + Transparent, + Shadow, + PostProcess, + UI + }; + + enum class SortMode : uint8_t + { + None, + Material, + FrontToBack, + BackToFront + }; + + struct Pass + { std::string name; + PassType type = PassType::Graphics; + SortMode sort_mode = SortMode::Material; + + std::vector dependencies; + rhi::ViewID view; rhi::FramebufferHandle framebuffer; @@ -32,7 +55,8 @@ export namespace draco::rendering::rendergraph { uint32_t clear_color = 0; }; - class RenderGraph { + class RenderGraph + { public: void reset(); @@ -41,6 +65,7 @@ export namespace draco::rendering::rendergraph { Pass* get_pass(const std::string& name); void execute(); + private: std::vector m_passes; }; diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/native/rendering/rhi/vertex.cppm index d11b18e..5ffa6f4 100644 --- a/engine/native/rendering/rhi/vertex.cppm +++ b/engine/native/rendering/rhi/vertex.cppm @@ -32,8 +32,8 @@ export namespace draco::rendering::rhi { struct TexturedVertex { float x, y, z; - uint32_t abgr; float u, v; + uint32_t color; }; // Helper to get the standard layout for the current vertex struct From b1176601c85a148dbb781a9c7ea17294cf0f331b Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Tue, 12 May 2026 15:31:01 +0500 Subject: [PATCH 18/41] Work on QuadRenderer --- CMakeLists.txt | 3 ++ engine/native/core/CMakeLists.txt | 1 - engine/native/main/main.cpp | 54 ++++++++++++++++++- engine/native/rendering/CMakeLists.txt | 16 ++++++ .../rendering/quad_renderer/quad_renderer.cpp | 6 +-- engine/native/rendering/rhi/rhi.cppm | 5 ++ engine/native/rendering/rhi/rhi_bgfx.cpp | 8 +++ 7 files changed, 88 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20a542d..16307e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ endif() project(DraconicEngine LANGUAGES C CXX) +add_compile_options(-mavx2 -mfma) + list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # Subdirectories for engine libs @@ -42,6 +44,7 @@ target_link_libraries(draconic rendergraph mesh material + quad_renderer scene camera # Camera controller transform diff --git a/engine/native/core/CMakeLists.txt b/engine/native/core/CMakeLists.txt index 14f9c1e..8dfcb0a 100644 --- a/engine/native/core/CMakeLists.txt +++ b/engine/native/core/CMakeLists.txt @@ -8,7 +8,6 @@ target_link_libraries(io PUBLIC definitions stb_image) add_modules_library(memory) target_link_libraries(memory PUBLIC definitions) -# image_loader is a FEATURE module built on io add_library(image_loader) target_sources(image_loader diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index f032b38..1674d8a 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -3,6 +3,7 @@ #include #include +#include #include import core.io.filesystem; @@ -21,6 +22,8 @@ import rendering.rhi.uniform_registry; import rendering.renderer; import rendering.mesh; import rendering.material; +import rendering.rendergraph; +import rendering.quad_renderer; int main(int argc, char* argv[]) { @@ -62,6 +65,22 @@ int main(int argc, char* argv[]) draco::rendering::renderer::init(1280, 720); + draco::rendering::quad_renderer::QuadRenderer quad_renderer; + quad_renderer.init(); + draco::rendering::rendergraph::RenderGraph graph; + + auto& quad_pass = graph.add_pass("quad_pass"); + + quad_pass.view = 10; + + quad_pass.width = 1280; + quad_pass.height = 720; + + quad_pass.clear_flags = BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH; + + quad_pass.clear_color = 0x303030ff; + + auto cube_mesh = draco::rendering::mesh::create_cube(); auto plane_mesh = draco::rendering::mesh::create_plane(5.0f); auto sphere_mesh = draco::rendering::mesh::create_sphere(24, 16); @@ -108,6 +127,13 @@ int main(int argc, char* argv[]) draco::scene::CameraController camera; camera.init(); + draco::rendering::quad_renderer::OrthoCamera ortho; + + draco::rendering::quad_renderer::QuadRenderer::build_ortho(ortho, 1280.0f, 720.0f); + + std::memcpy(quad_pass.view_mtx, ortho.view, sizeof(float) * 16); + std::memcpy(quad_pass.proj_mtx, ortho.proj, sizeof(float) * 16); + auto u_tint = draco::rendering::rhi::create_uniform("u_tint", draco::rendering::rhi::UniformType::Vec4); auto u_offset = draco::rendering::rhi::create_uniform("u_offset", draco::rendering::rhi::UniformType::Vec4); @@ -147,7 +173,6 @@ int main(int argc, char* argv[]) draco::scene::transform::set_rotation(scene.renderables[1].transform, -bx::kPiHalf, 0.0f, 0.0f); - while (running) { // Delta time @@ -195,9 +220,36 @@ int main(int argc, char* argv[]) auto cam = camera.get_camera(); draco::rendering::renderer::begin_frame(cam); + draco::rendering::renderer::render_scene(scene); + + graph.reset(); + + quad_renderer.begin(); + + for (int i = 0; i < 50; i++) + { + draco::rendering::quad_renderer::QuadCommand q{}; + + q.texture = tex; + q.x = 200.0f + std::sin(SDL_GetTicks() * 0.001f + i) * 200.0f; + q.y = 300.0f + i * 6.0f; + q.width = 20.0f + (i % 10); + q.height = 20.0f + (i % 10); + q.rotation = SDL_GetTicks() * 0.001f + i * 0.1f; + + q.color = 0xffffffff; + + quad_renderer.submit(q); + } + + quad_renderer.flush_to_pass(quad_pass); + + graph.execute(); + draco::rendering::renderer::end_frame(); } + draco::rendering::rhi::shutdown(); SDL_DestroyWindow(window); SDL_Quit(); diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index e204c60..e291ab9 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -83,4 +83,20 @@ target_link_libraries(renderer transform bgfx bx +) + +add_modules_library(quad_renderer) + +target_sources(quad_renderer + PUBLIC + FILE_SET CXX_MODULES FILES + quad_renderer/quad_renderer.cppm + PRIVATE + quad_renderer/quad_renderer.cpp +) + +target_link_libraries(quad_renderer + PUBLIC + rhi + rendergraph ) \ No newline at end of file diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cpp b/engine/native/rendering/quad_renderer/quad_renderer.cpp index c38384a..bd087b3 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cpp +++ b/engine/native/rendering/quad_renderer/quad_renderer.cpp @@ -24,11 +24,11 @@ namespace draco::rendering::quad_renderer { VertexLayoutDesc layout{}; - layout.attributes.push_back({Attrib::Position, 3, AttribType::Float}); + layout.elements.push_back({Attrib::Position, 3, AttribType::Float}); - layout.attributes.push_back({Attrib::TexCoord0, 2, AttribType::Float}); + layout.elements.push_back({Attrib::TexCoord0, 2, AttribType::Float}); - layout.attributes.push_back({Attrib::Color0, 4, AttribType::Uint8, true}); + layout.elements.push_back({Attrib::Color0, 4, AttribType::Uint8, true}); m_layout = create_vertex_layout(layout); diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index dcd03ad..1555fd8 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -249,6 +249,11 @@ export namespace draco::rendering::rhi void process_deletions(); + inline uint64_t make_sort_key(uint8_t layer, uint8_t pass, uint16_t pipeline, uint16_t texture, uint16_t depth = 0) + { + return (uint64_t(layer) << 56) | (uint64_t(pass) << 48) | (uint64_t(pipeline) << 32) | (uint64_t(texture) << 16) | uint64_t(depth); + } + constexpr PipelineState operator|(PipelineState a, PipelineState b) { return static_cast(static_cast(a) | static_cast(b)); } diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 1bbca2c..838d27a 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -231,6 +231,14 @@ namespace draco::rendering::rhi return g_buffers.create(buf); } + void update_dynamic_vertex_buffer(BufferHandle handle, uint32_t start_vertex, const void* data, uint32_t size) + { + // Convert the vertex index into byte offset + const bgfx::Memory* mem = bgfx::copy(data, size); + + bgfx::update(bgfx::DynamicVertexBufferHandle{static_cast(handle.value)}, start_vertex, mem); + } + void destroy_buffer(BufferHandle h) { auto* buf = get_checked(g_buffers, h, "Buffer"); From 463ab5eeb4c457a8e633b261cdc9ad9f1c106730 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 12:44:19 +0500 Subject: [PATCH 19/41] QuadRenderer finally works! --- CMakeLists.txt | 55 ++++++++- engine/native/core/memory/handle.cppm | 2 +- engine/native/main/main.cpp | 107 ++++++------------ engine/native/rendering/CMakeLists.txt | 27 +++-- .../native/rendering/material/material.cppm | 2 +- .../rendering/quad_renderer/quad_renderer.cpp | 46 +++----- .../quad_renderer/quad_renderer.cppm | 2 +- engine/native/rendering/renderer/renderer.cpp | 30 +++++ .../native/rendering/renderer/renderer.cppm | 7 +- .../rendering/rendergraph/rendergraph.cpp | 7 +- engine/native/rendering/rhi/rhi.cppm | 7 ++ engine/native/rendering/rhi/rhi_bgfx.cpp | 90 ++++++++++++--- engine/native/rendering/rhi/vertex.cppm | 8 +- engine/native/rendering/shaders/fs_quad.sc | 12 ++ .../rendering/shaders/varying_quad.def.sc | 6 + engine/native/rendering/shaders/vs_quad.sc | 21 ++++ 16 files changed, 289 insertions(+), 140 deletions(-) create mode 100644 engine/native/rendering/shaders/fs_quad.sc create mode 100644 engine/native/rendering/shaders/varying_quad.def.sc create mode 100644 engine/native/rendering/shaders/vs_quad.sc diff --git a/CMakeLists.txt b/CMakeLists.txt index 16307e2..0634655 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,10 +103,15 @@ endif() set(VERTEX_SHADER "${SHADER_DIR}/vs.sc") set(FRAGMENT_SHADER "${SHADER_DIR}/fs.sc") set(VARYING_DEF "${SHADER_DIR}/varying.def.sc") +set(QUAD_VERTEX_SHADER "${SHADER_DIR}/vs_quad.sc") +set(QUAD_FRAGMENT_SHADER "${SHADER_DIR}/fs_quad.sc") +set(QUAD_VARYING_DEF "${SHADER_DIR}/varying_quad.def.sc") # Output binaries set(VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs.bin") set(FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs.bin") +set(QUAD_VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs_quad.bin") +set(QUAD_FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs_quad.bin") # Compile vertex shader add_custom_command( @@ -148,11 +153,51 @@ add_custom_command( COMMENT "Compiling fragment shader..." ) +add_custom_command( + OUTPUT ${QUAD_VERTEX_OUTPUT} + + COMMAND ${SHADERC} + -f ${QUAD_VERTEX_SHADER} + -o ${QUAD_VERTEX_OUTPUT} + --type vertex + --platform ${SHADER_PLATFORM} + -p ${SHADER_PROFILE} + --varyingdef ${QUAD_VARYING_DEF} + -i ${BGFX_INCLUDE} + + DEPENDS + ${QUAD_VERTEX_SHADER} + ${QUAD_VARYING_DEF} + + COMMENT "Compiling quad vertex shader..." +) + +add_custom_command( + OUTPUT ${QUAD_FRAGMENT_OUTPUT} + + COMMAND ${SHADERC} + -f ${QUAD_FRAGMENT_SHADER} + -o ${QUAD_FRAGMENT_OUTPUT} + --type fragment + --platform ${SHADER_PLATFORM} + -p ${SHADER_PROFILE} + --varyingdef ${QUAD_VARYING_DEF} + -i ${BGFX_INCLUDE} + + DEPENDS + ${QUAD_FRAGMENT_SHADER} + ${QUAD_VARYING_DEF} + + COMMENT "Compiling quad fragment shader..." +) + # Shader target add_custom_target(shaders ALL DEPENDS ${VERTEX_OUTPUT} ${FRAGMENT_OUTPUT} + ${QUAD_VERTEX_OUTPUT} + ${QUAD_FRAGMENT_OUTPUT} ) # Make executable depend on shaders @@ -169,6 +214,14 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FRAGMENT_OUTPUT} $ + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${QUAD_VERTEX_OUTPUT} + $ + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${QUAD_FRAGMENT_OUTPUT} + $ COMMENT "Copying compiled shaders..." -) \ No newline at end of file +) diff --git a/engine/native/core/memory/handle.cppm b/engine/native/core/memory/handle.cppm index 1741330..f1b3d4e 100644 --- a/engine/native/core/memory/handle.cppm +++ b/engine/native/core/memory/handle.cppm @@ -56,4 +56,4 @@ export namespace draco::core::memory }; } }; -} \ No newline at end of file +} diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 1674d8a..2ecbcdc 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -22,7 +22,6 @@ import rendering.rhi.uniform_registry; import rendering.renderer; import rendering.mesh; import rendering.material; -import rendering.rendergraph; import rendering.quad_renderer; int main(int argc, char* argv[]) @@ -55,7 +54,6 @@ int main(int argc, char* argv[]) return -1; } - // Init the RHI & Renderer if (!draco::rendering::rhi::init(handles.ndt, handles.nwh, 1280, 720)) { std::println("RHI init failed"); SDL_DestroyWindow(window); @@ -65,27 +63,11 @@ int main(int argc, char* argv[]) draco::rendering::renderer::init(1280, 720); - draco::rendering::quad_renderer::QuadRenderer quad_renderer; - quad_renderer.init(); - draco::rendering::rendergraph::RenderGraph graph; - - auto& quad_pass = graph.add_pass("quad_pass"); - - quad_pass.view = 10; - - quad_pass.width = 1280; - quad_pass.height = 720; - - quad_pass.clear_flags = BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH; - - quad_pass.clear_color = 0x303030ff; - - - auto cube_mesh = draco::rendering::mesh::create_cube(); - auto plane_mesh = draco::rendering::mesh::create_plane(5.0f); - auto sphere_mesh = draco::rendering::mesh::create_sphere(24, 16); - auto cylinder_mesh = draco::rendering::mesh::create_cylinder(24, 2.0f); - auto capsule_mesh = draco::rendering::mesh::create_capsule(24, 12, 2.0f); + auto cube_mesh = draco::rendering::mesh::create_cube(); + auto plane_mesh = draco::rendering::mesh::create_plane(5.0f); + auto sphere_mesh = draco::rendering::mesh::create_sphere(24, 16); + auto cylinder_mesh = draco::rendering::mesh::create_cylinder(24, 2.0f); + auto capsule_mesh = draco::rendering::mesh::create_capsule(24, 12, 2.0f); auto img = draco::core::io::image_loader::load_image("test.png"); @@ -100,7 +82,10 @@ int main(int argc, char* argv[]) auto vs = draco::core::io::filesystem::load_binary("vs.bin"); auto fs = draco::core::io::filesystem::load_binary("fs.bin"); - if (vs.empty() || fs.empty()) { + auto vs_quad = draco::core::io::filesystem::load_binary("vs_quad.bin"); + auto fs_quad = draco::core::io::filesystem::load_binary("fs_quad.bin"); + + if (vs.empty() || fs.empty() || vs_quad.empty() || fs_quad.empty()) { std::println("Shader load failed"); draco::rendering::rhi::shutdown(); SDL_DestroyWindow(window); @@ -111,28 +96,18 @@ int main(int argc, char* argv[]) auto vsh = draco::rendering::rhi::create_shader(vs.data(), (uint32_t)vs.size()); auto fsh = draco::rendering::rhi::create_shader(fs.data(), (uint32_t)fs.size()); - auto pipeline = draco::rendering::rhi::create_pipeline({ - vsh, - fsh, - draco::rendering::rhi::PipelineState::WriteRGB | - draco::rendering::rhi::PipelineState::WriteAlpha | - draco::rendering::rhi::PipelineState::MSAA, - - draco::rendering::rhi::BlendMode::None, - draco::rendering::rhi::DepthTest::Less, - draco::rendering::rhi::CullMode::CCW, - true - }); + auto vsh_quad = draco::rendering::rhi::create_shader(vs_quad.data(), (uint32_t)vs_quad.size()); + auto fsh_quad = draco::rendering::rhi::create_shader(fs_quad.data(), (uint32_t)fs_quad.size()); - draco::scene::CameraController camera; - camera.init(); + auto pipeline = draco::rendering::rhi::create_pipeline({vsh, fsh, draco::rendering::rhi::PipelineState::WriteRGB | draco::rendering::rhi::PipelineState::WriteAlpha | draco::rendering::rhi::PipelineState::MSAA, draco::rendering::rhi::BlendMode::None, draco::rendering::rhi::DepthTest::Less, draco::rendering::rhi::CullMode::CCW, true}); - draco::rendering::quad_renderer::OrthoCamera ortho; + auto pipeline_quad = draco::rendering::rhi::create_pipeline({vsh_quad, fsh_quad, draco::rendering::rhi::PipelineState::WriteRGB | draco::rendering::rhi::PipelineState::WriteAlpha | draco::rendering::rhi::PipelineState::MSAA, draco::rendering::rhi::BlendMode::None, draco::rendering::rhi::DepthTest::None, draco::rendering::rhi::CullMode::None, true}); - draco::rendering::quad_renderer::QuadRenderer::build_ortho(ortho, 1280.0f, 720.0f); + draco::rendering::quad_renderer::QuadRenderer quad_renderer; + quad_renderer.init(pipeline_quad); - std::memcpy(quad_pass.view_mtx, ortho.view, sizeof(float) * 16); - std::memcpy(quad_pass.proj_mtx, ortho.proj, sizeof(float) * 16); + draco::scene::CameraController camera; + camera.init(); auto u_tint = draco::rendering::rhi::create_uniform("u_tint", draco::rendering::rhi::UniformType::Vec4); auto u_offset = draco::rendering::rhi::create_uniform("u_offset", draco::rendering::rhi::UniformType::Vec4); @@ -148,7 +123,6 @@ int main(int argc, char* argv[]) bool mouse_captured = true; draco::rendering::material::Material mat{}; - mat.pipeline = pipeline; mat.texture = tex; mat.sampler = s_texColor; @@ -170,12 +144,11 @@ int main(int argc, char* argv[]) draco::scene::transform::set_position(scene.renderables[2].transform, 0.0f, 0.0f, 0.0f); draco::scene::transform::set_position(scene.renderables[3].transform, 6.0f, 0.0f, 0.0f); draco::scene::transform::set_position(scene.renderables[4].transform, 12.0f, 0.0f, 0.0f); - + draco::scene::transform::set_rotation(scene.renderables[1].transform, -bx::kPiHalf, 0.0f, 0.0f); while (running) { - // Delta time static uint64_t last = SDL_GetTicks(); uint64_t now = SDL_GetTicks(); float dt = (now - last) / 1000.0f; @@ -189,64 +162,50 @@ int main(int argc, char* argv[]) if (e.type == SDL_EVENT_QUIT) running = false; - if (e.type == SDL_EVENT_KEY_DOWN) + if (e.type == SDL_EVENT_KEY_DOWN && + e.key.key == SDLK_ESCAPE) { - if (e.key.key == SDLK_ESCAPE) - { - mouse_captured = !mouse_captured; - - draco::input::set_mouse_captured(window, mouse_captured); - } + mouse_captured = !mouse_captured; + draco::input::set_mouse_captured(window, mouse_captured); } draco::input::process_event(e); } - static int dw = 1280; // Default width, it shouldn't be modified - static int dh = 720; // Default height, it shouldn't be modified - int w, h; SDL_GetWindowSize(window, &w, &h); - if (w != dw || h != dh) { - draco::rendering::rhi::resize(static_cast(w), static_cast(h)); - draco::rendering::renderer::resize(static_cast(w), static_cast(h)); - dw = w; - dh = h; - } + draco::rendering::rhi::resize((uint16_t)w, (uint16_t)h); + draco::rendering::renderer::resize((uint16_t)w, (uint16_t)h); camera.update(dt); - auto cam = camera.get_camera(); draco::rendering::renderer::begin_frame(cam); - draco::rendering::renderer::render_scene(scene); - graph.reset(); - quad_renderer.begin(); + static float quad_base_x = 400.0f; + static float quad_base_y = 300.0f; + for (int i = 0; i < 50; i++) { draco::rendering::quad_renderer::QuadCommand q{}; q.texture = tex; - q.x = 200.0f + std::sin(SDL_GetTicks() * 0.001f + i) * 200.0f; - q.y = 300.0f + i * 6.0f; - q.width = 20.0f + (i % 10); - q.height = 20.0f + (i % 10); - q.rotation = SDL_GetTicks() * 0.001f + i * 0.1f; - q.color = 0xffffffff; + q.x = quad_base_x + std::sin(SDL_GetTicks() * 0.001f + i) * 50.0f; + q.y = quad_base_y + i * 6.0f; + q.width = 50.0f; + q.height = 50.0f; + q.rotation = SDL_GetTicks() * 0.001f; quad_renderer.submit(q); } - quad_renderer.flush_to_pass(quad_pass); + draco::rendering::renderer::submit_ui(quad_renderer); - graph.execute(); - draco::rendering::renderer::end_frame(); } diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index e291ab9..f934122 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -73,18 +73,6 @@ target_link_libraries(material rhi ) -target_link_libraries(renderer - PUBLIC - core - rhi - rendergraph - mesh - scene - transform - bgfx - bx -) - add_modules_library(quad_renderer) target_sources(quad_renderer @@ -99,4 +87,19 @@ target_link_libraries(quad_renderer PUBLIC rhi rendergraph + bgfx + bx +) + +target_link_libraries(renderer + PUBLIC + core + rhi + rendergraph + mesh + quad_renderer + scene + transform + bgfx + bx ) \ No newline at end of file diff --git a/engine/native/rendering/material/material.cppm b/engine/native/rendering/material/material.cppm index da74d38..7737d21 100644 --- a/engine/native/rendering/material/material.cppm +++ b/engine/native/rendering/material/material.cppm @@ -29,4 +29,4 @@ export namespace draco::rendering::material std::vector uniforms; }; -} \ No newline at end of file +} diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cpp b/engine/native/rendering/quad_renderer/quad_renderer.cpp index bd087b3..578cd10 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cpp +++ b/engine/native/rendering/quad_renderer/quad_renderer.cpp @@ -3,6 +3,9 @@ module; #include #include +#include +#include + module rendering.quad_renderer; import rendering.rhi; @@ -18,39 +21,23 @@ namespace draco::rendering::quad_renderer { {0.0f, 1.0f} }; - void QuadRenderer::init() + void QuadRenderer::init(draco::rendering::rhi::PipelineHandle pipeline) { using namespace draco::rendering::rhi; VertexLayoutDesc layout{}; - layout.elements.push_back({Attrib::Position, 3, AttribType::Float}); - layout.elements.push_back({Attrib::TexCoord0, 2, AttribType::Float}); - layout.elements.push_back({Attrib::Color0, 4, AttribType::Uint8, true}); + m_pipeline = pipeline; m_layout = create_vertex_layout(layout); + // Allocating dynamic streaming buffers m_vb = create_dynamic_vertex_buffer(sizeof(TexturedVertex) * MaxVertices, m_layout); - - std::vector indices; - indices.reserve(MaxIndices); - - for (uint32_t i = 0; i < MaxQuads; i++) - { - uint16_t b = static_cast(i * 4); - - indices.push_back(b + 0); - indices.push_back(b + 1); - indices.push_back(b + 2); - - indices.push_back(b + 2); - indices.push_back(b + 3); - indices.push_back(b + 0); - } - - m_ib = create_index_buffer(indices.data(), static_cast(indices.size() * sizeof(uint16_t))); + + // Pass BGFX_BUFFER_NONE implicitly to match tracking + m_ib = create_dynamic_index_buffer(MaxIndices * sizeof(uint16_t), BGFX_BUFFER_NONE); m_sampler = create_uniform("s_texColor", UniformType::Sampler); } @@ -106,7 +93,7 @@ namespace draco::rendering::quad_renderer { {-hw, hh} }; - uint32_t start = static_cast(m_vertices.size()); + uint16_t start = static_cast(m_vertices.size()); for (int i = 0; i < 4; i++) { @@ -144,21 +131,24 @@ namespace draco::rendering::quad_renderer { if (m_vertices.empty()) return; + // Upload only the exact slices we are using this frame update_dynamic_vertex_buffer(m_vb, 0, m_vertices.data(), static_cast(m_vertices.size() * sizeof(TexturedVertex))); + update_dynamic_index_buffer(m_ib, 0, m_indices.data(), static_cast(m_indices.size() * sizeof(uint16_t))); RenderPacket pkt{}; - pkt.vertex_buffer = m_vb; pkt.index_buffer = m_ib; - - pkt.pipeline = m_pipeline; - + pkt.pipeline = m_pipeline; pkt.texture_handle = m_batch_key.texture; - pkt.sampler_uniform = m_sampler; + pkt.vertex_count = static_cast(m_vertices.size()); + pkt.index_count = static_cast(m_indices.size()); + pkt.sort_key = make_sort_key(0, 0, static_cast(m_pipeline.value), static_cast(m_batch_key.texture.value), 0); + bx::mtxIdentity(pkt.model); + pass.packets.push_back(pkt); m_vertices.clear(); diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cppm b/engine/native/rendering/quad_renderer/quad_renderer.cppm index 0e57743..58edc8a 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cppm +++ b/engine/native/rendering/quad_renderer/quad_renderer.cppm @@ -52,7 +52,7 @@ export namespace draco::rendering::quad_renderer { static constexpr uint32_t MaxVertices = MaxQuads * 4; static constexpr uint32_t MaxIndices = MaxQuads * 6; - void init(); + void init(draco::rendering::rhi::PipelineHandle pipeline); void begin(); diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp index 7a24ea0..92b45e8 100644 --- a/engine/native/rendering/renderer/renderer.cpp +++ b/engine/native/rendering/renderer/renderer.cpp @@ -19,6 +19,7 @@ import rendering.rhi.uniform_registry; import rendering.rendergraph; import rendering.mesh; import rendering.material; +import rendering.quad_renderer; import scene; import scene.transform; @@ -131,9 +132,38 @@ namespace draco::rendering::renderer } } + void submit_ui(draco::rendering::quad_renderer::QuadRenderer& quad_renderer) + { + auto& ui_pass = g_ctx.graph.add_pass("UIPass"); + + ui_pass.view = 1; + ui_pass.sort_mode = rendergraph::SortMode::None; + + ui_pass.framebuffer = rhi::InvalidFramebuffer; + + ui_pass.width = g_ctx.screen_width; + ui_pass.height = g_ctx.screen_height; + + ui_pass.clear_flags = 0; + + draco::rendering::quad_renderer::OrthoCamera ortho; + + draco::rendering::quad_renderer::QuadRenderer::build_ortho(ortho, (float)g_ctx.screen_width, (float)g_ctx.screen_height); + + std::memcpy(ui_pass.view_mtx, ortho.view, sizeof(float) * 16); + std::memcpy(ui_pass.proj_mtx, ortho.proj, sizeof(float) * 16); + + quad_renderer.flush_to_pass(ui_pass); + } + void end_frame() { g_ctx.graph.execute(); rhi::end_frame(); } + + rendergraph::RenderGraph& get_graph() + { + return draco::rendering::renderer::g_ctx.graph; + } } diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/native/rendering/renderer/renderer.cppm index a9d59a1..4259ef2 100644 --- a/engine/native/rendering/renderer/renderer.cppm +++ b/engine/native/rendering/renderer/renderer.cppm @@ -14,6 +14,7 @@ export module rendering.renderer; import rendering.rhi; import rendering.rendergraph; +import rendering.quad_renderer; import scene; @@ -48,4 +49,8 @@ export namespace draco::rendering::renderer { void end_frame(); void render_scene(const draco::scene::Scene& scene); -} \ No newline at end of file + + void submit_ui(draco::rendering::quad_renderer::QuadRenderer& quad_renderer); + + rendergraph::RenderGraph& get_graph(); +} diff --git a/engine/native/rendering/rendergraph/rendergraph.cpp b/engine/native/rendering/rendergraph/rendergraph.cpp index 389fc73..51d8d53 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cpp +++ b/engine/native/rendering/rendergraph/rendergraph.cpp @@ -67,10 +67,7 @@ namespace draco::rendering::rendergraph { void RenderGraph::reset() { - for (auto& p : m_passes) - { - p.packets.clear(); - } + m_passes.clear(); // Directly clear } Pass& RenderGraph::add_pass(const std::string& name) @@ -121,4 +118,4 @@ namespace draco::rendering::rendergraph { } } } -} \ No newline at end of file +} diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 1555fd8..e9207b7 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -115,6 +115,7 @@ export namespace draco::rendering::rhi bgfx::VertexBufferHandle vbh = BGFX_INVALID_HANDLE; bgfx::DynamicVertexBufferHandle dvbh = BGFX_INVALID_HANDLE; bgfx::IndexBufferHandle ibh = BGFX_INVALID_HANDLE; + bgfx::DynamicIndexBufferHandle dibh; bool is_dynamic = false; bool is_index = false; }; @@ -160,6 +161,9 @@ export namespace draco::rendering::rhi BufferHandle index_buffer = InvalidBuffer; PipelineHandle pipeline = InvalidPipeline; + uint32_t vertex_count = UINT32_MAX; + uint32_t index_count = UINT32_MAX; + UniformHandle sampler_uniform = InvalidUniform; SamplerHandle sampler_flags = InvalidSampler; TextureHandle texture_handle = InvalidTexture; @@ -208,6 +212,9 @@ export namespace draco::rendering::rhi BufferHandle create_dynamic_vertex_buffer(uint32_t size, LayoutHandle layout); void update_dynamic_vertex_buffer(BufferHandle handle, uint32_t start_vertex, const void* data, uint32_t size); + BufferHandle create_dynamic_index_buffer(uint32_t size, uint16_t flags = BGFX_BUFFER_NONE); + void update_dynamic_index_buffer(BufferHandle handle, uint32_t start_index, const void* data, uint32_t size); + LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc); SamplerHandle create_sampler(bool linear, bool clamp); diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 838d27a..6363bce 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -23,13 +23,22 @@ namespace draco::rendering::rhi #if DRACO_RHI_VALIDATION #define RHI_ASSERT(cond, msg, ...) \ - if (!(cond)) { std::println("[RHI ERROR] " msg, ##__VA_ARGS__); std::abort(); } + do { \ + if (!(cond)) { \ + std::println("[RHI ERROR] " msg, ##__VA_ARGS__); \ + std::abort(); \ + } \ + } while(0) #define RHI_WARN(cond, msg, ...) \ - if (!(cond)) { std::println("[RHI WARNING] " msg, ##__VA_ARGS__); } + do { \ + if (!(cond)) { \ + std::println("[RHI WARNING] " msg, ##__VA_ARGS__); \ + } \ + } while(0) #else - #define RHI_ASSERT(cond, msg, ...) - #define RHI_WARN(cond, msg, ...) + #define RHI_ASSERT(cond, msg, ...) do { (void)(cond); } while(0) + #define RHI_WARN(cond, msg, ...) do { (void)(cond); } while(0) #endif using namespace draco::core::memory; @@ -224,6 +233,8 @@ namespace draco::rendering::rhi bgfx::DynamicVertexBufferHandle dvbh = bgfx::createDynamicVertexBuffer(size, layout->layout); + RHI_ASSERT(bgfx::isValid(dvbh), "Failed to create dynamic vertex buffer"); + Buffer buf; buf.dvbh = dvbh; buf.is_dynamic = true; @@ -233,10 +244,45 @@ namespace draco::rendering::rhi void update_dynamic_vertex_buffer(BufferHandle handle, uint32_t start_vertex, const void* data, uint32_t size) { - // Convert the vertex index into byte offset + auto* buf = get_checked(g_buffers, handle, "Buffer"); + + if (!buf) + return; + + RHI_ASSERT(buf->is_dynamic && !buf->is_index, "Not a dynamic vertex buffer"); + RHI_ASSERT(bgfx::isValid(buf->dvbh), "Invalid dynamic vertex buffer handle"); + + const bgfx::Memory* mem = bgfx::copy(data, size); + + bgfx::update(buf->dvbh, start_vertex, mem); + } + + BufferHandle create_dynamic_index_buffer(uint32_t size, uint16_t flags) + { + bgfx::DynamicIndexBufferHandle ibh = bgfx::createDynamicIndexBuffer(size, flags); + + RHI_ASSERT(bgfx::isValid(ibh), "Invalid dynamic index buffer handle"); + + Buffer buf{}; + buf.is_dynamic = true; + buf.is_index = true; + buf.dibh = ibh; + + return g_buffers.create(buf); + } + + void update_dynamic_index_buffer(BufferHandle handle, uint32_t start_index, const void* data, uint32_t size) + { + auto* buf = get_checked(g_buffers, handle, "DynamicIndexBuffer"); + + if (!buf) + return; + + RHI_ASSERT(buf->is_dynamic && buf->is_index, "Not a dynamic index buffer"); + const bgfx::Memory* mem = bgfx::copy(data, size); - bgfx::update(bgfx::DynamicVertexBufferHandle{static_cast(handle.value)}, start_vertex, mem); + bgfx::update(buf->dibh, start_index, mem); } void destroy_buffer(BufferHandle h) @@ -254,6 +300,9 @@ namespace draco::rendering::rhi if (bgfx::isValid(buf->dvbh)) destroy_later(buf->dvbh); + + if (bgfx::isValid(buf->dibh)) + destroy_later(buf->dibh); g_buffers.destroy(h); } @@ -268,6 +317,11 @@ namespace draco::rendering::rhi layout.add(map_attrib(e.attrib), e.count, map_attrib_type(e.type), e.normalized); } + RHI_WARN(false, "Calculated Stride: {} bytes (Expected: 24)", layout.getStride()); + RHI_WARN(false, "Position Offset: {}", layout.getOffset(map_attrib(Attrib::Position))); + RHI_WARN(false, "Color0 Offset: {}", layout.getOffset(map_attrib(Attrib::Color0))); + RHI_WARN(false, "TexCoord0 Offset: {}", layout.getOffset(map_attrib(Attrib::TexCoord0))); + layout.end(); return g_layouts.create({ layout }); @@ -523,6 +577,7 @@ namespace draco::rendering::rhi { auto* pipeline = get_checked(g_pipelines, p.pipeline, "Pipeline"); auto* vb = get_checked(g_buffers, p.vertex_buffer, "VertexBuffer"); + auto* ib = get_checked(g_buffers, p.index_buffer, "IndexBuffer"); if (!pipeline || !vb) return; @@ -530,17 +585,24 @@ namespace draco::rendering::rhi // Transform matrix (model) bgfx::setTransform(p.model); - // Vertex buffer binding + // Vertex buffer binding with explicit range control if (vb->is_dynamic) - bgfx::setVertexBuffer(0, vb->dvbh); - else - bgfx::setVertexBuffer(0, vb->vbh); + { + // If count is UINT32_MAX, bgfx will fallback to drawing the full buffer automatically + bgfx::setVertexBuffer(0, vb->dvbh, 0, p.vertex_count); + } else { + bgfx::setVertexBuffer(0, vb->vbh, 0, p.vertex_count); + } - // Index buffer binding - if (auto* ib = get_checked(g_buffers, p.index_buffer, "IndexBuffer")) + // Index buffer binding with explicit range control + if (ib && ib->is_index) { - if (ib->is_index) - bgfx::setIndexBuffer(ib->ibh); + if (ib->is_dynamic) + { + bgfx::setIndexBuffer(ib->dibh, 0, p.index_count); + } else { + bgfx::setIndexBuffer(ib->ibh, 0, p.index_count); + } } // Uniforms diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/native/rendering/rhi/vertex.cppm index 5ffa6f4..ece03c4 100644 --- a/engine/native/rendering/rhi/vertex.cppm +++ b/engine/native/rendering/rhi/vertex.cppm @@ -30,19 +30,23 @@ export namespace draco::rendering::rhi { std::vector elements; }; + #pragma pack(push, 1) struct TexturedVertex { float x, y, z; float u, v; uint32_t color; }; + #pragma pack(pop) + + static_assert(sizeof(TexturedVertex) == 24); // Helper to get the standard layout for the current vertex struct inline VertexLayoutDesc get_textured_vertex_layout() { return { .elements = { { Attrib::Position, 3, AttribType::Float }, - { Attrib::Color0, 4, AttribType::Uint8, true }, - { Attrib::TexCoord0, 2, AttribType::Float } + { Attrib::TexCoord0, 2, AttribType::Float }, + { Attrib::Color0, 4, AttribType::Uint8, true } } }; } diff --git a/engine/native/rendering/shaders/fs_quad.sc b/engine/native/rendering/shaders/fs_quad.sc new file mode 100644 index 0000000..9dc0e8b --- /dev/null +++ b/engine/native/rendering/shaders/fs_quad.sc @@ -0,0 +1,12 @@ +$input v_texcoord0, v_color0 + +#include + +SAMPLER2D(s_texColor, 0); + +void main() +{ + vec4 tex = texture2D(s_texColor, v_texcoord0); + + gl_FragColor = tex * v_color0; +} diff --git a/engine/native/rendering/shaders/varying_quad.def.sc b/engine/native/rendering/shaders/varying_quad.def.sc new file mode 100644 index 0000000..a80b601 --- /dev/null +++ b/engine/native/rendering/shaders/varying_quad.def.sc @@ -0,0 +1,6 @@ +vec3 a_position : POSITION; +vec2 a_texcoord0 : TEXCOORD0; +vec4 a_color0 : COLOR0; + +vec2 v_texcoord0 : TEXCOORD0; +vec4 v_color0 : COLOR0; diff --git a/engine/native/rendering/shaders/vs_quad.sc b/engine/native/rendering/shaders/vs_quad.sc new file mode 100644 index 0000000..92a2141 --- /dev/null +++ b/engine/native/rendering/shaders/vs_quad.sc @@ -0,0 +1,21 @@ +$input a_position, a_texcoord0, a_color0 +$output v_texcoord0, v_color0 + +#include + +void main() +{ + // Grab the actual screen dimensions automatically tracked by bgfx + float width = u_viewRect.z; + float height = u_viewRect.w; + + // Convert pixel coordinates [0, width] and [0, height] directly to NDC [-1, 1] + float ndcX = (a_position.x / width) * 2.0 - 1.0; + float ndcY = 1.0 - (a_position.y / height) * 2.0; // Flip Y so 0 is top of the screen + + // Lock Z to 0.0 and W to 1.0 + gl_Position = vec4(ndcX, ndcY, 0.0, 1.0); + + v_texcoord0 = a_texcoord0; + v_color0 = a_color0; +} \ No newline at end of file From 6dcdc0fefcec9ca3b01aa08385b84db9b55f0c17 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 13:36:42 +0500 Subject: [PATCH 20/41] Small stuff --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0634655..a77da15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,3 +225,12 @@ add_custom_command( COMMENT "Copying compiled shaders..." ) + +set(TEST_IMAGE ${CMAKE_SOURCE_DIR}/assets/draconic_logo_no_text.png) + +add_custom_command( + TARGET draconic POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${TEST_IMAGE} + $/test.png +) \ No newline at end of file From 1046f1db944ab0e9aceb6fe4bf408bb76e839cc7 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 14:43:42 +0500 Subject: [PATCH 21/41] Apply some suggestions --- CMakeLists.txt | 4 +- engine/native/CMakeLists.txt | 4 +- engine/native/main/main.cpp | 7 +- engine/native/rendering/mesh/mesh.cpp | 71 ++++++++++++------- .../rendering/rendergraph/rendergraph.cppm | 19 +++-- engine/native/rendering/rhi/rhi_bgfx.cpp | 2 +- engine/native/thirdparty/bgfx | 2 +- engine/native/thirdparty/bimg | 2 +- engine/native/thirdparty/bx | 2 +- 9 files changed, 75 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a77da15..bae5928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,9 @@ endif() project(DraconicEngine LANGUAGES C CXX) -add_compile_options(-mavx2 -mfma) +if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64") + add_compile_options(-mavx2 -mfma) +endif() list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index d8cc6fd..eb2c353 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -7,5 +7,5 @@ target_link_libraries(core PUBLIC definitions math io memory) add_subdirectory(thirdparty SYSTEM) add_subdirectory(platform) add_subdirectory(input) -add_subdirectory(rendering) -add_subdirectory(scene) \ No newline at end of file +add_subdirectory(scene) +add_subdirectory(rendering) \ No newline at end of file diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 2ecbcdc..169df86 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -101,7 +101,7 @@ int main(int argc, char* argv[]) auto pipeline = draco::rendering::rhi::create_pipeline({vsh, fsh, draco::rendering::rhi::PipelineState::WriteRGB | draco::rendering::rhi::PipelineState::WriteAlpha | draco::rendering::rhi::PipelineState::MSAA, draco::rendering::rhi::BlendMode::None, draco::rendering::rhi::DepthTest::Less, draco::rendering::rhi::CullMode::CCW, true}); - auto pipeline_quad = draco::rendering::rhi::create_pipeline({vsh_quad, fsh_quad, draco::rendering::rhi::PipelineState::WriteRGB | draco::rendering::rhi::PipelineState::WriteAlpha | draco::rendering::rhi::PipelineState::MSAA, draco::rendering::rhi::BlendMode::None, draco::rendering::rhi::DepthTest::None, draco::rendering::rhi::CullMode::None, true}); + auto pipeline_quad = draco::rendering::rhi::create_pipeline({vsh_quad, fsh_quad, draco::rendering::rhi::PipelineState::WriteRGB | draco::rendering::rhi::PipelineState::WriteAlpha | draco::rendering::rhi::PipelineState::MSAA, draco::rendering::rhi::BlendMode::Alpha, draco::rendering::rhi::DepthTest::None, draco::rendering::rhi::CullMode::None, true}); draco::rendering::quad_renderer::QuadRenderer quad_renderer; quad_renderer.init(pipeline_quad); @@ -175,6 +175,11 @@ int main(int argc, char* argv[]) int w, h; SDL_GetWindowSize(window, &w, &h); + if (w <= 0 || h <= 0) + { + continue; + } + draco::rendering::rhi::resize((uint16_t)w, (uint16_t)h); draco::rendering::renderer::resize((uint16_t)w, (uint16_t)h); diff --git a/engine/native/rendering/mesh/mesh.cpp b/engine/native/rendering/mesh/mesh.cpp index b633310..6cad6fd 100644 --- a/engine/native/rendering/mesh/mesh.cpp +++ b/engine/native/rendering/mesh/mesh.cpp @@ -34,51 +34,54 @@ namespace draco::rendering::mesh return hash_combine(hash_combine(h1, h2), h3); } - MeshHandle create( - const void* vertex_data, - uint32_t vertex_size, - uint32_t vertex_count, - const std::vector& indices, - rhi::LayoutHandle layout - ) + static void ensure_mesh_layout() + { + if (g_mesh_layout != rhi::InvalidLayout) + return; + + rhi::VertexLayoutDesc desc; + desc.elements = + { + { rhi::Attrib::Position, 3, rhi::AttribType::Float }, + { rhi::Attrib::Normal, 3, rhi::AttribType::Float }, + { rhi::Attrib::TexCoord0,2, rhi::AttribType::Float } + }; + + g_mesh_layout = rhi::create_vertex_layout(desc); + } + + MeshHandle create(const void* vertex_data, uint32_t vertex_size, uint32_t vertex_count, const std::vector& indices, rhi::LayoutHandle layout) { Mesh mesh{}; mesh.vbh = rhi::create_vertex_buffer(vertex_data, vertex_size, layout); - - mesh.ibh = rhi::create_index_buffer( - indices.data(), - static_cast(indices.size() * sizeof(uint32_t)) - ); + mesh.ibh = rhi::create_index_buffer(indices.data(), static_cast(indices.size() * sizeof(uint32_t))); mesh.layout = layout; + mesh.vertex_count = vertex_count; mesh.index_count = static_cast(indices.size()); - mesh.valid = true; + mesh.valid = (mesh.vbh != rhi::InvalidBuffer) && (mesh.ibh != rhi::InvalidBuffer); + + if (!mesh.valid) + { + if (mesh.vbh != rhi::InvalidBuffer) rhi::destroy_buffer(mesh.vbh); + if (mesh.ibh != rhi::InvalidBuffer) rhi::destroy_buffer(mesh.ibh); + return {}; + } return g_meshes.create(mesh); } MeshHandle create_cube() { + ensure_mesh_layout(); + size_t key = 1; if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) return it->second; - if (g_mesh_layout == rhi::InvalidLayout) - { - rhi::VertexLayoutDesc desc; - desc.elements = - { - { rhi::Attrib::Position, 3, rhi::AttribType::Float }, - { rhi::Attrib::Normal, 3, rhi::AttribType::Float }, - { rhi::Attrib::TexCoord0,2, rhi::AttribType::Float } - }; - - g_mesh_layout = rhi::create_vertex_layout(desc); - } - auto v = gen::cube_vertices(); auto i = gen::cube_indices(); @@ -90,6 +93,8 @@ namespace draco::rendering::mesh MeshHandle create_plane(float size) { + ensure_mesh_layout(); + size_t key = hash_mesh_params(1000, 0, size); if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) @@ -106,6 +111,11 @@ namespace draco::rendering::mesh MeshHandle create_sphere(int segments, int rings) { + if (segments < 3 || rings < 2) + return {}; + + ensure_mesh_layout(); + size_t key = hash_combine(std::hash{}(segments), std::hash{}(rings)); if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) @@ -122,6 +132,11 @@ namespace draco::rendering::mesh MeshHandle create_cylinder(int segments, float height) { + if (segments < 3 || height < 0.0f) + return {}; + + ensure_mesh_layout(); + size_t key = hash_mesh_params(2000, segments, height); if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) @@ -138,6 +153,10 @@ namespace draco::rendering::mesh MeshHandle create_capsule(int segments, int rings, float height) { + if (segments < 3 || rings < 2 || height < 0.0f) + return {}; + + ensure_mesh_layout(); size_t key = hash_combine(hash_combine(std::hash{}(segments), std::hash{}(rings)), std::hash{}(height)); if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) diff --git a/engine/native/rendering/rendergraph/rendergraph.cppm b/engine/native/rendering/rendergraph/rendergraph.cppm index c38140d..bd279a6 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cppm +++ b/engine/native/rendering/rendergraph/rendergraph.cppm @@ -40,13 +40,24 @@ export namespace draco::rendering::rendergraph { std::vector dependencies; - rhi::ViewID view; - rhi::FramebufferHandle framebuffer; + rhi::ViewID view = 0; + rhi::FramebufferHandle framebuffer = rhi::InvalidFramebuffer; std::vector packets; - float view_mtx[16]; - float proj_mtx[16]; + float view_mtx[16] = { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + + float proj_mtx[16] = { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; uint16_t width = 0; uint16_t height = 0; diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 6363bce..05206c2 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -117,7 +117,7 @@ namespace draco::rendering::rhi if (!bgfx::init(init)) { - RHI_ASSERT(false, "bgfx initialization failed"); + RHI_WARN(false, "bgfx initialization failed"); return false; } diff --git a/engine/native/thirdparty/bgfx b/engine/native/thirdparty/bgfx index 58faaad..8532b2c 160000 --- a/engine/native/thirdparty/bgfx +++ b/engine/native/thirdparty/bgfx @@ -1 +1 @@ -Subproject commit 58faaadf1cd0f734f6dd56160c6073fc928e3c64 +Subproject commit 8532b2c45d2f4332a9ac9734b85c2ea2253cb8d5 diff --git a/engine/native/thirdparty/bimg b/engine/native/thirdparty/bimg index e429424..9114b47 160000 --- a/engine/native/thirdparty/bimg +++ b/engine/native/thirdparty/bimg @@ -1 +1 @@ -Subproject commit e4294241cd6ee295bac10f9c7b1b92d8a7dc14aa +Subproject commit 9114b47f532ce59cd0c6c9f8932df2c48888d4c1 diff --git a/engine/native/thirdparty/bx b/engine/native/thirdparty/bx index 0f575d5..cac72f6 160000 --- a/engine/native/thirdparty/bx +++ b/engine/native/thirdparty/bx @@ -1 +1 @@ -Subproject commit 0f575d58808ca0837c3754d9902b754db6c25416 +Subproject commit cac72f6cfa0893393ea12692ebfacb4495f8c826 From 833d9a896eabeef4f967ab5f0bba49491cfe443c Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 14:44:06 +0500 Subject: [PATCH 22/41] Forgot these --- engine/native/rendering/rhi/uniform_registry.cppm | 15 ++++++++++++++- engine/native/scene/transform/transform.cppm | 6 +++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/engine/native/rendering/rhi/uniform_registry.cppm b/engine/native/rendering/rhi/uniform_registry.cppm index 22bf79b..bdc9afd 100644 --- a/engine/native/rendering/rhi/uniform_registry.cppm +++ b/engine/native/rendering/rhi/uniform_registry.cppm @@ -23,13 +23,26 @@ export namespace draco::rendering::rhi g_uniform_map[hash] = h; } + inline void unregister_uniform(uint32_t hash, UniformHandle h) + { + auto it = g_uniform_map.find(hash); + + if (it != g_uniform_map.end() && it->second == h) + g_uniform_map.erase(it); + } + + inline void clear_uniform_registry() + { + g_uniform_map.clear(); + } + inline UniformHandle get_uniform(uint32_t hash) { auto it = g_uniform_map.find(hash); if (it == g_uniform_map.end()) return InvalidUniform; - + return it->second; } } diff --git a/engine/native/scene/transform/transform.cppm b/engine/native/scene/transform/transform.cppm index 4e82576..6e3e12c 100644 --- a/engine/native/scene/transform/transform.cppm +++ b/engine/native/scene/transform/transform.cppm @@ -12,9 +12,9 @@ export namespace draco::scene::transform { struct Transform { - float position[3]; - float rotation[3]; // Euler (radians) - float scale[3]; + float position[3] = { 0.0f, 0.0f, 0.0f }; + float rotation[3] = { 0.0f, 0.0f, 0.0f }; // Euler (radians) + float scale[3] = { 1.0f, 1.0f, 1.0f }; bool dirty = true; }; From d28e09fc3e8edd91a409c5214ec525639a8b6f39 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 14:56:32 +0500 Subject: [PATCH 23/41] Minor fixes --- engine/native/core/io/image_loader.cpp | 1 + .../native/rendering/quad_renderer/quad_renderer.cpp | 4 ++-- engine/native/rendering/rhi/rhi_bgfx.cpp | 10 ++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/engine/native/core/io/image_loader.cpp b/engine/native/core/io/image_loader.cpp index 4f799e7..c7ed7a3 100644 --- a/engine/native/core/io/image_loader.cpp +++ b/engine/native/core/io/image_loader.cpp @@ -3,6 +3,7 @@ module; #include #include #include +#include #include #define STB_IMAGE_IMPLEMENTATION diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cpp b/engine/native/rendering/quad_renderer/quad_renderer.cpp index 578cd10..249037f 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cpp +++ b/engine/native/rendering/quad_renderer/quad_renderer.cpp @@ -172,8 +172,8 @@ namespace draco::rendering::quad_renderer { identity_matrix(cam.view); identity_matrix(cam.proj); - float rl = width; - float tb = height; + float rl = std::max(width, 1.0f); + float tb = std::max(height, 1.0f); cam.proj[0] = 2.0f / rl; cam.proj[5] = -2.0f / tb; diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 05206c2..e0ffd85 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -317,11 +317,6 @@ namespace draco::rendering::rhi layout.add(map_attrib(e.attrib), e.count, map_attrib_type(e.type), e.normalized); } - RHI_WARN(false, "Calculated Stride: {} bytes (Expected: 24)", layout.getStride()); - RHI_WARN(false, "Position Offset: {}", layout.getOffset(map_attrib(Attrib::Position))); - RHI_WARN(false, "Color0 Offset: {}", layout.getOffset(map_attrib(Attrib::Color0))); - RHI_WARN(false, "TexCoord0 Offset: {}", layout.getOffset(map_attrib(Attrib::TexCoord0))); - layout.end(); return g_layouts.create({ layout }); @@ -577,10 +572,13 @@ namespace draco::rendering::rhi { auto* pipeline = get_checked(g_pipelines, p.pipeline, "Pipeline"); auto* vb = get_checked(g_buffers, p.vertex_buffer, "VertexBuffer"); - auto* ib = get_checked(g_buffers, p.index_buffer, "IndexBuffer"); + auto* ib = nullptr; if (!pipeline || !vb) return; + + if (p.index_buffer != InvalidBuffer) + ib = get_checked(g_buffers, p.index_buffer, "IndexBuffer"); // Transform matrix (model) bgfx::setTransform(p.model); From 62db8b78f0e688d29f71ecd9b44abc33f83fe721 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 14:57:03 +0500 Subject: [PATCH 24/41] Minor fixes --- CMakeLists.txt | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bae5928..dd47578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,34 +73,33 @@ set(SHADER_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src") if(WIN32) - - set(SHADERC - "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build/win64_vs2022/bin/shadercRelease.exe" - ) + find_program(SHADERC NAMES shadercRelease.exe shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" PATH_SUFFIXES win64_vs2022/bin win64_vs2019/bin win64_mingw-gcc/bin NO_DEFAULT_PATH) set(SHADER_PLATFORM windows) set(SHADER_PROFILE spirv) elseif(APPLE) - - set(SHADERC - "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build/osx-arm64_clang/bin/shadercRelease" - ) + find_program(SHADERC NAMES shadercRelease shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" PATH_SUFFIXES osx-arm64_clang/bin osx-x64_clang/bin NO_DEFAULT_PATH) set(SHADER_PLATFORM osx) set(SHADER_PROFILE metal) elseif(UNIX) - - set(SHADERC - "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build/linux64_gcc/bin/shadercRelease" - ) + find_program(SHADERC NAMES shadercRelease shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" PATH_SUFFIXES linux64_gcc/bin linux64_clang/bin NO_DEFAULT_PATH) set(SHADER_PLATFORM linux) set(SHADER_PROFILE spirv) endif() +if(NOT SHADERC) + message(FATAL_ERROR + "shaderc not found under bgfx/.build" + "Build bgfx tools first (make shaderc in the bgfx directory)" + "or set -DSHADERC=/path/to/shadercRelease when configuring" + ) +endif() + # Shader source files set(VERTEX_SHADER "${SHADER_DIR}/vs.sc") set(FRAGMENT_SHADER "${SHADER_DIR}/fs.sc") From 7183e077fcead94baa54caf878243eba93391a34 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 15:37:56 +0500 Subject: [PATCH 25/41] Fix incorrect declaration --- engine/native/rendering/rhi/rhi_bgfx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index e0ffd85..b0e2472 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -572,7 +572,7 @@ namespace draco::rendering::rhi { auto* pipeline = get_checked(g_pipelines, p.pipeline, "Pipeline"); auto* vb = get_checked(g_buffers, p.vertex_buffer, "VertexBuffer"); - auto* ib = nullptr; + Buffer* ib = nullptr; if (!pipeline || !vb) return; From 1065b03f32ea2356e0db3a0842f2e665cbb0af55 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 19:13:23 +0500 Subject: [PATCH 26/41] Fix Wayland --- CMakeLists.txt | 281 +++++++++++++++++++----------------- engine/native/main/main.cpp | 10 ++ 2 files changed, 162 insertions(+), 129 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd47578..faba5b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,169 +69,192 @@ else() endif() set(SHADER_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") - set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src") if(WIN32) - find_program(SHADERC NAMES shadercRelease.exe shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" PATH_SUFFIXES win64_vs2022/bin win64_vs2019/bin win64_mingw-gcc/bin NO_DEFAULT_PATH) + + find_program(SHADERC NAMES shadercRelease.exe shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" + PATH_SUFFIXES + win64_vs2022/bin + win64_vs2019/bin + win64_mingw-gcc/bin + NO_DEFAULT_PATH + ) set(SHADER_PLATFORM windows) set(SHADER_PROFILE spirv) elseif(APPLE) - find_program(SHADERC NAMES shadercRelease shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" PATH_SUFFIXES osx-arm64_clang/bin osx-x64_clang/bin NO_DEFAULT_PATH) + + find_program(SHADERC NAMES shadercRelease shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" + PATH_SUFFIXES + osx-arm64_clang/bin + osx-x64_clang/bin + NO_DEFAULT_PATH + ) set(SHADER_PLATFORM osx) set(SHADER_PROFILE metal) elseif(UNIX) - find_program(SHADERC NAMES shadercRelease shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" PATH_SUFFIXES linux64_gcc/bin linux64_clang/bin NO_DEFAULT_PATH) + + find_program(SHADERC NAMES shadercRelease shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" + PATH_SUFFIXES + linux64_gcc/bin + linux64_clang/bin + NO_DEFAULT_PATH + ) set(SHADER_PLATFORM linux) set(SHADER_PROFILE spirv) endif() -if(NOT SHADERC) - message(FATAL_ERROR - "shaderc not found under bgfx/.build" - "Build bgfx tools first (make shaderc in the bgfx directory)" - "or set -DSHADERC=/path/to/shadercRelease when configuring" +if(SHADERC) + + message(STATUS "shaderc found: ${SHADERC}") + + set(VERTEX_SHADER "${SHADER_DIR}/vs.sc") + set(FRAGMENT_SHADER "${SHADER_DIR}/fs.sc") + set(VARYING_DEF "${SHADER_DIR}/varying.def.sc") + + set(QUAD_VERTEX_SHADER "${SHADER_DIR}/vs_quad.sc") + set(QUAD_FRAGMENT_SHADER "${SHADER_DIR}/fs_quad.sc") + set(QUAD_VARYING_DEF "${SHADER_DIR}/varying_quad.def.sc") + + set(VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs.bin") + set(FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs.bin") + + set(QUAD_VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs_quad.bin") + set(QUAD_FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs_quad.bin") + + add_custom_command( + OUTPUT ${VERTEX_OUTPUT} + + COMMAND ${SHADERC} + -f ${VERTEX_SHADER} + -o ${VERTEX_OUTPUT} + --type vertex + --platform ${SHADER_PLATFORM} + -p ${SHADER_PROFILE} + --varyingdef ${VARYING_DEF} + -i ${BGFX_INCLUDE} + + DEPENDS + ${VERTEX_SHADER} + ${VARYING_DEF} + + COMMENT "Compiling vertex shader..." ) -endif() -# Shader source files -set(VERTEX_SHADER "${SHADER_DIR}/vs.sc") -set(FRAGMENT_SHADER "${SHADER_DIR}/fs.sc") -set(VARYING_DEF "${SHADER_DIR}/varying.def.sc") -set(QUAD_VERTEX_SHADER "${SHADER_DIR}/vs_quad.sc") -set(QUAD_FRAGMENT_SHADER "${SHADER_DIR}/fs_quad.sc") -set(QUAD_VARYING_DEF "${SHADER_DIR}/varying_quad.def.sc") - -# Output binaries -set(VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs.bin") -set(FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs.bin") -set(QUAD_VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs_quad.bin") -set(QUAD_FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs_quad.bin") - -# Compile vertex shader -add_custom_command( - OUTPUT ${VERTEX_OUTPUT} - - COMMAND ${SHADERC} - -f ${VERTEX_SHADER} - -o ${VERTEX_OUTPUT} - --type vertex - --platform ${SHADER_PLATFORM} - -p ${SHADER_PROFILE} - --varyingdef ${VARYING_DEF} - -i ${BGFX_INCLUDE} - - DEPENDS - ${VERTEX_SHADER} - ${VARYING_DEF} - - COMMENT "Compiling vertex shader..." -) + add_custom_command( + OUTPUT ${FRAGMENT_OUTPUT} -# Compile fragment shader -add_custom_command( - OUTPUT ${FRAGMENT_OUTPUT} - - COMMAND ${SHADERC} - -f ${FRAGMENT_SHADER} - -o ${FRAGMENT_OUTPUT} - --type fragment - --platform ${SHADER_PLATFORM} - -p ${SHADER_PROFILE} - --varyingdef ${VARYING_DEF} - -i ${BGFX_INCLUDE} - - DEPENDS - ${FRAGMENT_SHADER} - ${VARYING_DEF} - - COMMENT "Compiling fragment shader..." -) + COMMAND ${SHADERC} + -f ${FRAGMENT_SHADER} + -o ${FRAGMENT_OUTPUT} + --type fragment + --platform ${SHADER_PLATFORM} + -p ${SHADER_PROFILE} + --varyingdef ${VARYING_DEF} + -i ${BGFX_INCLUDE} -add_custom_command( - OUTPUT ${QUAD_VERTEX_OUTPUT} - - COMMAND ${SHADERC} - -f ${QUAD_VERTEX_SHADER} - -o ${QUAD_VERTEX_OUTPUT} - --type vertex - --platform ${SHADER_PLATFORM} - -p ${SHADER_PROFILE} - --varyingdef ${QUAD_VARYING_DEF} - -i ${BGFX_INCLUDE} - - DEPENDS - ${QUAD_VERTEX_SHADER} - ${QUAD_VARYING_DEF} - - COMMENT "Compiling quad vertex shader..." -) + DEPENDS + ${FRAGMENT_SHADER} + ${VARYING_DEF} -add_custom_command( - OUTPUT ${QUAD_FRAGMENT_OUTPUT} - - COMMAND ${SHADERC} - -f ${QUAD_FRAGMENT_SHADER} - -o ${QUAD_FRAGMENT_OUTPUT} - --type fragment - --platform ${SHADER_PLATFORM} - -p ${SHADER_PROFILE} - --varyingdef ${QUAD_VARYING_DEF} - -i ${BGFX_INCLUDE} - - DEPENDS - ${QUAD_FRAGMENT_SHADER} - ${QUAD_VARYING_DEF} - - COMMENT "Compiling quad fragment shader..." -) + COMMENT "Compiling fragment shader..." + ) -# Shader target -add_custom_target(shaders ALL - DEPENDS - ${VERTEX_OUTPUT} - ${FRAGMENT_OUTPUT} - ${QUAD_VERTEX_OUTPUT} - ${QUAD_FRAGMENT_OUTPUT} -) + add_custom_command( + OUTPUT ${QUAD_VERTEX_OUTPUT} -# Make executable depend on shaders -add_dependencies(draconic shaders) + COMMAND ${SHADERC} + -f ${QUAD_VERTEX_SHADER} + -o ${QUAD_VERTEX_OUTPUT} + --type vertex + --platform ${SHADER_PLATFORM} + -p ${SHADER_PROFILE} + --varyingdef ${QUAD_VARYING_DEF} + -i ${BGFX_INCLUDE} -# Copy shader binaries to executable dir -add_custom_command( - TARGET draconic POST_BUILD + DEPENDS + ${QUAD_VERTEX_SHADER} + ${QUAD_VARYING_DEF} - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${VERTEX_OUTPUT} - $ + COMMENT "Compiling quad vertex shader..." + ) - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${FRAGMENT_OUTPUT} - $ - - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${QUAD_VERTEX_OUTPUT} - $ + add_custom_command( + OUTPUT ${QUAD_FRAGMENT_OUTPUT} - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${QUAD_FRAGMENT_OUTPUT} - $ + COMMAND ${SHADERC} + -f ${QUAD_FRAGMENT_SHADER} + -o ${QUAD_FRAGMENT_OUTPUT} + --type fragment + --platform ${SHADER_PLATFORM} + -p ${SHADER_PROFILE} + --varyingdef ${QUAD_VARYING_DEF} + -i ${BGFX_INCLUDE} - COMMENT "Copying compiled shaders..." -) + DEPENDS + ${QUAD_FRAGMENT_SHADER} + ${QUAD_VARYING_DEF} + + COMMENT "Compiling quad fragment shader..." + ) + + add_custom_target(shaders ALL + DEPENDS + ${VERTEX_OUTPUT} + ${FRAGMENT_OUTPUT} + ${QUAD_VERTEX_OUTPUT} + ${QUAD_FRAGMENT_OUTPUT} + ) + + add_dependencies(draconic shaders) + + add_custom_command( + TARGET draconic POST_BUILD + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${VERTEX_OUTPUT} + $ + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${FRAGMENT_OUTPUT} + $ + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${QUAD_VERTEX_OUTPUT} + $ -set(TEST_IMAGE ${CMAKE_SOURCE_DIR}/assets/draconic_logo_no_text.png) + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${QUAD_FRAGMENT_OUTPUT} + $ + + COMMENT "Copying compiled shaders..." + ) + +else() + + message(WARNING + "shaderc not found. " + "Shaders will not be compiled automatically." + ) + +endif() + +set(TEST_IMAGE + "${CMAKE_SOURCE_DIR}/assets/draconic_logo_no_text.png" +) add_custom_command( TARGET draconic POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy + + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TEST_IMAGE} $/test.png -) \ No newline at end of file + + COMMENT "Copying test texture..." +) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 169df86..e08341e 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -43,6 +43,16 @@ int main(int argc, char* argv[]) return -1; } + // Force SDL to pump initial setup events so Wayland can bake the surface + SDL_SyncWindow(window); + for (int i = 0; i < 10; ++i) { + SDL_Event e; + while (SDL_PollEvent(&e)) { + // Just consuming initial configuration events + } + SDL_Delay(10); + } + draco::input::set_mouse_captured(window, true); auto handles = draco::platform::get_native_handles(window); From 570b52aa3a0d940bb68500ea5c64f921f1f179f5 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 17 May 2026 21:38:48 +0500 Subject: [PATCH 27/41] Wayland works! --- engine/native/main/main.cpp | 2 +- engine/native/platform/linux/linux.cpp | 9 +++++++-- engine/native/platform/mac/mac.mm | 4 ++-- engine/native/platform/platform.cppm | 14 +++++++++++++- engine/native/platform/win32/win32.cpp | 3 ++- engine/native/rendering/CMakeLists.txt | 1 + engine/native/rendering/rhi/rhi.cppm | 3 ++- engine/native/rendering/rhi/rhi_bgfx.cpp | 13 ++++++++++++- engine/native/thirdparty/CMakeLists.txt | 2 +- 9 files changed, 41 insertions(+), 10 deletions(-) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index e08341e..75f3ac3 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char* argv[]) return -1; } - if (!draco::rendering::rhi::init(handles.ndt, handles.nwh, 1280, 720)) { + if (!draco::rendering::rhi::init(handles.ndt, handles.nwh, handles.type, 1280, 720)) { std::println("RHI init failed"); SDL_DestroyWindow(window); SDL_Quit(); diff --git a/engine/native/platform/linux/linux.cpp b/engine/native/platform/linux/linux.cpp index 49c9767..2370325 100644 --- a/engine/native/platform/linux/linux.cpp +++ b/engine/native/platform/linux/linux.cpp @@ -19,16 +19,21 @@ namespace draco::platform { if (std::string_view(driver) == "x11") { frame.ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_X11_DISPLAY_POINTER, nullptr); frame.nwh = (void*)(uintptr_t)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0); + frame.type = NativeWindowType::X11; } else if (std::string_view(driver) == "wayland") { frame.ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_DISPLAY_POINTER, nullptr); frame.nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_SURFACE_POINTER, nullptr); + frame.type = NativeWindowType::Wayland; } else { std::println("No video driver was found"); SDL_Quit(); + frame.type = NativeWindowType::None; } - + + std::println("Video driver: {}", driver); + SDL_GetWindowSize(window, &frame.width, &frame.height); frame.valid = (frame.nwh != nullptr); return frame; } -} \ No newline at end of file +} diff --git a/engine/native/platform/mac/mac.mm b/engine/native/platform/mac/mac.mm index 93bf4f6..885b018 100644 --- a/engine/native/platform/mac/mac.mm +++ b/engine/native/platform/mac/mac.mm @@ -13,12 +13,12 @@ NativeWindowFrame get_native_handles(void* sdl_window_ptr) { SDL_PropertiesID props = SDL_GetWindowProperties(window); - // We grab the NSView pointer for the native window handle frame.nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_COCOA_VIEW_POINTER, nullptr); frame.ndt = nullptr; + frame.type = NativeWindowType::Cocoa; SDL_GetWindowSize(window, &frame.width, &frame.height); frame.valid = (frame.nwh != nullptr); return frame; } -} \ No newline at end of file +} diff --git a/engine/native/platform/platform.cppm b/engine/native/platform/platform.cppm index c395cdf..8895501 100644 --- a/engine/native/platform/platform.cppm +++ b/engine/native/platform/platform.cppm @@ -5,6 +5,16 @@ module; export module platform; export namespace draco::platform { + enum class NativeWindowType + { + None, + Default, + Win32, + Wayland, + X11, + Cocoa + }; + struct NativeWindowFrame { void* nwh = nullptr; // Native Window Handle @@ -14,7 +24,9 @@ export namespace draco::platform { int height = 0; bool valid = false; + + NativeWindowType type = NativeWindowType::None; // Track the type of the native window }; NativeWindowFrame get_native_handles(void* sdl_window_ptr); -} \ No newline at end of file +} diff --git a/engine/native/platform/win32/win32.cpp b/engine/native/platform/win32/win32.cpp index 569259b..1e34f9e 100644 --- a/engine/native/platform/win32/win32.cpp +++ b/engine/native/platform/win32/win32.cpp @@ -15,9 +15,10 @@ namespace draco::platform { frame.nwh = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WIN32_HWND_POINTER, nullptr); frame.ndt = nullptr; // Note: On Windows, ndt isn't required by bgfx for the Vulkan & DX backends which is why we leave it as a nullptr + frame.type = NativeWindowType::Win32; SDL_GetWindowSize(window, &frame.width, &frame.height); frame.valid = (frame.nwh != nullptr); return frame; } -} \ No newline at end of file +} diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index f934122..243fdcb 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -14,6 +14,7 @@ target_link_libraries(rhi PUBLIC core memory + platform bgfx bx ) diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index e9207b7..15cd745 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -13,6 +13,7 @@ module; export module rendering.rhi; import core.memory; +import platform; import rendering.rhi.vertex; export namespace draco::rendering::rhi @@ -188,7 +189,7 @@ export namespace draco::rendering::rhi uint64_t state; }; - bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height); + bool init(void* display_type, void* window_handle, draco::platform::NativeWindowType window_type, uint16_t width, uint16_t height); void resize(uint16_t width, uint16_t height); void shutdown(); diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index b0e2472..33ed921 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -100,7 +100,7 @@ namespace draco::rendering::rhi }); } - bool init(void* display_type, void* window_handle, uint16_t width, uint16_t height) + bool init(void* display_type, void* window_handle, draco::platform::NativeWindowType window_type, uint16_t width, uint16_t height) { g_width = width; g_height = height; @@ -111,6 +111,17 @@ namespace draco::rendering::rhi init.platformData.ndt = display_type; init.platformData.nwh = window_handle; + // Map our internal window type to bgfx's native window handle type + if (window_type == draco::platform::NativeWindowType::Wayland) + { + init.platformData.type = bgfx::NativeWindowHandleType::Wayland; + } + else + { + // Others can work fine with the default type + init.platformData.type = bgfx::NativeWindowHandleType::Default; + } + init.resolution.width = width; init.resolution.height = height; init.resolution.reset = BGFX_RESET_VSYNC; diff --git a/engine/native/thirdparty/CMakeLists.txt b/engine/native/thirdparty/CMakeLists.txt index 672767c..90fa583 100644 --- a/engine/native/thirdparty/CMakeLists.txt +++ b/engine/native/thirdparty/CMakeLists.txt @@ -20,7 +20,7 @@ set(SDL_SHARED OFF CACHE BOOL "" FORCE) set(SDL_STATIC ON CACHE BOOL "" FORCE) set(SDL_TEST OFF CACHE BOOL "" FORCE) set(SDL_WAYLAND ON CACHE BOOL "" FORCE) -set(SDL_LIBDECOR OFF CACHE BOOL "" FORCE) +set(SDL_LIBDECOR ON CACHE BOOL "" FORCE) set(SDL_X11 ON CACHE BOOL "" FORCE) set(SDL_X11_XSCRNSAVER OFF CACHE BOOL "" FORCE) set(SDL_WAYLAND_SHARED OFF CACHE BOOL "" FORCE) From 05c8310f4faa2f2cdaa11cfa4a0aeda25b6d4d3e Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Mon, 18 May 2026 14:45:25 +0500 Subject: [PATCH 28/41] Compile shaderc --- CMakeLists.txt | 241 +++++++----------------- engine/native/thirdparty/CMakeLists.txt | 11 +- 2 files changed, 83 insertions(+), 169 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index faba5b1..3357e2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,182 +68,87 @@ else() target_link_libraries(draconic PRIVATE SDL3::SDL3-static) endif() -set(SHADER_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") -set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src") - -if(WIN32) - - find_program(SHADERC NAMES shadercRelease.exe shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" - PATH_SUFFIXES - win64_vs2022/bin - win64_vs2019/bin - win64_mingw-gcc/bin - NO_DEFAULT_PATH - ) - - set(SHADER_PLATFORM windows) - set(SHADER_PROFILE spirv) - -elseif(APPLE) - - find_program(SHADERC NAMES shadercRelease shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" - PATH_SUFFIXES - osx-arm64_clang/bin - osx-x64_clang/bin - NO_DEFAULT_PATH - ) - - set(SHADER_PLATFORM osx) - set(SHADER_PROFILE metal) - -elseif(UNIX) - - find_program(SHADERC NAMES shadercRelease shaderc PATHS "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/.build" - PATH_SUFFIXES - linux64_gcc/bin - linux64_clang/bin - NO_DEFAULT_PATH - ) - - set(SHADER_PLATFORM linux) - set(SHADER_PROFILE spirv) - +set(SHADER_SRC_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") +set(SHADER_BIN_DIR "${CMAKE_BINARY_DIR}") + +file(MAKE_DIRECTORY ${SHADER_BIN_DIR}) + +if(APPLE) + set(VERTEX_PROFILE "metal") + set(FRAGMENT_PROFILE "metal") + set(SHADER_PLATFORM "osx") +elseif(WIN32) + set(VERTEX_PROFILE "spirv") + set(FRAGMENT_PROFILE "spirv") + set(SHADER_PLATFORM "windows") +else() + set(VERTEX_PROFILE "spirv") + set(FRAGMENT_PROFILE "spirv") + set(SHADER_PLATFORM "linux") endif() -if(SHADERC) - - message(STATUS "shaderc found: ${SHADERC}") - - set(VERTEX_SHADER "${SHADER_DIR}/vs.sc") - set(FRAGMENT_SHADER "${SHADER_DIR}/fs.sc") - set(VARYING_DEF "${SHADER_DIR}/varying.def.sc") - - set(QUAD_VERTEX_SHADER "${SHADER_DIR}/vs_quad.sc") - set(QUAD_FRAGMENT_SHADER "${SHADER_DIR}/fs_quad.sc") - set(QUAD_VARYING_DEF "${SHADER_DIR}/varying_quad.def.sc") - - set(VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs.bin") - set(FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs.bin") - - set(QUAD_VERTEX_OUTPUT "${CMAKE_BINARY_DIR}/vs_quad.bin") - set(QUAD_FRAGMENT_OUTPUT "${CMAKE_BINARY_DIR}/fs_quad.bin") - - add_custom_command( - OUTPUT ${VERTEX_OUTPUT} - - COMMAND ${SHADERC} - -f ${VERTEX_SHADER} - -o ${VERTEX_OUTPUT} - --type vertex - --platform ${SHADER_PLATFORM} - -p ${SHADER_PROFILE} - --varyingdef ${VARYING_DEF} - -i ${BGFX_INCLUDE} - - DEPENDS - ${VERTEX_SHADER} - ${VARYING_DEF} - - COMMENT "Compiling vertex shader..." - ) - - add_custom_command( - OUTPUT ${FRAGMENT_OUTPUT} - - COMMAND ${SHADERC} - -f ${FRAGMENT_SHADER} - -o ${FRAGMENT_OUTPUT} - --type fragment - --platform ${SHADER_PLATFORM} - -p ${SHADER_PROFILE} - --varyingdef ${VARYING_DEF} - -i ${BGFX_INCLUDE} - - DEPENDS - ${FRAGMENT_SHADER} - ${VARYING_DEF} - - COMMENT "Compiling fragment shader..." - ) - - add_custom_command( - OUTPUT ${QUAD_VERTEX_OUTPUT} - - COMMAND ${SHADERC} - -f ${QUAD_VERTEX_SHADER} - -o ${QUAD_VERTEX_OUTPUT} - --type vertex - --platform ${SHADER_PLATFORM} - -p ${SHADER_PROFILE} - --varyingdef ${QUAD_VARYING_DEF} - -i ${BGFX_INCLUDE} - - DEPENDS - ${QUAD_VERTEX_SHADER} - ${QUAD_VARYING_DEF} - - COMMENT "Compiling quad vertex shader..." - ) - - add_custom_command( - OUTPUT ${QUAD_FRAGMENT_OUTPUT} - - COMMAND ${SHADERC} - -f ${QUAD_FRAGMENT_SHADER} - -o ${QUAD_FRAGMENT_OUTPUT} - --type fragment - --platform ${SHADER_PLATFORM} - -p ${SHADER_PROFILE} - --varyingdef ${QUAD_VARYING_DEF} - -i ${BGFX_INCLUDE} - - DEPENDS - ${QUAD_FRAGMENT_SHADER} - ${QUAD_VARYING_DEF} - - COMMENT "Compiling quad fragment shader..." - ) - - add_custom_target(shaders ALL - DEPENDS - ${VERTEX_OUTPUT} - ${FRAGMENT_OUTPUT} - ${QUAD_VERTEX_OUTPUT} - ${QUAD_FRAGMENT_OUTPUT} - ) - - add_dependencies(draconic shaders) - - add_custom_command( - TARGET draconic POST_BUILD - - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${VERTEX_OUTPUT} - $ +set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src") - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${FRAGMENT_OUTPUT} - $ +set(VERTEX_INPUT "${SHADER_SRC_DIR}/vs.sc") +set(VERTEX_OUTPUT "${SHADER_BIN_DIR}/vs.bin") - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${QUAD_VERTEX_OUTPUT} - $ +set(FRAGMENT_INPUT "${SHADER_SRC_DIR}/fs.sc") +set(FRAGMENT_OUTPUT "${SHADER_BIN_DIR}/fs.bin") - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${QUAD_FRAGMENT_OUTPUT} - $ +set(QUAD_VERTEX_INPUT "${SHADER_SRC_DIR}/vs_quad.sc") +set(QUAD_VERTEX_OUTPUT "${SHADER_BIN_DIR}/vs_quad.bin") - COMMENT "Copying compiled shaders..." - ) +set(QUAD_FRAGMENT_INPUT "${SHADER_SRC_DIR}/fs_quad.sc") +set(QUAD_FRAGMENT_OUTPUT "${SHADER_BIN_DIR}/fs_quad.bin") -else() +set(VARYING_DEF "${SHADER_SRC_DIR}/varying.def.sc") +set(QUAD_VARYING_DEF "${SHADER_SRC_DIR}/varying_quad.def.sc") - message(WARNING - "shaderc not found. " - "Shaders will not be compiled automatically." - ) - -endif() +add_custom_command( + TARGET draconic POST_BUILD + COMMENT "Compiling asset pipelines and core engine shaders via native tools..." + + COMMAND $ + -f ${VERTEX_INPUT} + -o ${VERTEX_OUTPUT} + --type vertex + --platform ${SHADER_PLATFORM} + -p ${VERTEX_PROFILE} + --varyingdef ${VARYING_DEF} + -i ${BGFX_INCLUDE} + + COMMAND $ + -f ${FRAGMENT_INPUT} + -o ${FRAGMENT_OUTPUT} + --type fragment + --platform ${SHADER_PLATFORM} + -p ${FRAGMENT_PROFILE} + --varyingdef ${VARYING_DEF} + -i ${BGFX_INCLUDE} + + COMMAND $ + -f ${QUAD_VERTEX_INPUT} + -o ${QUAD_VERTEX_OUTPUT} + --type vertex + --platform ${SHADER_PLATFORM} + -p ${VERTEX_PROFILE} + --varyingdef ${QUAD_VARYING_DEF} + -i ${BGFX_INCLUDE} + + COMMAND $ + -f ${QUAD_FRAGMENT_INPUT} + -o ${QUAD_FRAGMENT_OUTPUT} + --type fragment + --platform ${SHADER_PLATFORM} + -p ${VERTEX_PROFILE} + --varyingdef ${QUAD_VARYING_DEF} + -i ${BGFX_INCLUDE} + + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VERTEX_OUTPUT} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FRAGMENT_OUTPUT} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QUAD_VERTEX_OUTPUT} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QUAD_FRAGMENT_OUTPUT} $ +) set(TEST_IMAGE "${CMAKE_SOURCE_DIR}/assets/draconic_logo_no_text.png" diff --git a/engine/native/thirdparty/CMakeLists.txt b/engine/native/thirdparty/CMakeLists.txt index 90fa583..cd6d8dd 100644 --- a/engine/native/thirdparty/CMakeLists.txt +++ b/engine/native/thirdparty/CMakeLists.txt @@ -1,8 +1,17 @@ set(CMAKE_CXX_SCAN_FOR_MODULES OFF) # Don't scan for modules since it causes issues with deps set(CMAKE_POSITION_INDEPENDENT_CODE ON) +# Fix Clang 20 implicit function declarations in bgfx thirdparty C dependencies by exposing POSIX extensions +if(NOT WIN32) + add_compile_definitions(_GNU_SOURCE) +endif() + set(BGFX_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) -set(BGFX_BUILD_TOOLS ON CACHE BOOL "" FORCE) # We need this for shaderc +set(BGFX_BUILD_TOOLS OFF CACHE BOOL "" FORCE) +set(BGFX_BUILD_TOOLS_SHADER ON CACHE BOOL "" FORCE) +set(BGFX_BUILD_TOOLS_TEXTURE OFF CACHE BOOL "" FORCE) +set(BGFX_BUILD_TOOLS_GEOMETRY OFF CACHE BOOL "" FORCE) + set(BGFX_INSTALL OFF CACHE BOOL "" FORCE) set(BGFX_LIBRARY_TYPE "STATIC") From cb36c8fea98c8f191b7e8493173e47ad16f812a8 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Mon, 18 May 2026 19:48:34 +0500 Subject: [PATCH 29/41] Remove sync window SDL loop so Draco may run on Windows [skip ci] --- engine/native/main/main.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 75f3ac3..890ec3c 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -43,16 +43,6 @@ int main(int argc, char* argv[]) return -1; } - // Force SDL to pump initial setup events so Wayland can bake the surface - SDL_SyncWindow(window); - for (int i = 0; i < 10; ++i) { - SDL_Event e; - while (SDL_PollEvent(&e)) { - // Just consuming initial configuration events - } - SDL_Delay(10); - } - draco::input::set_mouse_captured(window, true); auto handles = draco::platform::get_native_handles(window); From 4540c3a7bfa2919abcf31a4025bbbc7c425465c5 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Tue, 19 May 2026 23:56:42 +0500 Subject: [PATCH 30/41] PR cleanup --- .github/workflows/linux_build.yml | 63 +++++++++++++ CMakeLists.txt | 89 +------------------ cmake/Shaders.cmake | 84 +++++++++++++++++ engine/native/CMakeLists.txt | 9 +- engine/native/core/CMakeLists.txt | 18 +--- .../native/core/memory/handle_registry.cppm | 14 +-- engine/native/input/CMakeLists.txt | 10 --- engine/native/platform/CMakeLists.txt | 2 +- engine/native/rendering/mesh/mesh.cpp | 1 - .../rendering/quad_renderer/quad_renderer.cpp | 1 - .../quad_renderer/quad_renderer.cppm | 1 - engine/native/rendering/renderer/renderer.cpp | 4 - .../native/rendering/renderer/renderer.cppm | 5 -- .../rendering/rendergraph/rendergraph.cppm | 4 - engine/native/rendering/rhi/rhi.cppm | 4 - engine/native/rendering/rhi/rhi_bgfx.cpp | 1 - engine/native/scene/CMakeLists.txt | 56 +----------- 17 files changed, 169 insertions(+), 197 deletions(-) create mode 100644 .github/workflows/linux_build.yml create mode 100644 cmake/Shaders.cmake delete mode 100644 engine/native/input/CMakeLists.txt diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml new file mode 100644 index 0000000..5735abf --- /dev/null +++ b/.github/workflows/linux_build.yml @@ -0,0 +1,63 @@ +name: Draconic Engine Linux Build +description: Build Draconic Engine on Linux using Clang 20 and CMake with Ninja + +on: + push: + branches: + - '**' # Run on every single branch push + pull_request: + branches: + - '**' # Run on every single PR target branch + +jobs: + build-linux: + runs-on: ubuntu-24.04 + + steps: + - name: Checkout Source Code + uses: actions/checkout@v4 + with: + submodules: recursive # Pulls in the thirdparty libs (SDL3, bgfx, etc.) + + - name: Set up Clang Compiler + uses: egor-tensin/setup-clang@v1 + with: + version: 20 # Use Clang 20 for C++23 support + + # Install necessary system dependencies for building on Linux + - name: Install Linux System Dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + cmake \ + ninja-build \ + libasound2-dev \ + libpulse-dev \ + libwayland-dev \ + libx11-dev \ + libxrandr-dev \ + libxinerama-dev \ + libxcursor-dev \ + libxi-dev + + - name: Configure CMake Cache + uses: actions/cache@v4 + with: + path: | + build/.cmake/ + build/CMakeCache.txt + build/CMakeFiles/ + key: ${{ runner.os }}-cmake-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }} + restore-keys: | + ${{ runner.os }}-cmake- + + - name: Configure Build System + run: | + cmake -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_C_COMPILER=clang + + - name: Compile Target Binary + run: | + cmake --build build --config Debug \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 3357e2d..d84cc9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,12 +17,10 @@ endif() project(DraconicEngine LANGUAGES C CXX) -if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64") - add_compile_options(-mavx2 -mfma) -endif() - list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") +include(Shaders) + # Subdirectories for engine libs add_subdirectory(engine/native) @@ -38,7 +36,6 @@ target_link_libraries(draconic core io memory - image_loader platform input rhi @@ -68,87 +65,7 @@ else() target_link_libraries(draconic PRIVATE SDL3::SDL3-static) endif() -set(SHADER_SRC_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") -set(SHADER_BIN_DIR "${CMAKE_BINARY_DIR}") - -file(MAKE_DIRECTORY ${SHADER_BIN_DIR}) - -if(APPLE) - set(VERTEX_PROFILE "metal") - set(FRAGMENT_PROFILE "metal") - set(SHADER_PLATFORM "osx") -elseif(WIN32) - set(VERTEX_PROFILE "spirv") - set(FRAGMENT_PROFILE "spirv") - set(SHADER_PLATFORM "windows") -else() - set(VERTEX_PROFILE "spirv") - set(FRAGMENT_PROFILE "spirv") - set(SHADER_PLATFORM "linux") -endif() - -set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src") - -set(VERTEX_INPUT "${SHADER_SRC_DIR}/vs.sc") -set(VERTEX_OUTPUT "${SHADER_BIN_DIR}/vs.bin") - -set(FRAGMENT_INPUT "${SHADER_SRC_DIR}/fs.sc") -set(FRAGMENT_OUTPUT "${SHADER_BIN_DIR}/fs.bin") - -set(QUAD_VERTEX_INPUT "${SHADER_SRC_DIR}/vs_quad.sc") -set(QUAD_VERTEX_OUTPUT "${SHADER_BIN_DIR}/vs_quad.bin") - -set(QUAD_FRAGMENT_INPUT "${SHADER_SRC_DIR}/fs_quad.sc") -set(QUAD_FRAGMENT_OUTPUT "${SHADER_BIN_DIR}/fs_quad.bin") - -set(VARYING_DEF "${SHADER_SRC_DIR}/varying.def.sc") -set(QUAD_VARYING_DEF "${SHADER_SRC_DIR}/varying_quad.def.sc") - -add_custom_command( - TARGET draconic POST_BUILD - COMMENT "Compiling asset pipelines and core engine shaders via native tools..." - - COMMAND $ - -f ${VERTEX_INPUT} - -o ${VERTEX_OUTPUT} - --type vertex - --platform ${SHADER_PLATFORM} - -p ${VERTEX_PROFILE} - --varyingdef ${VARYING_DEF} - -i ${BGFX_INCLUDE} - - COMMAND $ - -f ${FRAGMENT_INPUT} - -o ${FRAGMENT_OUTPUT} - --type fragment - --platform ${SHADER_PLATFORM} - -p ${FRAGMENT_PROFILE} - --varyingdef ${VARYING_DEF} - -i ${BGFX_INCLUDE} - - COMMAND $ - -f ${QUAD_VERTEX_INPUT} - -o ${QUAD_VERTEX_OUTPUT} - --type vertex - --platform ${SHADER_PLATFORM} - -p ${VERTEX_PROFILE} - --varyingdef ${QUAD_VARYING_DEF} - -i ${BGFX_INCLUDE} - - COMMAND $ - -f ${QUAD_FRAGMENT_INPUT} - -o ${QUAD_FRAGMENT_OUTPUT} - --type fragment - --platform ${SHADER_PLATFORM} - -p ${VERTEX_PROFILE} - --varyingdef ${QUAD_VARYING_DEF} - -i ${BGFX_INCLUDE} - - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VERTEX_OUTPUT} $ - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FRAGMENT_OUTPUT} $ - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QUAD_VERTEX_OUTPUT} $ - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QUAD_FRAGMENT_OUTPUT} $ -) +compile_shaders(draconic) set(TEST_IMAGE "${CMAKE_SOURCE_DIR}/assets/draconic_logo_no_text.png" diff --git a/cmake/Shaders.cmake b/cmake/Shaders.cmake new file mode 100644 index 0000000..2eab735 --- /dev/null +++ b/cmake/Shaders.cmake @@ -0,0 +1,84 @@ +include_guard(GLOBAL) + +set(SHADER_SRC_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") +set(SHADER_BIN_DIR "${CMAKE_BINARY_DIR}") +set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src") + +function(compile_shaders TARGET_NAME) + file(MAKE_DIRECTORY ${SHADER_BIN_DIR}) + + if(APPLE) + set(VERTEX_PROFILE "metal") + set(FRAGMENT_PROFILE "metal") + set(SHADER_PLATFORM "osx") + elseif(WIN32) + set(VERTEX_PROFILE "s_5_0") + set(FRAGMENT_PROFILE "s_5_0") + set(SHADER_PLATFORM "windows") + else() + set(VERTEX_PROFILE "spirv") + set(FRAGMENT_PROFILE "spirv") + set(SHADER_PLATFORM "linux") + endif() + + set(VERTEX_INPUT "${SHADER_SRC_DIR}/vs.sc") + set(VERTEX_OUTPUT "${SHADER_BIN_DIR}/vs.bin") + + set(FRAGMENT_INPUT "${SHADER_SRC_DIR}/fs.sc") + set(FRAGMENT_OUTPUT "${SHADER_BIN_DIR}/fs.bin") + + set(QUAD_VERTEX_INPUT "${SHADER_SRC_DIR}/vs_quad.sc") + set(QUAD_VERTEX_OUTPUT "${SHADER_BIN_DIR}/vs_quad.bin") + + set(QUAD_FRAGMENT_INPUT "${SHADER_SRC_DIR}/fs_quad.sc") + set(QUAD_FRAGMENT_OUTPUT "${SHADER_BIN_DIR}/fs_quad.bin") + + set(VARYING_DEF "${SHADER_SRC_DIR}/varying.def.sc") + set(QUAD_VARYING_DEF "${SHADER_SRC_DIR}/varying_quad.def.sc") + + add_custom_command( + TARGET draconic POST_BUILD + COMMENT "Compiling asset pipelines and core engine shaders via native tools..." + + COMMAND $ + -f ${VERTEX_INPUT} + -o ${VERTEX_OUTPUT} + --type vertex + --platform ${SHADER_PLATFORM} + -p ${VERTEX_PROFILE} + --varyingdef ${VARYING_DEF} + -i ${BGFX_INCLUDE} + + COMMAND $ + -f ${FRAGMENT_INPUT} + -o ${FRAGMENT_OUTPUT} + --type fragment + --platform ${SHADER_PLATFORM} + -p ${FRAGMENT_PROFILE} + --varyingdef ${VARYING_DEF} + -i ${BGFX_INCLUDE} + + COMMAND $ + -f ${QUAD_VERTEX_INPUT} + -o ${QUAD_VERTEX_OUTPUT} + --type vertex + --platform ${SHADER_PLATFORM} + -p ${VERTEX_PROFILE} + --varyingdef ${QUAD_VARYING_DEF} + -i ${BGFX_INCLUDE} + + COMMAND $ + -f ${QUAD_FRAGMENT_INPUT} + -o ${QUAD_FRAGMENT_OUTPUT} + --type fragment + --platform ${SHADER_PLATFORM} + -p ${FRAGMENT_PROFILE} + --varyingdef ${QUAD_VARYING_DEF} + -i ${BGFX_INCLUDE} + + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VERTEX_OUTPUT} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FRAGMENT_OUTPUT} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QUAD_VERTEX_OUTPUT} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QUAD_FRAGMENT_OUTPUT} $ + ) +endfunction() diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index eb2c353..66b6320 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -6,6 +6,11 @@ target_link_libraries(core PUBLIC definitions math io memory) add_subdirectory(thirdparty SYSTEM) add_subdirectory(platform) -add_subdirectory(input) -add_subdirectory(scene) + +add_modules_library(input) +target_link_libraries(input PRIVATE SDL3::SDL3-static) + +add_modules_library(scene) +target_link_libraries(scene PUBLIC renderable) + add_subdirectory(rendering) \ No newline at end of file diff --git a/engine/native/core/CMakeLists.txt b/engine/native/core/CMakeLists.txt index 8dfcb0a..f7d2373 100644 --- a/engine/native/core/CMakeLists.txt +++ b/engine/native/core/CMakeLists.txt @@ -6,20 +6,4 @@ add_modules_library(io) target_link_libraries(io PUBLIC definitions stb_image) add_modules_library(memory) -target_link_libraries(memory PUBLIC definitions) - -add_library(image_loader) - -target_sources(image_loader - PUBLIC - FILE_SET CXX_MODULES FILES io/image_loader.cppm - PRIVATE - io/image_loader.cpp -) - -target_link_libraries(image_loader - PRIVATE - stb_image - io - definitions -) \ No newline at end of file +target_link_libraries(memory PUBLIC definitions) \ No newline at end of file diff --git a/engine/native/core/memory/handle_registry.cppm b/engine/native/core/memory/handle_registry.cppm index bf18bf6..6545d42 100644 --- a/engine/native/core/memory/handle_registry.cppm +++ b/engine/native/core/memory/handle_registry.cppm @@ -11,29 +11,29 @@ export namespace draco::core::memory class HandleRegistry { public: - using Handle = Handle; + using HandleType = Handle; - Handle create(const T& value) + HandleType create(const T& value) { return storage.create(value); } - bool valid(Handle h) const + bool valid(HandleType h) const { return storage.valid(h); } - T* get(Handle h) + T* get(HandleType h) { return storage.get(h); } - const T* get(Handle h) const + const T* get(HandleType h) const { return storage.get(h); } - void destroy(Handle h) + void destroy(HandleType h) { storage.destroy(h); } @@ -46,4 +46,4 @@ export namespace draco::core::memory private: SlotArray storage; }; -} \ No newline at end of file +} diff --git a/engine/native/input/CMakeLists.txt b/engine/native/input/CMakeLists.txt deleted file mode 100644 index f7cc136..0000000 --- a/engine/native/input/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_library(input) - -target_sources(input - PUBLIC - FILE_SET CXX_MODULES FILES input.cppm - PRIVATE - input.cpp -) - -target_link_libraries(input PRIVATE SDL3::SDL3-static) \ No newline at end of file diff --git a/engine/native/platform/CMakeLists.txt b/engine/native/platform/CMakeLists.txt index 66d16d4..bee2303 100644 --- a/engine/native/platform/CMakeLists.txt +++ b/engine/native/platform/CMakeLists.txt @@ -16,7 +16,7 @@ else() endif() endif() -add_library(platform SHARED) +add_library(platform STATIC) target_sources(platform PUBLIC FILE_SET CXX_MODULES diff --git a/engine/native/rendering/mesh/mesh.cpp b/engine/native/rendering/mesh/mesh.cpp index 6cad6fd..0ceb576 100644 --- a/engine/native/rendering/mesh/mesh.cpp +++ b/engine/native/rendering/mesh/mesh.cpp @@ -4,7 +4,6 @@ module; #include #include #include -#include module rendering.mesh; diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cpp b/engine/native/rendering/quad_renderer/quad_renderer.cpp index 249037f..5754fe9 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cpp +++ b/engine/native/rendering/quad_renderer/quad_renderer.cpp @@ -1,6 +1,5 @@ module; -#include #include #include diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cppm b/engine/native/rendering/quad_renderer/quad_renderer.cppm index 58edc8a..094a010 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cppm +++ b/engine/native/rendering/quad_renderer/quad_renderer.cppm @@ -2,7 +2,6 @@ module; #include #include -#include export module rendering.quad_renderer; diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp index 92b45e8..0cd69a1 100644 --- a/engine/native/rendering/renderer/renderer.cpp +++ b/engine/native/rendering/renderer/renderer.cpp @@ -1,12 +1,8 @@ module; #include -#include -#include #include -#include #include -#include #include #include diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/native/rendering/renderer/renderer.cppm index 4259ef2..6c74ff5 100644 --- a/engine/native/rendering/renderer/renderer.cppm +++ b/engine/native/rendering/renderer/renderer.cppm @@ -1,12 +1,7 @@ module; -#include #include -#include #include -#include -#include -#include #include diff --git a/engine/native/rendering/rendergraph/rendergraph.cppm b/engine/native/rendering/rendergraph/rendergraph.cppm index bd279a6..b7f1263 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cppm +++ b/engine/native/rendering/rendergraph/rendergraph.cppm @@ -1,12 +1,8 @@ module; #include -#include #include #include -#include -#include -#include export module rendering.rendergraph; diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 15cd745..ad67fa3 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -1,11 +1,7 @@ module; #include -#include -#include #include -#include -#include #include #include diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index 33ed921..acf6a1b 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -4,7 +4,6 @@ module; #include #include #include -#include #include #include #include diff --git a/engine/native/scene/CMakeLists.txt b/engine/native/scene/CMakeLists.txt index dcf74ce..765f3cf 100644 --- a/engine/native/scene/CMakeLists.txt +++ b/engine/native/scene/CMakeLists.txt @@ -1,61 +1,11 @@ add_modules_library(camera) -target_sources(camera - PUBLIC - FILE_SET CXX_MODULES FILES - camera/camera_controller.cppm - - PRIVATE - camera/camera_controller.cpp -) - -target_link_libraries(camera - PUBLIC - input - renderer - bx -) +target_link_libraries(camera PUBLIC input renderer bx) add_modules_library(transform) -target_sources(transform - PUBLIC - FILE_SET CXX_MODULES FILES - transform/transform.cppm - - PRIVATE - transform/transform.cpp -) - -target_link_libraries(transform - PUBLIC - bx -) +target_link_libraries(transform PUBLIC bx) add_modules_library(renderable) -target_sources(renderable - PUBLIC - FILE_SET CXX_MODULES FILES - renderable/renderable.cppm -) - -target_link_libraries(renderable - PUBLIC - mesh - transform - material -) - -add_library(scene) - -target_sources(scene - PUBLIC - FILE_SET CXX_MODULES FILES - scene.cppm -) - -target_link_libraries(scene - PUBLIC - renderable -) \ No newline at end of file +target_link_libraries(renderable PUBLIC mesh transform material) From c40f59c14e8f8e8328271067f28825a413211739 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Wed, 20 May 2026 00:00:31 +0500 Subject: [PATCH 31/41] Update CMake version --- .github/workflows/linux_build.yml | 76 ++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 21 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 5735abf..9a9a3bb 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -1,13 +1,16 @@ + name: Draconic Engine Linux Build + description: Build Draconic Engine on Linux using Clang 20 and CMake with Ninja on: push: branches: - - '**' # Run on every single branch push + - '**' + pull_request: branches: - - '**' # Run on every single PR target branch + - '**' jobs: build-linux: @@ -17,47 +20,78 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 with: - submodules: recursive # Pulls in the thirdparty libs (SDL3, bgfx, etc.) + submodules: recursive - name: Set up Clang Compiler uses: egor-tensin/setup-clang@v1 with: - version: 20 # Use Clang 20 for C++23 support + version: 20 + + - name: Install CMake 4.3.0 + run: | + wget https://github.com/Kitware/CMake/releases/download/v4.3.0/cmake-4.3.0-linux-x86_64.tar.gz + + tar -xzf cmake-4.3.0-linux-x86_64.tar.gz + + echo "$(pwd)/cmake-4.3.0-linux-x86_64/bin" >> $GITHUB_PATH - # Install necessary system dependencies for building on Linux - name: Install Linux System Dependencies run: | sudo apt-get update + sudo apt-get install -y \ - cmake \ ninja-build \ + llvm-20 \ + llvm-20-tools \ + clang-tools-20 \ + libc++-20-dev \ + libc++abi-20-dev \ + libgl1-mesa-dev \ + libegl1-mesa-dev \ + libwayland-egl1-mesa \ libasound2-dev \ libpulse-dev \ libwayland-dev \ libx11-dev \ + libxext-dev \ + libxrender-dev \ libxrandr-dev \ libxinerama-dev \ libxcursor-dev \ - libxi-dev + libxi-dev \ + libxtst-dev - - name: Configure CMake Cache - uses: actions/cache@v4 - with: - path: | - build/.cmake/ - build/CMakeCache.txt - build/CMakeFiles/ - key: ${{ runner.os }}-cmake-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }} - restore-keys: | - ${{ runner.os }}-cmake- + echo "/usr/lib/llvm-20/bin" >> $GITHUB_PATH + + - name: Verify LLVM Toolchain + run: | + which clang + which clang++ + which clang-scan-deps + + clang --version + clang++ --version + clang-scan-deps --version - name: Configure Build System run: | - cmake -B build -G Ninja \ - -DCMAKE_BUILD_TYPE=Debug \ + rm -rf build/debug + + cmake --preset debug \ + -B build/debug \ + -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_C_COMPILER=clang + -DCMAKE_CXX_FLAGS="-stdlib=libc++" \ + -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" - name: Compile Target Binary run: | - cmake --build build --config Debug \ No newline at end of file + cmake --build build/debug -j$(nproc) + + - name: Upload Engine Artifact + uses: actions/upload-artifact@v4 + with: + name: draconic-linux-debug + path: build/debug/draconic + if-no-files-found: error + retention-days: 7 From abad3ef00a311db3162183910f0973afc06845fa Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Wed, 20 May 2026 01:39:34 +0500 Subject: [PATCH 32/41] Add missing include --- .github/workflows/linux_build.yml | 6 +++--- engine/native/rendering/quad_renderer/quad_renderer.cpp | 1 + engine/native/rendering/renderer/renderer.cpp | 1 + engine/native/rendering/rhi/rhi.cppm | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 9a9a3bb..0119aa6 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -81,8 +81,8 @@ jobs: -B build/debug \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_CXX_FLAGS="-stdlib=libc++" \ - -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" + -DCMAKE_CXX_FLAGS="-stdlib=libc++ -mavx2 -mfma" \ + -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -mavx2 -mfma" - name: Compile Target Binary run: | @@ -92,6 +92,6 @@ jobs: uses: actions/upload-artifact@v4 with: name: draconic-linux-debug - path: build/debug/draconic + path: build/debug/ if-no-files-found: error retention-days: 7 diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cpp b/engine/native/rendering/quad_renderer/quad_renderer.cpp index 5754fe9..dab5e89 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cpp +++ b/engine/native/rendering/quad_renderer/quad_renderer.cpp @@ -1,6 +1,7 @@ module; #include +#include #include #include diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp index 0cd69a1..a8ec969 100644 --- a/engine/native/rendering/renderer/renderer.cpp +++ b/engine/native/rendering/renderer/renderer.cpp @@ -4,6 +4,7 @@ module; #include #include #include +#include #include #include diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index ad67fa3..5441bdd 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -3,6 +3,7 @@ module; #include #include #include +#include #include From e94b9de4abc76571a3491ded01cec1fcc52e700d Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Wed, 20 May 2026 13:13:56 +0500 Subject: [PATCH 33/41] Add caching to CI --- .github/workflows/linux_build.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 0119aa6..3cab582 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -1,4 +1,3 @@ - name: Draconic Engine Linux Build description: Build Draconic Engine on Linux using Clang 20 and CMake with Ninja @@ -7,7 +6,6 @@ on: push: branches: - '**' - pull_request: branches: - '**' @@ -27,18 +25,26 @@ jobs: with: version: 20 + - name: Cache Build Directory + uses: actions/cache@v4 + with: + path: build/debug + # This generates a unique key based on the configuration + # If a CMakeLists.txt or source file changes, it will look for the closest match + key: ${{ runner.os }}-draconic-build-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-draconic-build-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}- + ${{ runner.os }}-draconic-build- + - name: Install CMake 4.3.0 run: | wget https://github.com/Kitware/CMake/releases/download/v4.3.0/cmake-4.3.0-linux-x86_64.tar.gz - tar -xzf cmake-4.3.0-linux-x86_64.tar.gz - echo "$(pwd)/cmake-4.3.0-linux-x86_64/bin" >> $GITHUB_PATH - name: Install Linux System Dependencies run: | sudo apt-get update - sudo apt-get install -y \ ninja-build \ llvm-20 \ @@ -60,7 +66,6 @@ jobs: libxcursor-dev \ libxi-dev \ libxtst-dev - echo "/usr/lib/llvm-20/bin" >> $GITHUB_PATH - name: Verify LLVM Toolchain @@ -68,21 +73,22 @@ jobs: which clang which clang++ which clang-scan-deps - clang --version clang++ --version clang-scan-deps --version - name: Configure Build System run: | - rm -rf build/debug - + # REMOVED 'rm -rf build/debug' so the cache doesn't get instantly nuked! + cmake --preset debug \ -B build/debug \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_CXX_FLAGS="-stdlib=libc++ -mavx2 -mfma" \ - -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -mavx2 -mfma" + -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -mavx2 -mfma" \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ + -DCMAKE_INSTALL_RPATH="\$ORIGIN:\$ORIGIN/engine/native" - name: Compile Target Binary run: | @@ -94,4 +100,4 @@ jobs: name: draconic-linux-debug path: build/debug/ if-no-files-found: error - retention-days: 7 + retention-days: 7 \ No newline at end of file From ff5480fd9cd6d2337895a2f98656821a38ab7399 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Wed, 20 May 2026 20:31:38 +0500 Subject: [PATCH 34/41] Fix compiler error --- .github/workflows/linux_build.yml | 40 +++++++++++++------------- CMakeLists.txt | 1 + engine/native/core/math/constants.cppm | 1 + engine/native/core/memory/memory.cppm | 5 ---- engine/native/core/memory/root.cppm | 3 ++ 5 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 engine/native/core/memory/memory.cppm diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 3cab582..73f44ac 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -1,4 +1,4 @@ -name: Draconic Engine Linux Build +name: 🐧 Linux Builds description: Build Draconic Engine on Linux using Clang 20 and CMake with Ninja @@ -25,25 +25,12 @@ jobs: with: version: 20 - - name: Cache Build Directory - uses: actions/cache@v4 - with: - path: build/debug - # This generates a unique key based on the configuration - # If a CMakeLists.txt or source file changes, it will look for the closest match - key: ${{ runner.os }}-draconic-build-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-draconic-build-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}- - ${{ runner.os }}-draconic-build- - - - name: Install CMake 4.3.0 + - name: Install System Dependencies run: | wget https://github.com/Kitware/CMake/releases/download/v4.3.0/cmake-4.3.0-linux-x86_64.tar.gz tar -xzf cmake-4.3.0-linux-x86_64.tar.gz echo "$(pwd)/cmake-4.3.0-linux-x86_64/bin" >> $GITHUB_PATH - - name: Install Linux System Dependencies - run: | sudo apt-get update sudo apt-get install -y \ ninja-build \ @@ -77,16 +64,25 @@ jobs: clang++ --version clang-scan-deps --version + - name: Cache Build Artifacts + uses: actions/cache@v4 + with: + path: | + build/debug/.ninja_deps + build/debug/.ninja_log + build/debug/CMakeFiles + key: ${{ runner.os }}-draconic-build-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake', '**/CMakePresets.json') }} + restore-keys: | + ${{ runner.os }}-draconic-build- + - name: Configure Build System run: | - # REMOVED 'rm -rf build/debug' so the cache doesn't get instantly nuked! - cmake --preset debug \ -B build/debug \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_CXX_FLAGS="-stdlib=libc++ -mavx2 -mfma" \ - -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -mavx2 -mfma" \ + -DCMAKE_CXX_FLAGS="-stdlib=libc++" \ + -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ -DCMAKE_INSTALL_RPATH="\$ORIGIN:\$ORIGIN/engine/native" @@ -94,10 +90,14 @@ jobs: run: | cmake --build build/debug -j$(nproc) + - name: Run Unit Tests + run: | + ctest --test-dir build/debug --output-on-failure -j$(nproc) + - name: Upload Engine Artifact uses: actions/upload-artifact@v4 with: - name: draconic-linux-debug + name: linux_debug path: build/debug/ if-no-files-found: error retention-days: 7 \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index d84cc9c..11f41d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ project(DraconicEngine LANGUAGES C CXX) list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") +include(Compiler) include(Shaders) # Subdirectories for engine libs diff --git a/engine/native/core/math/constants.cppm b/engine/native/core/math/constants.cppm index 241eff6..870b4a7 100644 --- a/engine/native/core/math/constants.cppm +++ b/engine/native/core/math/constants.cppm @@ -2,6 +2,7 @@ module; #include #include +#include export module core.math.constants; import core.defs; diff --git a/engine/native/core/memory/memory.cppm b/engine/native/core/memory/memory.cppm deleted file mode 100644 index 476e065..0000000 --- a/engine/native/core/memory/memory.cppm +++ /dev/null @@ -1,5 +0,0 @@ -export module core.memory; - -export import core.memory.handle; -export import core.memory.slot_array; -export import core.memory.handle_registry; \ No newline at end of file diff --git a/engine/native/core/memory/root.cppm b/engine/native/core/memory/root.cppm index 6928cd7..8a4a06d 100644 --- a/engine/native/core/memory/root.cppm +++ b/engine/native/core/memory/root.cppm @@ -1,6 +1,9 @@ module; export module core.memory; +export import core.memory.handle; +export import core.memory.slot_array; +export import core.memory.handle_registry; export import core.memory.allocator; export import core.memory.fixedAllocator; export import core.memory.pageAllocator; From f8c737cbe42054ace008a3ad9f38b92f66674b5e Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Thu, 21 May 2026 13:54:18 +0500 Subject: [PATCH 35/41] Apply suggestions --- .github/workflows/linux_build.yml | 2 - CMakeLists.txt | 13 ++--- cmake/Compiler.cmake | 17 +++---- engine/native/CMakeLists.txt | 15 ++---- engine/native/core/CMakeLists.txt | 7 ++- engine/native/rendering/CMakeLists.txt | 63 ++----------------------- engine/native/scene/CMakeLists.txt | 8 +--- engine/native/thirdparty/CMakeLists.txt | 8 ---- 8 files changed, 26 insertions(+), 107 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 73f44ac..cc969b5 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -81,8 +81,6 @@ jobs: -B build/debug \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_CXX_FLAGS="-stdlib=libc++" \ - -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ -DCMAKE_INSTALL_RPATH="\$ORIGIN:\$ORIGIN/engine/native" diff --git a/CMakeLists.txt b/CMakeLists.txt index 11f41d5..745e22f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 4.0) +project(DraconicEngine LANGUAGES C CXX) + find_package(Git QUIET) +find_package(Threads REQUIRED) if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git") message(STATUS "Updating submodules...") @@ -15,11 +18,11 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git") endif() endif() -project(DraconicEngine LANGUAGES C CXX) - list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") +include(CTest) include(Compiler) +include(Modules) include(Shaders) # Subdirectories for engine libs @@ -28,10 +31,6 @@ add_subdirectory(engine/native) # Main Executable add_executable(draconic engine/native/main/main.cpp) -enable_modules(draconic) - -set_target_properties(draconic PROPERTIES CXX_SCAN_FOR_MODULES ON) - target_link_libraries(draconic PRIVATE core @@ -54,8 +53,6 @@ target_link_libraries(draconic bimg ) -find_package(Threads REQUIRED) - if(UNIX AND NOT APPLE) target_link_libraries(draconic PRIVATE SDL3::SDL3-static Threads::Threads dl) target_link_options(draconic PRIVATE -Wl,--whole-archive $ -Wl,--no-whole-archive) diff --git a/cmake/Compiler.cmake b/cmake/Compiler.cmake index 95947eb..9540cfd 100644 --- a/cmake/Compiler.cmake +++ b/cmake/Compiler.cmake @@ -20,14 +20,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") # TODO: Make SIMD level configurable or detect at runtime add_compile_options(-mavx2 -mfma) endif() - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.0) - message(FATAL_ERROR "GCC version must be at least 14 for C++23 support") - endif() - endif() - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0) - message(FATAL_ERROR "Clang version must be at least 18 for C++23 support") - endif() - endif() -endif() \ No newline at end of file +endif() + +# Fix Clang 20 implicit function declarations in bgfx thirdparty C dependencies by exposing POSIX extensions +if(NOT WIN32) + add_compile_definitions(_GNU_SOURCE) +endif() diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index 9a6376f..1335ddf 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -1,16 +1,11 @@ -include(Compiler) -include(Modules) - add_modules_library(core SHARED) -target_link_libraries(core PUBLIC definitions math io memory) - -add_subdirectory(thirdparty SYSTEM) -add_subdirectory(platform) - add_modules_library(input) -target_link_libraries(input PRIVATE SDL3::SDL3-static) - add_modules_library(scene) + +target_link_libraries(core PUBLIC definitions math io memory) +target_link_libraries(input PRIVATE SDL3::SDL3-static) target_link_libraries(scene PUBLIC renderable) +add_subdirectory(thirdparty SYSTEM) +add_subdirectory(platform) add_subdirectory(rendering) diff --git a/engine/native/core/CMakeLists.txt b/engine/native/core/CMakeLists.txt index 7f177b5..af79a2a 100644 --- a/engine/native/core/CMakeLists.txt +++ b/engine/native/core/CMakeLists.txt @@ -1,9 +1,8 @@ add_modules_library(definitions PIC) add_modules_library(math) -target_link_libraries(math PUBLIC definitions) - add_modules_library(io) -target_link_libraries(io PUBLIC definitions stb_image) - add_modules_library(memory) + +target_link_libraries(math PUBLIC definitions) +target_link_libraries(io PUBLIC definitions stb_image) target_link_libraries(memory PUBLIC definitions) diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index 243fdcb..1d95f20 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -1,14 +1,9 @@ add_modules_library(rhi) - -target_sources(rhi - PUBLIC - FILE_SET CXX_MODULES FILES - rhi/vertex.cppm - rhi/rhi.cppm - rhi/uniform_registry.cppm - PRIVATE - rhi/rhi_bgfx.cpp -) +add_modules_library(rendergraph) +add_modules_library(renderer) +add_modules_library(mesh) +add_modules_library(material) +add_modules_library(quad_renderer) target_link_libraries(rhi PUBLIC @@ -19,71 +14,23 @@ target_link_libraries(rhi bx ) -add_modules_library(rendergraph) - -target_sources(rendergraph - PUBLIC - FILE_SET CXX_MODULES FILES - rendergraph/rendergraph.cppm - PRIVATE - rendergraph/rendergraph.cpp -) - target_link_libraries(rendergraph PUBLIC rhi bx ) -add_modules_library(renderer) - -target_sources(renderer - PUBLIC - FILE_SET CXX_MODULES FILES - renderer/renderer.cppm - PRIVATE - renderer/renderer.cpp -) - -add_modules_library(mesh) - -target_sources(mesh - PUBLIC - FILE_SET CXX_MODULES FILES - mesh/mesh.cppm - PRIVATE - mesh/mesh.cpp -) - target_link_libraries(mesh PUBLIC memory rhi ) -add_modules_library(material) - -target_sources(material - PUBLIC - FILE_SET CXX_MODULES FILES - material/material.cppm -) - target_link_libraries(material PUBLIC rhi ) -add_modules_library(quad_renderer) - -target_sources(quad_renderer - PUBLIC - FILE_SET CXX_MODULES FILES - quad_renderer/quad_renderer.cppm - PRIVATE - quad_renderer/quad_renderer.cpp -) - target_link_libraries(quad_renderer PUBLIC rhi diff --git a/engine/native/scene/CMakeLists.txt b/engine/native/scene/CMakeLists.txt index 765f3cf..58796c5 100644 --- a/engine/native/scene/CMakeLists.txt +++ b/engine/native/scene/CMakeLists.txt @@ -1,11 +1,7 @@ add_modules_library(camera) - -target_link_libraries(camera PUBLIC input renderer bx) - add_modules_library(transform) - -target_link_libraries(transform PUBLIC bx) - add_modules_library(renderable) +target_link_libraries(camera PUBLIC input renderer bx) +target_link_libraries(transform PUBLIC bx) target_link_libraries(renderable PUBLIC mesh transform material) diff --git a/engine/native/thirdparty/CMakeLists.txt b/engine/native/thirdparty/CMakeLists.txt index cd6d8dd..ec93297 100644 --- a/engine/native/thirdparty/CMakeLists.txt +++ b/engine/native/thirdparty/CMakeLists.txt @@ -1,11 +1,3 @@ -set(CMAKE_CXX_SCAN_FOR_MODULES OFF) # Don't scan for modules since it causes issues with deps -set(CMAKE_POSITION_INDEPENDENT_CODE ON) - -# Fix Clang 20 implicit function declarations in bgfx thirdparty C dependencies by exposing POSIX extensions -if(NOT WIN32) - add_compile_definitions(_GNU_SOURCE) -endif() - set(BGFX_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) set(BGFX_BUILD_TOOLS OFF CACHE BOOL "" FORCE) set(BGFX_BUILD_TOOLS_SHADER ON CACHE BOOL "" FORCE) From 9b61dd6e8c4899a494d12e9880e0d46741fc84ef Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Thu, 21 May 2026 23:37:05 +0500 Subject: [PATCH 36/41] Use our own types & constants --- .github/workflows/linux_build.yml | 14 +- CMakeLists.txt | 1 + cmake/Compiler.cmake | 4 + engine/native/CMakeLists.txt | 2 +- engine/native/core/CMakeLists.txt | 2 +- engine/native/core/io/filesystem.cpp | 7 +- engine/native/core/io/filesystem.cppm | 5 +- engine/native/core/io/image_loader.cpp | 15 +- engine/native/core/io/image_loader.cppm | 10 +- engine/native/core/math/constants.cppm | 4 +- engine/native/core/memory/handle.cppm | 28 ++-- engine/native/core/memory/slot_array.cppm | 14 +- engine/native/input/input.cpp | 18 +-- engine/native/input/input.cppm | 10 +- engine/native/main/main.cpp | 27 ++-- engine/native/platform/CMakeLists.txt | 2 +- engine/native/platform/linux/linux.cpp | 5 +- engine/native/rendering/CMakeLists.txt | 3 + .../native/rendering/material/material.cppm | 10 +- engine/native/rendering/mesh/mesh.cpp | 131 +++++++++--------- engine/native/rendering/mesh/mesh.cppm | 28 ++-- .../rendering/quad_renderer/quad_renderer.cpp | 37 ++--- .../quad_renderer/quad_renderer.cppm | 37 ++--- engine/native/rendering/renderer/renderer.cpp | 20 +-- .../native/rendering/renderer/renderer.cppm | 24 ++-- .../rendering/rendergraph/rendergraph.cppm | 18 +-- engine/native/rendering/rhi/rhi.cppm | 89 ++++++------ engine/native/rendering/rhi/rhi_bgfx.cpp | 54 ++++---- engine/native/scene/CMakeLists.txt | 6 +- .../native/scene/camera/camera_controller.cpp | 8 +- .../scene/camera/camera_controller.cppm | 15 +- engine/native/scene/transform/transform.cpp | 22 +-- engine/native/scene/transform/transform.cppm | 17 +-- engine/native/thirdparty/CMakeLists.txt | 52 ++++--- 34 files changed, 391 insertions(+), 348 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index cc969b5..cf3f90b 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -34,6 +34,7 @@ jobs: sudo apt-get update sudo apt-get install -y \ ninja-build \ + ccache \ llvm-20 \ llvm-20-tools \ clang-tools-20 \ @@ -65,15 +66,12 @@ jobs: clang-scan-deps --version - name: Cache Build Artifacts - uses: actions/cache@v4 + uses: hendrikmuhs/ccache-action@v1.2 with: - path: | - build/debug/.ninja_deps - build/debug/.ninja_log - build/debug/CMakeFiles - key: ${{ runner.os }}-draconic-build-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake', '**/CMakePresets.json') }} + key: ${{ runner.os }}-ccache-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }} restore-keys: | - ${{ runner.os }}-draconic-build- + ${{ runner.os }}-ccache- + max-size: "500M" - name: Configure Build System run: | @@ -81,6 +79,8 @@ jobs: -B build/debug \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ -DCMAKE_INSTALL_RPATH="\$ORIGIN:\$ORIGIN/engine/native" diff --git a/CMakeLists.txt b/CMakeLists.txt index 745e22f..6aa2149 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,7 @@ add_executable(draconic engine/native/main/main.cpp) target_link_libraries(draconic PRIVATE core + math io memory platform diff --git a/cmake/Compiler.cmake b/cmake/Compiler.cmake index 9540cfd..2aa645a 100644 --- a/cmake/Compiler.cmake +++ b/cmake/Compiler.cmake @@ -26,3 +26,7 @@ endif() if(NOT WIN32) add_compile_definitions(_GNU_SOURCE) endif() + +if(WIN32) + add_compile_definitions("_${CMAKE_SYSTEM_PROCESSOR}_") +endif() diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index 1335ddf..90a5175 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -3,7 +3,7 @@ add_modules_library(input) add_modules_library(scene) target_link_libraries(core PUBLIC definitions math io memory) -target_link_libraries(input PRIVATE SDL3::SDL3-static) +target_link_libraries(input PRIVATE SDL3::SDL3-static core) target_link_libraries(scene PUBLIC renderable) add_subdirectory(thirdparty SYSTEM) diff --git a/engine/native/core/CMakeLists.txt b/engine/native/core/CMakeLists.txt index af79a2a..cb3ca9e 100644 --- a/engine/native/core/CMakeLists.txt +++ b/engine/native/core/CMakeLists.txt @@ -5,4 +5,4 @@ add_modules_library(memory) target_link_libraries(math PUBLIC definitions) target_link_libraries(io PUBLIC definitions stb_image) -target_link_libraries(memory PUBLIC definitions) +target_link_libraries(memory PUBLIC definitions math) diff --git a/engine/native/core/io/filesystem.cpp b/engine/native/core/io/filesystem.cpp index a7e2f72..36e9824 100644 --- a/engine/native/core/io/filesystem.cpp +++ b/engine/native/core/io/filesystem.cpp @@ -3,14 +3,15 @@ module; #include #include #include -#include #include module core.io.filesystem; +import core.stdtypes; + namespace draco::core::io::filesystem { - std::vector load_binary(const std::string& path) + std::vector load_binary(const std::string& path) { // Open at the end (ate) to get size and in binary mode std::ifstream file(path, std::ios::binary | std::ios::ate); @@ -33,7 +34,7 @@ namespace draco::core::io::filesystem file.seekg(0, std::ios::beg); - std::vector buffer(static_cast(size)); + std::vector buffer(static_cast(size)); if (file.read(reinterpret_cast(buffer.data()), size)) { return buffer; } diff --git a/engine/native/core/io/filesystem.cppm b/engine/native/core/io/filesystem.cppm index 74bd029..bdba6bd 100644 --- a/engine/native/core/io/filesystem.cppm +++ b/engine/native/core/io/filesystem.cppm @@ -3,12 +3,13 @@ module; #include #include #include -#include export module core.io.filesystem; +import core.stdtypes; + export namespace draco::core::io::filesystem { // Returns a buffer of the file data - std::vector load_binary(const std::string& path); + std::vector load_binary(const std::string& path); } diff --git a/engine/native/core/io/image_loader.cpp b/engine/native/core/io/image_loader.cpp index c7ed7a3..98ec0b4 100644 --- a/engine/native/core/io/image_loader.cpp +++ b/engine/native/core/io/image_loader.cpp @@ -1,7 +1,6 @@ module; #include -#include #include #include #include @@ -11,6 +10,8 @@ module; module core.io.image_loader; +import core.stdtypes; + // TODO: I'm too lazy to write code so we need somethin' better namespace draco::core::io::image_loader @@ -39,18 +40,18 @@ namespace draco::core::io::image_loader return result; } - const size_t w = static_cast(width); - const size_t h = static_cast(height); - if (w > (std::numeric_limits::max() / 4) / h) { + const usize w = static_cast(width); + const usize h = static_cast(height); + if (w > (std::numeric_limits::max() / 4) / h) { stbi_image_free(data); return result; } - size_t size = w * h * 4; + usize size = w * h * 4; result.pixels.assign(data, data + size); - result.width = static_cast(width); - result.height = static_cast(height); + result.width = static_cast(width); + result.height = static_cast(height); result.channels = 4; result.is_valid = true; diff --git a/engine/native/core/io/image_loader.cppm b/engine/native/core/io/image_loader.cppm index 5dce247..facced3 100644 --- a/engine/native/core/io/image_loader.cppm +++ b/engine/native/core/io/image_loader.cppm @@ -6,14 +6,16 @@ module; export module core.io.image_loader; +import core.stdtypes; + export namespace draco::core::io::image_loader { struct ImageData { - std::vector pixels; - uint32_t width = 0; - uint32_t height = 0; - uint8_t channels = 0; + std::vector pixels; + u32 width = 0; + u32 height = 0; + u8 channels = 0; bool is_valid = false; }; diff --git a/engine/native/core/math/constants.cppm b/engine/native/core/math/constants.cppm index 363c46d..09bb465 100644 --- a/engine/native/core/math/constants.cppm +++ b/engine/native/core/math/constants.cppm @@ -26,7 +26,9 @@ export namespace draco::math { constexpr f32 NaN = std::numeric_limits::quiet_NaN(); constexpr f32 DB_CONVERSION_GAIN = 8.6858896380650365530225783783321; constexpr f32 GAIN_CONVERSION_DB = 0.11512925464970228420089957273422; - constexpr f32 UINT32_MAX_F = 1.f / std::numeric_limits::max(); + constexpr u16 UINT16_MAX_VAL = std::numeric_limits::max(); + constexpr u32 UINT32_MAX_VAL = std::numeric_limits::max(); + constexpr f32 UINT32_MAX_F = static_cast(1.0 / static_cast(UINT32_MAX_VAL)); // Calculated via double precision to prevent rounding errors constexpr f32 DECIMAL_LIMIT_F = 8388608.0f; constexpr f32 CMP_EPSILON = 0.000001f; diff --git a/engine/native/core/memory/handle.cppm b/engine/native/core/memory/handle.cppm index f1b3d4e..00ff70d 100644 --- a/engine/native/core/memory/handle.cppm +++ b/engine/native/core/memory/handle.cppm @@ -1,9 +1,8 @@ -module; - -#include - export module core.memory.handle; +import core.stdtypes; +import core.math.constants; + export namespace draco::core::memory { // Packed generation handle: @@ -11,21 +10,21 @@ export namespace draco::core::memory template struct Handle { - uint32_t value = UINT32_MAX; + u32 value = math::UINT32_MAX_VAL; - static constexpr uint32_t INVALID = UINT32_MAX; + static constexpr u32 INVALID = math::UINT32_MAX_VAL; constexpr Handle() = default; - constexpr explicit Handle(uint32_t v) : value(v) {} + constexpr explicit Handle(u32 v) : value(v) {} - constexpr uint16_t index() const + constexpr u16 index() const { - return static_cast(value & 0xFFFF); + return static_cast(value & 0xFFFF); } - constexpr uint16_t generation() const + constexpr u16 generation() const { - return static_cast(value >> 16); + return static_cast(value >> 16); } constexpr explicit operator bool() const @@ -48,12 +47,9 @@ export namespace draco::core::memory return Handle{ INVALID }; } - static constexpr Handle make(uint16_t index, uint16_t generation) + static constexpr Handle make(u16 index, u16 generation) { - return Handle{ - (static_cast(generation) << 16) | - static_cast(index) - }; + return Handle{(static_cast(generation) << 16) | static_cast(index)}; } }; } diff --git a/engine/native/core/memory/slot_array.cppm b/engine/native/core/memory/slot_array.cppm index 5ab9488..22ee520 100644 --- a/engine/native/core/memory/slot_array.cppm +++ b/engine/native/core/memory/slot_array.cppm @@ -1,10 +1,10 @@ module; #include -#include export module core.memory.slot_array; +import core.stdtypes; import core.memory.handle; export namespace draco::core::memory @@ -13,7 +13,7 @@ export namespace draco::core::memory struct Slot { T value{}; - uint32_t generation = 0; + u32 generation = 0; bool alive = false; }; @@ -25,7 +25,7 @@ export namespace draco::core::memory Handle create(const T& value) { - uint32_t idx; + u32 idx; if (!free_list.empty()) { @@ -34,7 +34,7 @@ export namespace draco::core::memory } else { - idx = static_cast(slots.size()); + idx = static_cast(slots.size()); slots.push_back({}); } @@ -48,7 +48,7 @@ export namespace draco::core::memory bool valid(Handle h) const { - uint32_t i = h.index(); + u32 i = h.index(); return i < slots.size() && slots[i].alive @@ -90,6 +90,6 @@ export namespace draco::core::memory private: std::vector> slots; - std::vector free_list; + std::vector free_list; }; -} \ No newline at end of file +} diff --git a/engine/native/input/input.cpp b/engine/native/input/input.cpp index b7a538f..3cf8bf8 100644 --- a/engine/native/input/input.cpp +++ b/engine/native/input/input.cpp @@ -4,13 +4,15 @@ module; module input; +import core.stdtypes; + namespace draco::input { // Static globals static bool g_keys[256]{}; static bool g_mouse_captured; - static float g_mouse_dx = 0; - static float g_mouse_dy = 0; + static f32 g_mouse_dx = 0; + static f32 g_mouse_dy = 0; static Key map_sdl_key(SDL_Keycode k) { @@ -42,12 +44,12 @@ namespace draco::input { if (key == Key::Invalid) return; - g_keys[(uint16_t)key] = down; + g_keys[(u16)key] = down; } bool is_down(Key key) { - return g_keys[(uint16_t)key]; + return g_keys[(u16)key]; } void process_event(const SDL_Event& e) @@ -63,7 +65,7 @@ namespace draco::input break; case SDL_EVENT_MOUSE_MOTION: - set_mouse_delta((float)e.motion.xrel, (float)e.motion.yrel); + set_mouse_delta((f32)e.motion.xrel, (f32)e.motion.yrel); break; } } @@ -81,17 +83,17 @@ namespace draco::input return g_mouse_captured; } - void set_mouse_delta(float dx, float dy) + void set_mouse_delta(f32 dx, f32 dy) { g_mouse_dx += dx; g_mouse_dy += dy; } - float get_mouse_dx() { + f32 get_mouse_dx() { return g_mouse_dx; } - float get_mouse_dy() { + f32 get_mouse_dy() { return g_mouse_dy; } } \ No newline at end of file diff --git a/engine/native/input/input.cppm b/engine/native/input/input.cppm index 1943d36..7ce81a7 100644 --- a/engine/native/input/input.cppm +++ b/engine/native/input/input.cppm @@ -5,9 +5,11 @@ module; export module input; +import core.stdtypes; + export namespace draco::input { - enum class Key : uint16_t + enum class Key : u16 { // TODO: A small set of keys should be okay for now but this needs to be updated later as per our needs W, A, S, D, @@ -29,8 +31,8 @@ export namespace draco::input void set_mouse_captured(SDL_Window* window, bool enabled); bool is_mouse_captured(); - void set_mouse_delta(float dx, float dy); + void set_mouse_delta(f32 dx, f32 dy); - float get_mouse_dx(); - float get_mouse_dy(); + f32 get_mouse_dx(); + f32 get_mouse_dy(); } \ No newline at end of file diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 890ec3c..18eef97 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -6,6 +6,7 @@ #include #include +import core.stdtypes; import core.io.filesystem; import core.io.image_loader; @@ -93,11 +94,11 @@ int main(int argc, char* argv[]) return -1; } - auto vsh = draco::rendering::rhi::create_shader(vs.data(), (uint32_t)vs.size()); - auto fsh = draco::rendering::rhi::create_shader(fs.data(), (uint32_t)fs.size()); + auto vsh = draco::rendering::rhi::create_shader(vs.data(), (draco::u32)vs.size()); + auto fsh = draco::rendering::rhi::create_shader(fs.data(), (draco::u32)fs.size()); - auto vsh_quad = draco::rendering::rhi::create_shader(vs_quad.data(), (uint32_t)vs_quad.size()); - auto fsh_quad = draco::rendering::rhi::create_shader(fs_quad.data(), (uint32_t)fs_quad.size()); + auto vsh_quad = draco::rendering::rhi::create_shader(vs_quad.data(), (draco::u32)vs_quad.size()); + auto fsh_quad = draco::rendering::rhi::create_shader(fs_quad.data(), (draco::u32)fs_quad.size()); auto pipeline = draco::rendering::rhi::create_pipeline({vsh, fsh, draco::rendering::rhi::PipelineState::WriteRGB | draco::rendering::rhi::PipelineState::WriteAlpha | draco::rendering::rhi::PipelineState::MSAA, draco::rendering::rhi::BlendMode::None, draco::rendering::rhi::DepthTest::Less, draco::rendering::rhi::CullMode::CCW, true}); @@ -116,8 +117,8 @@ int main(int argc, char* argv[]) draco::rendering::rhi::register_uniform(draco::rendering::rhi::hash_uniform("u_offset"), u_offset); - float tint[4] = {1,1,1,1}; - float offset[4] = {0,0,0,0}; + draco::f32 tint[4] = {1,1,1,1}; + draco::f32 offset[4] = {0,0,0,0}; bool running = true; bool mouse_captured = true; @@ -149,9 +150,9 @@ int main(int argc, char* argv[]) while (running) { - static uint64_t last = SDL_GetTicks(); - uint64_t now = SDL_GetTicks(); - float dt = (now - last) / 1000.0f; + static draco::u64 last = SDL_GetTicks(); + draco::u64 now = SDL_GetTicks(); + draco::f32 dt = (now - last) / 1000.0f; last = now; SDL_Event e; @@ -180,8 +181,8 @@ int main(int argc, char* argv[]) continue; } - draco::rendering::rhi::resize((uint16_t)w, (uint16_t)h); - draco::rendering::renderer::resize((uint16_t)w, (uint16_t)h); + draco::rendering::rhi::resize((draco::u16)w, (draco::u16)h); + draco::rendering::renderer::resize((draco::u16)w, (draco::u16)h); camera.update(dt); auto cam = camera.get_camera(); @@ -191,8 +192,8 @@ int main(int argc, char* argv[]) quad_renderer.begin(); - static float quad_base_x = 400.0f; - static float quad_base_y = 300.0f; + static draco::f32 quad_base_x = 400.0f; + static draco::f32 quad_base_y = 300.0f; for (int i = 0; i < 50; i++) { diff --git a/engine/native/platform/CMakeLists.txt b/engine/native/platform/CMakeLists.txt index bee2303..1088303 100644 --- a/engine/native/platform/CMakeLists.txt +++ b/engine/native/platform/CMakeLists.txt @@ -29,7 +29,7 @@ target_sources(platform target_include_directories(platform INTERFACE $) -target_link_libraries(platform PRIVATE SDL3::SDL3-static ${PLATFORM_DEPS}) +target_link_libraries(platform PRIVATE SDL3::SDL3-static ${PLATFORM_DEPS} core) if(DRACO_HAS_WAYLAND) target_compile_definitions(platform PRIVATE DRACO_HAS_WAYLAND=1) diff --git a/engine/native/platform/linux/linux.cpp b/engine/native/platform/linux/linux.cpp index 2370325..3ca59d9 100644 --- a/engine/native/platform/linux/linux.cpp +++ b/engine/native/platform/linux/linux.cpp @@ -1,13 +1,14 @@ module; #include -#include #include #include module platform; +import core.stdtypes; + namespace draco::platform { NativeWindowFrame get_native_handles(void* sdl_window_ptr) { SDL_Window* window = static_cast(sdl_window_ptr); @@ -18,7 +19,7 @@ namespace draco::platform { if (std::string_view(driver) == "x11") { frame.ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_X11_DISPLAY_POINTER, nullptr); - frame.nwh = (void*)(uintptr_t)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0); + frame.nwh = (void*)(uintptr)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0); frame.type = NativeWindowType::X11; } else if (std::string_view(driver) == "wayland") { frame.ndt = SDL_GetPointerProperty(props, SDL_PROP_WINDOW_WAYLAND_DISPLAY_POINTER, nullptr); diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index 1d95f20..decda98 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -8,6 +8,7 @@ add_modules_library(quad_renderer) target_link_libraries(rhi PUBLIC core + math memory platform bgfx @@ -24,6 +25,8 @@ target_link_libraries(mesh PUBLIC memory rhi + math + core ) target_link_libraries(material diff --git a/engine/native/rendering/material/material.cppm b/engine/native/rendering/material/material.cppm index 7737d21..b531766 100644 --- a/engine/native/rendering/material/material.cppm +++ b/engine/native/rendering/material/material.cppm @@ -1,31 +1,31 @@ module; #include -#include export module rendering.material; +import core.stdtypes; import rendering.rhi; export namespace draco::rendering::material { struct Uniform { - uint32_t name_hash = 0; + u32 name_hash = 0; const void* data = nullptr; - uint16_t count = 1; + u16 count = 1; }; struct Material { - uint32_t shader_id = 0; + u32 shader_id = 0; rhi::PipelineHandle pipeline = rhi::InvalidPipeline; rhi::TextureHandle texture = rhi::InvalidTexture; rhi::UniformHandle sampler = rhi::InvalidUniform; - uint8_t texture_unit = 0; + u8 texture_unit = 0; std::vector uniforms; }; diff --git a/engine/native/rendering/mesh/mesh.cpp b/engine/native/rendering/mesh/mesh.cpp index 0ceb576..77f7242 100644 --- a/engine/native/rendering/mesh/mesh.cpp +++ b/engine/native/rendering/mesh/mesh.cpp @@ -1,12 +1,13 @@ module; #include -#include #include #include module rendering.mesh; +import core.stdtypes; +import core.math.constants; import core.memory; import rendering.rhi; import rendering.rhi.vertex; @@ -15,20 +16,20 @@ namespace draco::rendering::mesh { using namespace draco::rendering; - static std::unordered_map g_mesh_cache; + static std::unordered_map g_mesh_cache; static draco::core::memory::HandleRegistry g_meshes; static rhi::LayoutHandle g_mesh_layout = rhi::InvalidLayout; - static size_t hash_combine(size_t a, size_t b) + static usize hash_combine(usize a, usize b) { return a ^ (b + 0x9e3779b9 + (a << 6) + (a >> 2)); } - static size_t hash_mesh_params(int a, int b = 0, float c = 0.0f) + static usize hash_mesh_params(int a, int b = 0, f32 c = 0.0f) { - size_t h1 = std::hash{}(a); - size_t h2 = std::hash{}(b); - size_t h3 = std::hash{}(c); + usize h1 = std::hash{}(a); + usize h2 = std::hash{}(b); + usize h3 = std::hash{}(c); return hash_combine(hash_combine(h1, h2), h3); } @@ -49,17 +50,17 @@ namespace draco::rendering::mesh g_mesh_layout = rhi::create_vertex_layout(desc); } - MeshHandle create(const void* vertex_data, uint32_t vertex_size, uint32_t vertex_count, const std::vector& indices, rhi::LayoutHandle layout) + MeshHandle create(const void* vertex_data, u32 vertex_size, u32 vertex_count, const std::vector& indices, rhi::LayoutHandle layout) { Mesh mesh{}; mesh.vbh = rhi::create_vertex_buffer(vertex_data, vertex_size, layout); - mesh.ibh = rhi::create_index_buffer(indices.data(), static_cast(indices.size() * sizeof(uint32_t))); + mesh.ibh = rhi::create_index_buffer(indices.data(), static_cast(indices.size() * sizeof(u32))); mesh.layout = layout; mesh.vertex_count = vertex_count; - mesh.index_count = static_cast(indices.size()); + mesh.index_count = static_cast(indices.size()); mesh.valid = (mesh.vbh != rhi::InvalidBuffer) && (mesh.ibh != rhi::InvalidBuffer); @@ -76,7 +77,7 @@ namespace draco::rendering::mesh { ensure_mesh_layout(); - size_t key = 1; + usize key = 1; if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) return it->second; @@ -84,17 +85,17 @@ namespace draco::rendering::mesh auto v = gen::cube_vertices(); auto i = gen::cube_indices(); - MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (u32)v.size(), i, g_mesh_layout); g_mesh_cache[key] = h; return h; } - MeshHandle create_plane(float size) + MeshHandle create_plane(f32 size) { ensure_mesh_layout(); - size_t key = hash_mesh_params(1000, 0, size); + usize key = hash_mesh_params(1000, 0, size); if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) return it->second; @@ -102,7 +103,7 @@ namespace draco::rendering::mesh auto v = gen::plane_vertices(size); auto i = gen::plane_indices(); - MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (u32)v.size(), i, g_mesh_layout); g_mesh_cache[key] = h; return h; @@ -115,7 +116,7 @@ namespace draco::rendering::mesh ensure_mesh_layout(); - size_t key = hash_combine(std::hash{}(segments), std::hash{}(rings)); + usize key = hash_combine(std::hash{}(segments), std::hash{}(rings)); if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) return it->second; @@ -123,20 +124,20 @@ namespace draco::rendering::mesh auto v = gen::sphere_vertices(segments, rings); auto i = gen::sphere_indices(segments, rings); - MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (u32)v.size(), i, g_mesh_layout); g_mesh_cache[key] = h; return h; } - MeshHandle create_cylinder(int segments, float height) + MeshHandle create_cylinder(int segments, f32 height) { if (segments < 3 || height < 0.0f) return {}; ensure_mesh_layout(); - size_t key = hash_mesh_params(2000, segments, height); + usize key = hash_mesh_params(2000, segments, height); if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) return it->second; @@ -144,19 +145,19 @@ namespace draco::rendering::mesh auto v = gen::cylinder_vertices(segments, height); auto i = gen::cylinder_indices(segments); - MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (u32)v.size(), i, g_mesh_layout); g_mesh_cache[key] = h; return h; } - MeshHandle create_capsule(int segments, int rings, float height) + MeshHandle create_capsule(int segments, int rings, f32 height) { if (segments < 3 || rings < 2 || height < 0.0f) return {}; ensure_mesh_layout(); - size_t key = hash_combine(hash_combine(std::hash{}(segments), std::hash{}(rings)), std::hash{}(height)); + usize key = hash_combine(hash_combine(std::hash{}(segments), std::hash{}(rings)), std::hash{}(height)); if (auto it = g_mesh_cache.find(key); it != g_mesh_cache.end()) return it->second; @@ -164,7 +165,7 @@ namespace draco::rendering::mesh auto v = gen::capsule_vertices(segments, rings, height); auto i = gen::capsule_indices(segments, rings); - MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (uint32_t)v.size(), i, g_mesh_layout); + MeshHandle h = create(v.data(), v.size()*sizeof(Vertex), (u32)v.size(), i, g_mesh_layout); g_mesh_cache[key] = h; return h; @@ -198,11 +199,7 @@ namespace draco::rendering::mesh namespace draco::rendering::mesh::gen { - constexpr float PI = 3.1415926535f; - - Vertex make(float px, float py, float pz, - float nx, float ny, float nz, - float u, float v) + Vertex make(f32 px, f32 py, f32 pz, f32 nx, f32 ny, f32 nz, f32 u, f32 v) { return { px, py, pz, nx, ny, nz, u, v }; } @@ -242,7 +239,7 @@ namespace draco::rendering::mesh::gen }; } - std::vector cube_indices() + std::vector cube_indices() { return { 0,1,2, 2,3,0, @@ -254,9 +251,9 @@ namespace draco::rendering::mesh::gen }; } - std::vector plane_vertices(float size) + std::vector plane_vertices(f32 size) { - float s = size * 0.5f; + f32 s = size * 0.5f; return { make(-s,0,-s, 0,1,0, 0,0), @@ -266,7 +263,7 @@ namespace draco::rendering::mesh::gen }; } - std::vector plane_indices() + std::vector plane_indices() { return { 0,1,2, 2,3,0 }; } @@ -277,17 +274,17 @@ namespace draco::rendering::mesh::gen for (int y = 0; y <= rings; y++) { - float v01 = (float)y / rings; - float theta = v01 * PI; + f32 v01 = (f32)y / rings; + f32 theta = v01 * draco::math::PI; for (int x = 0; x <= segments; x++) { - float u01 = (float)x / segments; - float phi = u01 * 2.0f * PI; + f32 u01 = (f32)x / segments; + f32 phi = u01 * 2.0f * draco::math::PI; - float px = sinf(theta) * cosf(phi); - float py = cosf(theta); - float pz = sinf(theta) * sinf(phi); + f32 px = sinf(theta) * cosf(phi); + f32 py = cosf(theta); + f32 pz = sinf(theta) * sinf(phi); v.push_back(make(px,py,pz, px,py,pz, u01,v01)); } @@ -296,9 +293,9 @@ namespace draco::rendering::mesh::gen return v; } - std::vector sphere_indices(int segments, int rings) + std::vector sphere_indices(int segments, int rings) { - std::vector i; + std::vector i; for (int y = 0; y < rings; y++) { @@ -320,21 +317,21 @@ namespace draco::rendering::mesh::gen return i; } - std::vector cylinder_vertices(int segments, float height) + std::vector cylinder_vertices(int segments, f32 height) { std::vector v; - float half = height * 0.5f; + f32 half = height * 0.5f; // Side walls (Outward normals) for (int y = 0; y <= 1; y++) { - float py = (y ? half : -half); + f32 py = (y ? half : -half); for (int x = 0; x <= segments; x++) { - float t = (float)x / segments; - float a = t * 2.0f * PI; - float cx = cosf(a); - float cz = sinf(a); + f32 t = (f32)x / segments; + f32 a = t * 2.0f * draco::math::PI; + f32 cx = cosf(a); + f32 cz = sinf(a); // Normal is strictly horizontal for side walls - v.push_back(make(cx, py, cz, cx, 0, cz, t, (float)y)); + v.push_back(make(cx, py, cz, cx, 0, cz, t, (f32)y)); } } @@ -342,8 +339,8 @@ namespace draco::rendering::mesh::gen // Center vertex v.push_back(make(0, half, 0, 0, 1, 0, 0.5f, 0.5f)); for (int x = 0; x <= segments; x++) { - float t = (float)x / segments; - float a = t * 2.0f * PI; + f32 t = (f32)x / segments; + f32 a = t * 2.0f * draco::math::PI; v.push_back(make(cosf(a), half, sinf(a), 0, 1, 0, (cosf(a)+1)*0.5f, (sinf(a)+1)*0.5f)); } @@ -351,17 +348,17 @@ namespace draco::rendering::mesh::gen // Center vertex v.push_back(make(0, -half, 0, 0, -1, 0, 0.5f, 0.5f)); for (int x = 0; x <= segments; x++) { - float t = (float)x / segments; - float a = t * 2.0f * PI; + f32 t = (f32)x / segments; + f32 a = t * 2.0f * draco::math::PI; v.push_back(make(cosf(a), -half, sinf(a), 0, -1, 0, (cosf(a)+1)*0.5f, (sinf(a)+1)*0.5f)); } return v; } - std::vector cylinder_indices(int segments) + std::vector cylinder_indices(int segments) { - std::vector i; + std::vector i; int side_start = 0; int top_start = (segments + 1) * 2; int bottom_start = top_start + (segments + 2); @@ -390,27 +387,27 @@ namespace draco::rendering::mesh::gen return i; } - std::vector capsule_vertices(int segments, int rings, float height) + std::vector capsule_vertices(int segments, int rings, f32 height) { std::vector v; - float half = height * 0.5f; + f32 half = height * 0.5f; // One continuous loop from bottom pole to top pole // Total rings for a capsule = rings (bottom cap) + rings (top cap) for (int r = 0; r <= rings; r++) { - float v_uv = (float)r / rings; - float theta = v_uv * PI; // 0 to PI + f32 v_uv = (f32)r / rings; + f32 theta = v_uv * draco::math::PI; // 0 to draco::math::PI // Adjust Y for the cylinder section - float y_offset = (theta < PI * 0.5f) ? half : -half; + f32 y_offset = (theta < draco::math::PI * 0.5f) ? half : -half; for (int s = 0; s <= segments; s++) { - float u_uv = (float)s / segments; - float phi = u_uv * 2.0f * PI; + f32 u_uv = (f32)s / segments; + f32 phi = u_uv * 2.0f * draco::math::PI; - float nx = sinf(theta) * cosf(phi); - float ny = cosf(theta); - float nz = sinf(theta) * sinf(phi); + f32 nx = sinf(theta) * cosf(phi); + f32 ny = cosf(theta); + f32 nz = sinf(theta) * sinf(phi); v.push_back(make(nx, ny + y_offset, nz, nx, ny, nz, u_uv, v_uv)); } @@ -418,9 +415,9 @@ namespace draco::rendering::mesh::gen return v; } - std::vector capsule_indices(int segments, int rings) + std::vector capsule_indices(int segments, int rings) { - std::vector i; + std::vector i; for (int r = 0; r < rings; r++) { for (int s = 0; s < segments; s++) { int a = r * (segments + 1) + s; diff --git a/engine/native/rendering/mesh/mesh.cppm b/engine/native/rendering/mesh/mesh.cppm index 86f82a7..31a3c20 100644 --- a/engine/native/rendering/mesh/mesh.cppm +++ b/engine/native/rendering/mesh/mesh.cppm @@ -1,10 +1,10 @@ module; #include -#include export module rendering.mesh; +import core.stdtypes; import core.memory; import rendering.rhi; @@ -14,9 +14,9 @@ export namespace draco::rendering::mesh struct Vertex { - float px, py, pz; - float nx, ny, nz; - float u, v; + f32 px, py, pz; + f32 nx, ny, nz; + f32 u, v; }; struct Mesh @@ -26,17 +26,17 @@ export namespace draco::rendering::mesh draco::rendering::rhi::LayoutHandle layout; - uint32_t vertex_count = 0; - uint32_t index_count = 0; + u32 vertex_count = 0; + u32 index_count = 0; bool valid = false; }; MeshHandle create( const void* vertex_data, - uint32_t vertex_size, - uint32_t vertex_count, - const std::vector& indices, + u32 vertex_size, + u32 vertex_count, + const std::vector& indices, draco::rendering::rhi::LayoutHandle layout ); @@ -53,17 +53,17 @@ export namespace draco::rendering::mesh export namespace draco::rendering::mesh::gen { std::vector cube_vertices(); - std::vector cube_indices(); + std::vector cube_indices(); std::vector plane_vertices(float size); - std::vector plane_indices(); + std::vector plane_indices(); std::vector sphere_vertices(int segments, int rings); - std::vector sphere_indices(int segments, int rings); + std::vector sphere_indices(int segments, int rings); std::vector cylinder_vertices(int segments, float height); - std::vector cylinder_indices(int segments); + std::vector cylinder_indices(int segments); std::vector capsule_vertices(int segments, int rings, float height); - std::vector capsule_indices(int segments, int rings); + std::vector capsule_indices(int segments, int rings); } diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cpp b/engine/native/rendering/quad_renderer/quad_renderer.cpp index dab5e89..16478c5 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cpp +++ b/engine/native/rendering/quad_renderer/quad_renderer.cpp @@ -8,13 +8,14 @@ module; module rendering.quad_renderer; +import core.stdtypes; import rendering.rhi; import rendering.rhi.vertex; import rendering.rendergraph; namespace draco::rendering::quad_renderer { - static constexpr float QuadUV[4][2] = { + static constexpr f32 QuadUV[4][2] = { {0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, @@ -37,7 +38,7 @@ namespace draco::rendering::quad_renderer { m_vb = create_dynamic_vertex_buffer(sizeof(TexturedVertex) * MaxVertices, m_layout); // Pass BGFX_BUFFER_NONE implicitly to match tracking - m_ib = create_dynamic_index_buffer(MaxIndices * sizeof(uint16_t), BGFX_BUFFER_NONE); + m_ib = create_dynamic_index_buffer(MaxIndices * sizeof(u16), BGFX_BUFFER_NONE); m_sampler = create_uniform("s_texColor", UniformType::Sampler); } @@ -80,26 +81,26 @@ namespace draco::rendering::quad_renderer { void QuadRenderer::push_quad(const QuadCommand& cmd) { - float hw = cmd.width * 0.5f; - float hh = cmd.height * 0.5f; + f32 hw = cmd.width * 0.5f; + f32 hh = cmd.height * 0.5f; - float c = cosf(cmd.rotation); - float s = sinf(cmd.rotation); + f32 c = cosf(cmd.rotation); + f32 s = sinf(cmd.rotation); - float corners[4][2] = { + f32 corners[4][2] = { {-hw, -hh}, { hw, -hh}, { hw, hh}, {-hw, hh} }; - uint16_t start = static_cast(m_vertices.size()); + u16 start = static_cast(m_vertices.size()); for (int i = 0; i < 4; i++) { - float rx = corners[i][0] * c - corners[i][1] * s; + f32 rx = corners[i][0] * c - corners[i][1] * s; - float ry = corners[i][0] * s + corners[i][1] * c; + f32 ry = corners[i][0] * s + corners[i][1] * c; draco::rendering::rhi::TexturedVertex v{}; @@ -132,8 +133,8 @@ namespace draco::rendering::quad_renderer { return; // Upload only the exact slices we are using this frame - update_dynamic_vertex_buffer(m_vb, 0, m_vertices.data(), static_cast(m_vertices.size() * sizeof(TexturedVertex))); - update_dynamic_index_buffer(m_ib, 0, m_indices.data(), static_cast(m_indices.size() * sizeof(uint16_t))); + update_dynamic_vertex_buffer(m_vb, 0, m_vertices.data(), static_cast(m_vertices.size() * sizeof(TexturedVertex))); + update_dynamic_index_buffer(m_ib, 0, m_indices.data(), static_cast(m_indices.size() * sizeof(u16))); RenderPacket pkt{}; pkt.vertex_buffer = m_vb; @@ -142,10 +143,10 @@ namespace draco::rendering::quad_renderer { pkt.texture_handle = m_batch_key.texture; pkt.sampler_uniform = m_sampler; - pkt.vertex_count = static_cast(m_vertices.size()); - pkt.index_count = static_cast(m_indices.size()); + pkt.vertex_count = static_cast(m_vertices.size()); + pkt.index_count = static_cast(m_indices.size()); - pkt.sort_key = make_sort_key(0, 0, static_cast(m_pipeline.value), static_cast(m_batch_key.texture.value), 0); + pkt.sort_key = make_sort_key(0, 0, static_cast(m_pipeline.value), static_cast(m_batch_key.texture.value), 0); bx::mtxIdentity(pkt.model); @@ -165,15 +166,15 @@ namespace draco::rendering::quad_renderer { destroy_uniform(m_sampler); } - void QuadRenderer::build_ortho(OrthoCamera& cam, float width, float height) + void QuadRenderer::build_ortho(OrthoCamera& cam, f32 width, f32 height) { using namespace draco::rendering::rhi; identity_matrix(cam.view); identity_matrix(cam.proj); - float rl = std::max(width, 1.0f); - float tb = std::max(height, 1.0f); + f32 rl = std::max(width, 1.0f); + f32 tb = std::max(height, 1.0f); cam.proj[0] = 2.0f / rl; cam.proj[5] = -2.0f / tb; diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cppm b/engine/native/rendering/quad_renderer/quad_renderer.cppm index 094a010..8a41c14 100644 --- a/engine/native/rendering/quad_renderer/quad_renderer.cppm +++ b/engine/native/rendering/quad_renderer/quad_renderer.cppm @@ -5,6 +5,7 @@ module; export module rendering.quad_renderer; +import core.stdtypes; import rendering.rhi; import rendering.rhi.vertex; import rendering.rendergraph; @@ -24,32 +25,32 @@ export namespace draco::rendering::quad_renderer { struct QuadCommand { draco::rendering::rhi::TextureHandle texture = draco::rendering::rhi::InvalidTexture; - float x = 0.0f; - float y = 0.0f; - float z = 0.0f; + f32 x = 0.0f; + f32 y = 0.0f; + f32 z = 0.0f; - float width = 1.0f; - float height = 1.0f; + f32 width = 1.0f; + f32 height = 1.0f; - float rotation = 0.0f; + f32 rotation = 0.0f; - uint32_t color = 0xffffffff; + u32 color = 0xffffffff; }; struct OrthoCamera { - float view[16]; - float proj[16]; + f32 view[16]; + f32 proj[16]; - float x = 0.0f; - float y = 0.0f; - float zoom = 1.0f; + f32 x = 0.0f; + f32 y = 0.0f; + f32 zoom = 1.0f; }; class QuadRenderer { public: - static constexpr uint32_t MaxQuads = 10000; - static constexpr uint32_t MaxVertices = MaxQuads * 4; - static constexpr uint32_t MaxIndices = MaxQuads * 6; + static constexpr u32 MaxQuads = 10000; + static constexpr u32 MaxVertices = MaxQuads * 4; + static constexpr u32 MaxIndices = MaxQuads * 6; void init(draco::rendering::rhi::PipelineHandle pipeline); @@ -61,7 +62,7 @@ export namespace draco::rendering::quad_renderer { void shutdown(); - static void build_ortho(OrthoCamera& cam, float width, float height); + static void build_ortho(OrthoCamera& cam, f32 width, f32 height); private: void push_quad(const QuadCommand& cmd); @@ -71,7 +72,7 @@ export namespace draco::rendering::quad_renderer { std::vector m_vertices; - std::vector m_indices; + std::vector m_indices; draco::rendering::rhi::BufferHandle m_vb = draco::rendering::rhi::InvalidBuffer; @@ -83,6 +84,6 @@ export namespace draco::rendering::quad_renderer { draco::rendering::rhi::UniformHandle m_sampler = draco::rendering::rhi::InvalidUniform; - uint32_t m_quad_count = 0; + u32 m_quad_count = 0; }; } diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp index a8ec969..6f37588 100644 --- a/engine/native/rendering/renderer/renderer.cpp +++ b/engine/native/rendering/renderer/renderer.cpp @@ -11,6 +11,8 @@ module; module rendering.renderer; +import core.stdtypes; + import rendering.rhi; import rendering.rhi.uniform_registry; import rendering.rendergraph; @@ -25,13 +27,13 @@ namespace draco::rendering::renderer { static constexpr const char* MAIN_PASS = "MainPass"; - void init(uint16_t width, uint16_t height) + void init(u16 width, u16 height) { g_ctx.screen_width = width; g_ctx.screen_height = height; } - void resize(uint16_t width, uint16_t height) + void resize(u16 width, u16 height) { g_ctx.screen_width = width; g_ctx.screen_height = height; @@ -56,12 +58,12 @@ namespace draco::rendering::renderer pass.clear_flags = BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH; pass.clear_color = 0x303030ff; - float view_mtx[16]; - float proj_mtx[16]; + f32 view_mtx[16]; + f32 proj_mtx[16]; rhi::look_at(view_mtx, cam.position.data(), cam.target.data(), cam.up.data()); - float aspect = float(g_ctx.screen_width) / float(std::max(g_ctx.screen_height, 1)); + f32 aspect = f32(g_ctx.screen_width) / f32(std::max(g_ctx.screen_height, 1)); rhi::perspective(proj_mtx, cam.fov, aspect, cam.near_plane, cam.far_plane); @@ -120,7 +122,7 @@ namespace draco::rendering::renderer build_uniforms(t.material, p.uniforms); - float model[16]; + f32 model[16]; draco::scene::transform::compute_matrix(t.transform, model); std::memcpy(p.model, model, sizeof(model)); @@ -145,10 +147,10 @@ namespace draco::rendering::renderer draco::rendering::quad_renderer::OrthoCamera ortho; - draco::rendering::quad_renderer::QuadRenderer::build_ortho(ortho, (float)g_ctx.screen_width, (float)g_ctx.screen_height); + draco::rendering::quad_renderer::QuadRenderer::build_ortho(ortho, (f32)g_ctx.screen_width, (f32)g_ctx.screen_height); - std::memcpy(ui_pass.view_mtx, ortho.view, sizeof(float) * 16); - std::memcpy(ui_pass.proj_mtx, ortho.proj, sizeof(float) * 16); + std::memcpy(ui_pass.view_mtx, ortho.view, sizeof(f32) * 16); + std::memcpy(ui_pass.proj_mtx, ortho.proj, sizeof(f32) * 16); quad_renderer.flush_to_pass(ui_pass); } diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/native/rendering/renderer/renderer.cppm index 6c74ff5..c966737 100644 --- a/engine/native/rendering/renderer/renderer.cppm +++ b/engine/native/rendering/renderer/renderer.cppm @@ -1,12 +1,12 @@ module; #include -#include #include export module rendering.renderer; +import core.stdtypes; import rendering.rhi; import rendering.rendergraph; import rendering.quad_renderer; @@ -16,17 +16,17 @@ import scene; export namespace draco::rendering::renderer { struct Camera { - std::array position {0.0f, 0.0f, 0.0f}; - std::array target {0.0f, 0.0f, 0.0f}; - std::array up {0.0f, 1.0f, 0.0f}; - float fov = 60.0f; - float near_plane = 0.1f; - float far_plane = 1000.0f; + std::array position {0.0f, 0.0f, 0.0f}; + std::array target {0.0f, 0.0f, 0.0f}; + std::array up {0.0f, 1.0f, 0.0f}; + f32 fov = 60.0f; + f32 near_plane = 0.1f; + f32 far_plane = 1000.0f; }; struct SceneContext { - uint16_t screen_width = 0; - uint16_t screen_height = 0; + u16 screen_width = 0; + u16 screen_height = 0; Camera main_camera; draco::rendering::rendergraph::RenderGraph graph; @@ -34,12 +34,12 @@ export namespace draco::rendering::renderer { inline SceneContext g_ctx; - void init(uint16_t width, uint16_t height); - void resize(uint16_t width, uint16_t height); + void init(u16 width, u16 height); + void resize(u16 width, u16 height); void begin_frame(const Camera& cam); - void submit_entity(draco::rendering::rhi::RenderPacket& packet, uint16_t view); + void submit_entity(draco::rendering::rhi::RenderPacket& packet, u16 view); void end_frame(); diff --git a/engine/native/rendering/rendergraph/rendergraph.cppm b/engine/native/rendering/rendergraph/rendergraph.cppm index b7f1263..6549e1a 100644 --- a/engine/native/rendering/rendergraph/rendergraph.cppm +++ b/engine/native/rendering/rendergraph/rendergraph.cppm @@ -2,15 +2,15 @@ module; #include #include -#include export module rendering.rendergraph; +import core.stdtypes; import rendering.rhi; export namespace draco::rendering::rendergraph { - enum class PassType : uint8_t + enum class PassType : u8 { Graphics, Transparent, @@ -19,7 +19,7 @@ export namespace draco::rendering::rendergraph { UI }; - enum class SortMode : uint8_t + enum class SortMode : u8 { None, Material, @@ -41,25 +41,25 @@ export namespace draco::rendering::rendergraph { std::vector packets; - float view_mtx[16] = { + f32 view_mtx[16] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }; - float proj_mtx[16] = { + f32 proj_mtx[16] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }; - uint16_t width = 0; - uint16_t height = 0; + u16 width = 0; + u16 height = 0; - uint32_t clear_flags = 0; - uint32_t clear_color = 0; + u32 clear_flags = 0; + u32 clear_color = 0; }; class RenderGraph diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 5441bdd..5aaa818 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -1,7 +1,6 @@ module; #include -#include #include #include @@ -9,6 +8,8 @@ module; export module rendering.rhi; +import core.stdtypes; +import core.math.constants; import core.memory; import platform; import rendering.rhi.vertex; @@ -31,8 +32,8 @@ export namespace draco::rendering::rhi using FramebufferHandle = core::memory::Handle; using LayoutHandle = core::memory::Handle; - using ViewID = uint16_t; // bgfx native - using SamplerHandle = uint64_t; // bgfx sampler flags + using ViewID = u16; // bgfx native + using SamplerHandle = u64; // bgfx sampler flags inline constexpr BufferHandle InvalidBuffer{}; inline constexpr PipelineHandle InvalidPipeline{}; @@ -42,9 +43,9 @@ export namespace draco::rendering::rhi inline constexpr FramebufferHandle InvalidFramebuffer{}; inline constexpr LayoutHandle InvalidLayout{}; inline constexpr SamplerHandle InvalidSampler = 0; - inline constexpr ViewID InvalidView = UINT16_MAX; + inline constexpr ViewID InvalidView = math::UINT16_MAX_VAL; - enum class PipelineState : uint64_t { + enum class PipelineState : u64 { Default = 0, WriteRGB = 1ULL << 0, WriteAlpha = 1ULL << 1, @@ -52,7 +53,7 @@ export namespace draco::rendering::rhi PrimitiveTriStrip = 1ULL << 3, }; - enum class ClearFlags : uint32_t { + enum class ClearFlags : u32 { Color = BGFX_CLEAR_COLOR, Depth = BGFX_CLEAR_DEPTH, Stencil = BGFX_CLEAR_STENCIL @@ -60,9 +61,9 @@ export namespace draco::rendering::rhi struct ViewDesc { FramebufferHandle fb = InvalidFramebuffer; - uint16_t x = 0, y = 0, w = 0, h = 0; - uint32_t clear_flags = 0; - uint32_t clear_color = 0; + u16 x = 0, y = 0, w = 0, h = 0; + u32 clear_flags = 0; + u32 clear_color = 0; }; enum class UniformType @@ -76,7 +77,7 @@ export namespace draco::rendering::rhi struct UniformBind { UniformHandle handle; const void* data; - uint16_t num; + u16 num; }; enum class TextureFormat { @@ -129,12 +130,12 @@ export namespace draco::rendering::rhi }; struct ScissorRect { - uint16_t x, y, w, h; + u16 x, y, w, h; bool enabled = true; }; struct DeletionReq { - uint64_t frame; + u64 frame; std::function cleanup; }; @@ -153,93 +154,93 @@ export namespace draco::rendering::rhi struct RenderPacket { - uint64_t sort_key = 0; + u64 sort_key = 0; BufferHandle vertex_buffer = InvalidBuffer; BufferHandle index_buffer = InvalidBuffer; PipelineHandle pipeline = InvalidPipeline; - uint32_t vertex_count = UINT32_MAX; - uint32_t index_count = UINT32_MAX; + u32 vertex_count = math::UINT32_MAX_VAL; + u32 index_count = math::UINT32_MAX_VAL; UniformHandle sampler_uniform = InvalidUniform; SamplerHandle sampler_flags = InvalidSampler; TextureHandle texture_handle = InvalidTexture; - float color[4] = {1,1,1,1}; + f32 color[4] = {1,1,1,1}; std::vector uniforms; - uint8_t texture_unit = 0; + u8 texture_unit = 0; - float model[16] = { + f32 model[16] = { 1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1 }; - uint32_t draw_tags = 0; + u32 draw_tags = 0; }; struct Pipeline { bgfx::ProgramHandle program; - uint64_t state; + u64 state; }; - bool init(void* display_type, void* window_handle, draco::platform::NativeWindowType window_type, uint16_t width, uint16_t height); - void resize(uint16_t width, uint16_t height); + bool init(void* display_type, void* window_handle, draco::platform::NativeWindowType window_type, u16 width, u16 height); + void resize(u16 width, u16 height); void shutdown(); PipelineHandle create_pipeline(const PipelineDesc&); - BufferHandle create_vertex_buffer(const void* data, uint32_t size, LayoutHandle layout_h); - BufferHandle create_index_buffer(const void* data, uint32_t size); + BufferHandle create_vertex_buffer(const void* data, u32 size, LayoutHandle layout_h); + BufferHandle create_index_buffer(const void* data, u32 size); void destroy_buffer(BufferHandle handle); - UniformHandle create_uniform(const char* name, UniformType type, uint16_t num = 1); + UniformHandle create_uniform(const char* name, UniformType type, u16 num = 1); void destroy_uniform(UniformHandle handle); - void set_uniform(UniformHandle handle, const void* value, uint16_t num = 1); + void set_uniform(UniformHandle handle, const void* value, u16 num = 1); - TextureHandle create_texture(const void* data, uint32_t width, uint32_t height, uint32_t flags = 0); + TextureHandle create_texture(const void* data, u32 width, u32 height, u32 flags = 0); void destroy_texture(TextureHandle handle); - FramebufferHandle create_framebuffer(uint32_t width, uint32_t height, TextureFormat format); + FramebufferHandle create_framebuffer(u32 width, u32 height, TextureFormat format); void destroy_framebuffer(FramebufferHandle handle); TextureHandle get_framebuffer_texture(FramebufferHandle handle); - BufferHandle create_dynamic_vertex_buffer(uint32_t size, LayoutHandle layout); - void update_dynamic_vertex_buffer(BufferHandle handle, uint32_t start_vertex, const void* data, uint32_t size); + BufferHandle create_dynamic_vertex_buffer(u32 size, LayoutHandle layout); + void update_dynamic_vertex_buffer(BufferHandle handle, u32 start_vertex, const void* data, u32 size); - BufferHandle create_dynamic_index_buffer(uint32_t size, uint16_t flags = BGFX_BUFFER_NONE); - void update_dynamic_index_buffer(BufferHandle handle, uint32_t start_index, const void* data, uint32_t size); + BufferHandle create_dynamic_index_buffer(u32 size, u16 flags = BGFX_BUFFER_NONE); + void update_dynamic_index_buffer(BufferHandle handle, u32 start_index, const void* data, u32 size); LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc); SamplerHandle create_sampler(bool linear, bool clamp); // Expects bgfx compiled shader binary (shaderc output) - ShaderHandle create_shader(const void* data, uint32_t size); + ShaderHandle create_shader(const void* data, u32 size); bgfx::ShaderHandle resolve(ShaderHandle h); // For debugging/tooling bgfx::ShaderHandle* get_shader_native(ShaderHandle h); void destroy_shader(ShaderHandle h); - void perspective(float* out, float fov, float aspect, float nearp, float farp); - void look_at(float* out, const float* eye, const float* at, const float* up); + void perspective(f32* out, f32 fov, f32 aspect, f32 nearp, f32 farp); + void look_at(f32* out, const f32* eye, const f32* at, const f32* up); // Note: Internal use only, use apply_view() instead - void set_view_rect(ViewID view, uint16_t x, uint16_t y, uint16_t w, uint16_t h); + void set_view_rect(ViewID view, u16 x, u16 y, u16 w, u16 h); void set_view_framebuffer(ViewID view, FramebufferHandle handle); - void set_view_projection(ViewID view, const float* view_mtx, const float* proj_mtx); + void set_view_projection(ViewID view, const f32* view_mtx, const f32* proj_mtx); void set_scissor(const ScissorRect& r); - void set_stencil(uint32_t f_stencil, uint32_t b_stencil); + void set_stencil(u32 f_stencil, u32 b_stencil); void apply_view(ViewID view, const ViewDesc& desc); - void identity_matrix(float* _mtx); + void identity_matrix(f32* _mtx); - uint64_t map_state(PipelineState s, BlendMode, DepthTest, CullMode, bool depth_write); + u64 map_state(PipelineState s, BlendMode, DepthTest, CullMode, bool depth_write); bgfx::UniformType::Enum map_uniform_type(UniformType t); bgfx::Attrib::Enum map_attrib(Attrib a); bgfx::AttribType::Enum map_attrib_type(AttribType t); @@ -254,16 +255,16 @@ export namespace draco::rendering::rhi void process_deletions(); - inline uint64_t make_sort_key(uint8_t layer, uint8_t pass, uint16_t pipeline, uint16_t texture, uint16_t depth = 0) + inline u64 make_sort_key(u8 layer, u8 pass, u16 pipeline, u16 texture, u16 depth = 0) { - return (uint64_t(layer) << 56) | (uint64_t(pass) << 48) | (uint64_t(pipeline) << 32) | (uint64_t(texture) << 16) | uint64_t(depth); + return (u64(layer) << 56) | (u64(pass) << 48) | (u64(pipeline) << 32) | (u64(texture) << 16) | u64(depth); } constexpr PipelineState operator|(PipelineState a, PipelineState b) { - return static_cast(static_cast(a) | static_cast(b)); + return static_cast(static_cast(a) | static_cast(b)); } constexpr PipelineState operator&(PipelineState a, PipelineState b) { - return static_cast(static_cast(a) & static_cast(b)); + return static_cast(static_cast(a) & static_cast(b)); } } diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp index acf6a1b..3012113 100644 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ b/engine/native/rendering/rhi/rhi_bgfx.cpp @@ -3,7 +3,6 @@ module; #include #include #include -#include #include #include #include @@ -14,6 +13,9 @@ module; module rendering.rhi; +import core.stdtypes; +import core.math.constants; + namespace draco::rendering::rhi { #ifndef DRACO_RHI_VALIDATION @@ -53,8 +55,8 @@ namespace draco::rendering::rhi // Deferred destruction queue (GPU-safe deletion) static std::vector g_deletion_queue; - static uint16_t g_width = 0; - static uint16_t g_height = 0; + static u16 g_width = 0; + static u16 g_height = 0; // Ensures a handle is valid before use // TODO: Replace with something better @@ -86,7 +88,7 @@ namespace draco::rendering::rhi void process_deletions() { - uint64_t frame = bgfx::getStats()->gpuFrameNum; + u64 frame = bgfx::getStats()->gpuFrameNum; std::erase_if(g_deletion_queue, [frame](const auto& d) { @@ -99,7 +101,7 @@ namespace draco::rendering::rhi }); } - bool init(void* display_type, void* window_handle, draco::platform::NativeWindowType window_type, uint16_t width, uint16_t height) + bool init(void* display_type, void* window_handle, draco::platform::NativeWindowType window_type, u16 width, u16 height) { g_width = width; g_height = height; @@ -135,7 +137,7 @@ namespace draco::rendering::rhi return true; } - void resize(uint16_t width, uint16_t height) + void resize(u16 width, u16 height) { if(width == 0 || height == 0) return; // Minimized window safety @@ -200,12 +202,12 @@ namespace draco::rendering::rhi bgfx::ProgramHandle prog = bgfx::createProgram(resolve(desc.vs), resolve(desc.fs), true); - uint64_t state = map_state(desc.state, desc.blend, desc.depth, desc.cull, desc.depth_write); + u64 state = map_state(desc.state, desc.blend, desc.depth, desc.cull, desc.depth_write); return g_pipelines.create({ prog, state }); } - BufferHandle create_vertex_buffer(const void* data, uint32_t size, LayoutHandle layout_h) + BufferHandle create_vertex_buffer(const void* data, u32 size, LayoutHandle layout_h) { RHI_ASSERT(data != nullptr, "Vertex buffer data is null"); RHI_ASSERT(size > 0, "Vertex buffer size is zero"); @@ -222,7 +224,7 @@ namespace draco::rendering::rhi return g_buffers.create(buf); } - BufferHandle create_index_buffer(const void* data, uint32_t size) + BufferHandle create_index_buffer(const void* data, u32 size) { RHI_ASSERT(data != nullptr, "Index buffer data is null"); RHI_ASSERT(size > 0, "Index buffer size is zero"); @@ -236,7 +238,7 @@ namespace draco::rendering::rhi return g_buffers.create(buf); } - BufferHandle create_dynamic_vertex_buffer(uint32_t size, LayoutHandle layout_h) + BufferHandle create_dynamic_vertex_buffer(u32 size, LayoutHandle layout_h) { auto* layout = get_checked(g_layouts, layout_h, "Layout"); RHI_ASSERT(layout, "Invalid layout"); @@ -252,7 +254,7 @@ namespace draco::rendering::rhi return g_buffers.create(buf); } - void update_dynamic_vertex_buffer(BufferHandle handle, uint32_t start_vertex, const void* data, uint32_t size) + void update_dynamic_vertex_buffer(BufferHandle handle, u32 start_vertex, const void* data, u32 size) { auto* buf = get_checked(g_buffers, handle, "Buffer"); @@ -267,7 +269,7 @@ namespace draco::rendering::rhi bgfx::update(buf->dvbh, start_vertex, mem); } - BufferHandle create_dynamic_index_buffer(uint32_t size, uint16_t flags) + BufferHandle create_dynamic_index_buffer(u32 size, u16 flags) { bgfx::DynamicIndexBufferHandle ibh = bgfx::createDynamicIndexBuffer(size, flags); @@ -281,7 +283,7 @@ namespace draco::rendering::rhi return g_buffers.create(buf); } - void update_dynamic_index_buffer(BufferHandle handle, uint32_t start_index, const void* data, uint32_t size) + void update_dynamic_index_buffer(BufferHandle handle, u32 start_index, const void* data, u32 size) { auto* buf = get_checked(g_buffers, handle, "DynamicIndexBuffer"); @@ -332,7 +334,7 @@ namespace draco::rendering::rhi return g_layouts.create({ layout }); } - UniformHandle create_uniform(const char* name, UniformType type, uint16_t num) + UniformHandle create_uniform(const char* name, UniformType type, u16 num) { RHI_ASSERT(name != nullptr, "Uniform name is null"); @@ -340,7 +342,7 @@ namespace draco::rendering::rhi return g_uniforms.create(u); } - void set_uniform(UniformHandle h, const void* data, uint16_t num) + void set_uniform(UniformHandle h, const void* data, u16 num) { auto* u = get_checked(g_uniforms, h, "Uniform"); if (!u) return; @@ -359,7 +361,7 @@ namespace draco::rendering::rhi g_uniforms.destroy(h); } - TextureHandle create_texture(const void* data, uint32_t w, uint32_t h, uint32_t flags) + TextureHandle create_texture(const void* data, u32 w, u32 h, u32 flags) { RHI_ASSERT(data != nullptr, "Texture data is null"); RHI_ASSERT(w > 0 && h > 0, "Invalid texture dimensions"); @@ -374,7 +376,7 @@ namespace draco::rendering::rhi return g_textures.create(tex); } - ShaderHandle create_shader(const void* data, uint32_t size) + ShaderHandle create_shader(const void* data, u32 size) { RHI_ASSERT(data && size > 0, "Invalid shader data"); @@ -404,12 +406,12 @@ namespace draco::rendering::rhi } } - void perspective(float* out, float fov, float aspect, float nearp, float farp) + void perspective(f32* out, f32 fov, f32 aspect, f32 nearp, f32 farp) { bx::mtxProj(out, fov, aspect, nearp, farp, bgfx::getCaps()->homogeneousDepth); } - void look_at(float* out, const float* eye, const float* at, const float* up) + void look_at(f32* out, const f32* eye, const f32* at, const f32* up) { bx::Vec3 eye_v { eye[0], eye[1], eye[2] }; bx::Vec3 at_v { at[0], at[1], at[2] }; @@ -430,12 +432,12 @@ namespace draco::rendering::rhi } // Note: Internal use only, use apply_view() instead - void set_view_rect(ViewID view, uint16_t x, uint16_t y, uint16_t w, uint16_t h) + void set_view_rect(ViewID view, u16 x, u16 y, u16 w, u16 h) { bgfx::setViewRect(view, x, y, w, h); } - void set_view_projection(ViewID view, const float* view_mtx, const float* proj_mtx) + void set_view_projection(ViewID view, const f32* view_mtx, const f32* proj_mtx) { bgfx::setViewTransform(view, view_mtx, proj_mtx); } @@ -443,19 +445,19 @@ namespace draco::rendering::rhi void set_scissor(const ScissorRect& r) { if (!r.enabled) - bgfx::setScissor(UINT16_MAX); + bgfx::setScissor(math::UINT16_MAX_VAL); else bgfx::setScissor(r.x, r.y, r.w, r.h); } - void set_stencil(uint32_t fstencil, uint32_t bstencil) + void set_stencil(u32 fstencil, u32 bstencil) { bgfx::setStencil(fstencil, bstencil); } - uint64_t map_state(PipelineState s, BlendMode blend, DepthTest depth, CullMode cull, bool depth_write) + u64 map_state(PipelineState s, BlendMode blend, DepthTest depth, CullMode cull, bool depth_write) { - uint64_t state = 0; + u64 state = 0; if ((s & PipelineState::WriteRGB) != PipelineState::Default) state |= BGFX_STATE_WRITE_RGB; @@ -573,7 +575,7 @@ namespace draco::rendering::rhi } } - void identity_matrix(float* mtx) + void identity_matrix(f32* mtx) { bx::mtxIdentity(mtx); } diff --git a/engine/native/scene/CMakeLists.txt b/engine/native/scene/CMakeLists.txt index 58796c5..a70693e 100644 --- a/engine/native/scene/CMakeLists.txt +++ b/engine/native/scene/CMakeLists.txt @@ -2,6 +2,6 @@ add_modules_library(camera) add_modules_library(transform) add_modules_library(renderable) -target_link_libraries(camera PUBLIC input renderer bx) -target_link_libraries(transform PUBLIC bx) -target_link_libraries(renderable PUBLIC mesh transform material) +target_link_libraries(camera PUBLIC core input renderer bx) +target_link_libraries(transform PUBLIC core bx) +target_link_libraries(renderable PUBLIC core mesh transform material) diff --git a/engine/native/scene/camera/camera_controller.cpp b/engine/native/scene/camera/camera_controller.cpp index 72d757a..f9a1d22 100644 --- a/engine/native/scene/camera/camera_controller.cpp +++ b/engine/native/scene/camera/camera_controller.cpp @@ -9,7 +9,7 @@ import input; namespace draco::scene { - void CameraController::init(float x, float y, float z) + void CameraController::init(f32 x, f32 y, f32 z) { m_x = x; m_y = y; @@ -22,7 +22,7 @@ namespace draco::scene m_sensitivity = 0.002f; // mouse sensitivity } - void CameraController::update(float dt) + void CameraController::update(f32 dt) { m_yaw += draco::input::get_mouse_dx() * m_sensitivity; m_pitch -= draco::input::get_mouse_dy() * m_sensitivity; // Temp fix to flip mouse input @@ -43,7 +43,7 @@ namespace draco::scene cosf(m_yaw - bx::kPiHalf) }; - float velocity = m_speed * dt; + f32 velocity = m_speed * dt; if (draco::input::is_down(draco::input::Key::W)) { @@ -97,4 +97,4 @@ namespace draco::scene return cam; } -} \ No newline at end of file +} diff --git a/engine/native/scene/camera/camera_controller.cppm b/engine/native/scene/camera/camera_controller.cppm index f0b0109..535ae48 100644 --- a/engine/native/scene/camera/camera_controller.cppm +++ b/engine/native/scene/camera/camera_controller.cppm @@ -1,23 +1,24 @@ export module scene.camera.controller; +import core.stdtypes; import rendering.renderer; export namespace draco::scene { struct CameraController { - void init(float x = 0.0f, float y = 0.0f, float z = -2.0f); + void init(f32 x = 0.0f, f32 y = 0.0f, f32 z = -2.0f); - void update(float dt); + void update(f32 dt); draco::rendering::renderer::Camera get_camera() const; private: // Init with default values - float m_x = 0.0f, m_y = 0.0f, m_z = 0.0f; - float m_yaw = 0.0f; - float m_pitch = 0.0f; - float m_speed = 5.0f; - float m_sensitivity = 0.1f; + f32 m_x = 0.0f, m_y = 0.0f, m_z = 0.0f; + f32 m_yaw = 0.0f; + f32 m_pitch = 0.0f; + f32 m_speed = 5.0f; + f32 m_sensitivity = 0.1f; }; } \ No newline at end of file diff --git a/engine/native/scene/transform/transform.cpp b/engine/native/scene/transform/transform.cpp index 134f827..dbaf27f 100644 --- a/engine/native/scene/transform/transform.cpp +++ b/engine/native/scene/transform/transform.cpp @@ -6,6 +6,8 @@ module; module scene.transform; +import core.stdtypes; + namespace draco::scene::transform { Transform make_transform() @@ -34,7 +36,7 @@ namespace draco::scene::transform t.dirty = true; } - void set_position(Transform& t, float x, float y, float z) + void set_position(Transform& t, f32 x, f32 y, f32 z) { t.position[0] = x; t.position[1] = y; @@ -42,7 +44,7 @@ namespace draco::scene::transform t.dirty = true; } - void set_rotation(Transform& t, float x, float y, float z) + void set_rotation(Transform& t, f32 x, f32 y, f32 z) { t.rotation[0] = x; t.rotation[1] = y; @@ -50,7 +52,7 @@ namespace draco::scene::transform t.dirty = true; } - void set_scale(Transform& t, float x, float y, float z) + void set_scale(Transform& t, f32 x, f32 y, f32 z) { t.scale[0] = x; t.scale[1] = y; @@ -58,14 +60,14 @@ namespace draco::scene::transform t.dirty = true; } - void compute_matrix(const Transform& t, float out[16]) + void compute_matrix(const Transform& t, f32 out[16]) { - float translation[16]; - float rx[16]; - float ry[16]; - float rz[16]; - float scale[16]; - float temp[16]; + f32 translation[16]; + f32 rx[16]; + f32 ry[16]; + f32 rz[16]; + f32 scale[16]; + f32 temp[16]; bx::mtxIdentity(out); diff --git a/engine/native/scene/transform/transform.cppm b/engine/native/scene/transform/transform.cppm index 6e3e12c..1616be0 100644 --- a/engine/native/scene/transform/transform.cppm +++ b/engine/native/scene/transform/transform.cppm @@ -1,6 +1,5 @@ module; -#include #include #include @@ -8,13 +7,15 @@ module; export module scene.transform; +import core.stdtypes; + export namespace draco::scene::transform { struct Transform { - float position[3] = { 0.0f, 0.0f, 0.0f }; - float rotation[3] = { 0.0f, 0.0f, 0.0f }; // Euler (radians) - float scale[3] = { 1.0f, 1.0f, 1.0f }; + f32 position[3] = { 0.0f, 0.0f, 0.0f }; + f32 rotation[3] = { 0.0f, 0.0f, 0.0f }; // Euler (radians) + f32 scale[3] = { 1.0f, 1.0f, 1.0f }; bool dirty = true; }; @@ -23,12 +24,12 @@ export namespace draco::scene::transform Transform make_transform(); // Recompute matrix from transform (column-major, bx compatible) - void compute_matrix(const Transform& t, float out[16]); + void compute_matrix(const Transform& t, f32 out[16]); // Helpers - void set_position(Transform& t, float x, float y, float z); - void set_rotation(Transform& t, float x, float y, float z); - void set_scale(Transform& t, float x, float y, float z); + void set_position(Transform& t, f32 x, f32 y, f32 z); + void set_rotation(Transform& t, f32 x, f32 y, f32 z); + void set_scale(Transform& t, f32 x, f32 y, f32 z); void mark_dirty(Transform& t); } \ No newline at end of file diff --git a/engine/native/thirdparty/CMakeLists.txt b/engine/native/thirdparty/CMakeLists.txt index ec93297..fe09ceb 100644 --- a/engine/native/thirdparty/CMakeLists.txt +++ b/engine/native/thirdparty/CMakeLists.txt @@ -7,30 +7,48 @@ set(BGFX_BUILD_TOOLS_GEOMETRY OFF CACHE BOOL "" FORCE) set(BGFX_INSTALL OFF CACHE BOOL "" FORCE) set(BGFX_LIBRARY_TYPE "STATIC") +set(SDL_SHARED OFF CACHE BOOL "" FORCE) +set(SDL_STATIC ON CACHE BOOL "" FORCE) +set(SDL_MAIN_HANDLED ON CACHE BOOL "" FORCE) +set(SDL_STATIC_PIC ON CACHE BOOL "" FORCE) +set(SDL_TEST OFF CACHE BOOL "" FORCE) + +set(SDL_AUDIO OFF CACHE BOOL "" FORCE) +set(SDL_VIDEO ON CACHE BOOL "" FORCE) +set(SDL_RENDER OFF CACHE BOOL "" FORCE) # Off because bgfx handles the rendering! +set(SDL_CAMERA OFF CACHE BOOL "" FORCE) +set(SDL_JOYSTICK OFF CACHE BOOL "" FORCE) +set(SDL_HAPTIC OFF CACHE BOOL "" FORCE) +set(SDL_HIDAPI OFF CACHE BOOL "" FORCE) + +if(APPLE) + set(SDL_WAYLAND OFF CACHE BOOL "" FORCE) + set(SDL_LIBDECOR OFF CACHE BOOL "" FORCE) + set(SDL_X11 OFF CACHE BOOL "" FORCE) + set(SDL_COCOA ON CACHE BOOL "" FORCE) +elseif(WIN32) + set(SDL_WAYLAND OFF CACHE BOOL "" FORCE) + set(SDL_LIBDECOR OFF CACHE BOOL "" FORCE) + set(SDL_X11 OFF CACHE BOOL "" FORCE) +else() + set(SDL_WAYLAND ON CACHE BOOL "" FORCE) + set(SDL_LIBDECOR ON CACHE BOOL "" FORCE) + set(SDL_X11 ON CACHE BOOL "" FORCE) + set(SDL_X11_XSCRNSAVER OFF CACHE BOOL "" FORCE) + set(SDL_WAYLAND_SHARED OFF CACHE BOOL "" FORCE) + set(SDL_X11_SHARED OFF CACHE BOOL "" FORCE) + set(SDL_ALSA_SHARED OFF CACHE BOOL "" FORCE) + set(SDL_PULSEAUDIO_SHARED OFF CACHE BOOL "" FORCE) +endif() + set(BX_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bx CACHE STRING "" FORCE) set(BIMG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bimg CACHE STRING "" FORCE) set(BGFX_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bgfx CACHE STRING "" FORCE) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bx bx-build) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bimg bimg-build) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bgfx bgfx-build) - -set(SDL_MAIN_HANDLED ON CACHE BOOL "" FORCE) -set(SDL_STATIC_PIC ON CACHE BOOL "" FORCE) - -set(SDL_SHARED OFF CACHE BOOL "" FORCE) -set(SDL_STATIC ON CACHE BOOL "" FORCE) -set(SDL_TEST OFF CACHE BOOL "" FORCE) -set(SDL_WAYLAND ON CACHE BOOL "" FORCE) -set(SDL_LIBDECOR ON CACHE BOOL "" FORCE) -set(SDL_X11 ON CACHE BOOL "" FORCE) -set(SDL_X11_XSCRNSAVER OFF CACHE BOOL "" FORCE) -set(SDL_WAYLAND_SHARED OFF CACHE BOOL "" FORCE) -set(SDL_X11_SHARED OFF CACHE BOOL "" FORCE) -set(SDL_ALSA_SHARED OFF CACHE BOOL "" FORCE) -set(SDL_PULSEAUDIO_SHARED OFF CACHE BOOL "" FORCE) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdl sdl-build) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/stb) target_link_libraries(bgfx PUBLIC bx bimg) From c6007b8f9f0eacbb23b10931d979cddd3ca37763 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Fri, 22 May 2026 15:43:34 +0500 Subject: [PATCH 37/41] Cleanup + improvements --- .github/workflows/linux_build.yml | 2 - engine/native/rendering/CMakeLists.txt | 55 +- engine/native/rendering/rhi/buffers.cpp | 103 ++++ engine/native/rendering/rhi/commands.cpp | 152 +++++ engine/native/rendering/rhi/core.cpp | 289 ++++++++++ engine/native/rendering/rhi/macros.h | 29 + engine/native/rendering/rhi/pipelines.cpp | 72 +++ engine/native/rendering/rhi/rhi.cppm | 44 ++ engine/native/rendering/rhi/rhi_bgfx.cpp | 652 ---------------------- engine/native/rendering/rhi/texture.cpp | 127 +++++ 10 files changed, 822 insertions(+), 703 deletions(-) create mode 100644 engine/native/rendering/rhi/buffers.cpp create mode 100644 engine/native/rendering/rhi/commands.cpp create mode 100644 engine/native/rendering/rhi/core.cpp create mode 100644 engine/native/rendering/rhi/macros.h create mode 100644 engine/native/rendering/rhi/pipelines.cpp delete mode 100644 engine/native/rendering/rhi/rhi_bgfx.cpp create mode 100644 engine/native/rendering/rhi/texture.cpp diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index cf3f90b..e77cbcb 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -1,7 +1,5 @@ name: 🐧 Linux Builds -description: Build Draconic Engine on Linux using Clang 20 and CMake with Ninja - on: push: branches: diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index decda98..1753808 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -5,52 +5,9 @@ add_modules_library(mesh) add_modules_library(material) add_modules_library(quad_renderer) -target_link_libraries(rhi - PUBLIC - core - math - memory - platform - bgfx - bx -) - -target_link_libraries(rendergraph - PUBLIC - rhi - bx -) - -target_link_libraries(mesh - PUBLIC - memory - rhi - math - core -) - -target_link_libraries(material - PUBLIC - rhi -) - -target_link_libraries(quad_renderer - PUBLIC - rhi - rendergraph - bgfx - bx -) - -target_link_libraries(renderer - PUBLIC - core - rhi - rendergraph - mesh - quad_renderer - scene - transform - bgfx - bx -) \ No newline at end of file +target_link_libraries(rhi PUBLIC core math memory platform bgfx bx) +target_link_libraries(rendergraph PUBLIC rhi bx) +target_link_libraries(mesh PUBLIC memory rhi math core) +target_link_libraries(material PUBLIC rhi) +target_link_libraries(quad_renderer PUBLIC rhi rendergraph bgfx bx) +target_link_libraries(renderer PUBLIC core rhi rendergraph mesh quad_renderer scene transform bgfx bx) \ No newline at end of file diff --git a/engine/native/rendering/rhi/buffers.cpp b/engine/native/rendering/rhi/buffers.cpp new file mode 100644 index 0000000..d4659da --- /dev/null +++ b/engine/native/rendering/rhi/buffers.cpp @@ -0,0 +1,103 @@ +module; + +#include + +#include "macros.h" + +module rendering.rhi; + +import core.stdtypes; +import core.math.constants; + +namespace draco::rendering::rhi +{ + BufferHandle create_vertex_buffer(const void* data, u32 size, LayoutHandle layout_h) + { + RHI_ASSERT(data != nullptr, "Vertex buffer data is null"); + RHI_ASSERT(size > 0, "Vertex buffer size is zero"); + + auto* layout = get_checked(g_layouts, layout_h, "Layout"); + + RHI_ASSERT(layout, "Invalid vertex layout"); + + auto vbh = bgfx::createVertexBuffer(bgfx::copy(data, size), layout->layout); + + Buffer buf; + buf.vbh = vbh; + + return g_buffers.create(buf); + } + + BufferHandle create_index_buffer(const void* data, u32 size) + { + RHI_ASSERT(data != nullptr, "Index buffer data is null"); + RHI_ASSERT(size > 0, "Index buffer size is zero"); + + bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer(bgfx::copy(data, size), BGFX_BUFFER_INDEX32); + + Buffer buf; // Idk why I named it this, it just sounds funny ;) + buf.ibh = ibh; + buf.is_index = true; + + return g_buffers.create(buf); + } + + BufferHandle create_dynamic_vertex_buffer(u32 size, LayoutHandle layout_h) + { + auto* layout = get_checked(g_layouts, layout_h, "Layout"); + RHI_ASSERT(layout, "Invalid layout"); + + bgfx::DynamicVertexBufferHandle dvbh = bgfx::createDynamicVertexBuffer(size, layout->layout); + + RHI_ASSERT(bgfx::isValid(dvbh), "Failed to create dynamic vertex buffer"); + + Buffer buf; + buf.dvbh = dvbh; + buf.is_dynamic = true; + + return g_buffers.create(buf); + } + + void update_dynamic_vertex_buffer(BufferHandle handle, u32 start_vertex, const void* data, u32 size) + { + auto* buf = get_checked(g_buffers, handle, "Buffer"); + + if (!buf) + return; + + RHI_ASSERT(buf->is_dynamic && !buf->is_index, "Not a dynamic vertex buffer"); + RHI_ASSERT(bgfx::isValid(buf->dvbh), "Invalid dynamic vertex buffer handle"); + + const bgfx::Memory* mem = bgfx::copy(data, size); + + bgfx::update(buf->dvbh, start_vertex, mem); + } + + BufferHandle create_dynamic_index_buffer(u32 size, u16 flags) + { + bgfx::DynamicIndexBufferHandle ibh = bgfx::createDynamicIndexBuffer(size, flags); + + RHI_ASSERT(bgfx::isValid(ibh), "Invalid dynamic index buffer handle"); + + Buffer buf{}; + buf.is_dynamic = true; + buf.is_index = true; + buf.dibh = ibh; + + return g_buffers.create(buf); + } + + void update_dynamic_index_buffer(BufferHandle handle, u32 start_index, const void* data, u32 size) + { + auto* buf = get_checked(g_buffers, handle, "DynamicIndexBuffer"); + + if (!buf) + return; + + RHI_ASSERT(buf->is_dynamic && buf->is_index, "Not a dynamic index buffer"); + + const bgfx::Memory* mem = bgfx::copy(data, size); + + bgfx::update(buf->dibh, start_index, mem); + } +} diff --git a/engine/native/rendering/rhi/commands.cpp b/engine/native/rendering/rhi/commands.cpp new file mode 100644 index 0000000..b1e4fbb --- /dev/null +++ b/engine/native/rendering/rhi/commands.cpp @@ -0,0 +1,152 @@ +module; + +#include + +#include +#include + +#include "macros.h" + +module rendering.rhi; + +import core.stdtypes; +import core.math.constants; + +namespace draco::rendering::rhi +{ + void perspective(f32* out, f32 fov, f32 aspect, f32 nearp, f32 farp) + { + bx::mtxProj(out, fov, aspect, nearp, farp, bgfx::getCaps()->homogeneousDepth); + } + + void look_at(f32* out, const f32* eye, const f32* at, const f32* up) + { + bx::Vec3 eye_v { eye[0], eye[1], eye[2] }; + bx::Vec3 at_v { at[0], at[1], at[2] }; + bx::Vec3 up_v { up[0], up[1], up[2] }; + + bx::mtxLookAt(out, eye_v, at_v, up_v); + } + + // Note: Internal use only, use apply_view() instead + void set_view_rect(ViewID view, u16 x, u16 y, u16 w, u16 h) + { + bgfx::setViewRect(view, x, y, w, h); + } + + // Note: Internal use only, use apply_view() instead + void set_view_framebuffer(ViewID view, FramebufferHandle h) + { + auto* fb = get_checked(g_framebuffers, h, "Framebuffer"); + + if (!fb) + return; + + bgfx::setViewFrameBuffer(view, fb->fbh); + } + + void set_view_projection(ViewID view, const f32* view_mtx, const f32* proj_mtx) + { + bgfx::setViewTransform(view, view_mtx, proj_mtx); + } + + void set_scissor(const ScissorRect& r) + { + if (!r.enabled) + bgfx::setScissor(math::UINT16_MAX_VAL); + else + bgfx::setScissor(r.x, r.y, r.w, r.h); + } + + void set_stencil(u32 fstencil, u32 bstencil) + { + bgfx::setStencil(fstencil, bstencil); + } + + void apply_view(ViewID view, const ViewDesc& desc) + { + if (desc.fb != InvalidFramebuffer) + { + auto* fb = get_checked(g_framebuffers, desc.fb, "Framebuffer"); + + if (fb && bgfx::isValid(fb->fbh)) + { + bgfx::setViewFrameBuffer(view, fb->fbh); + } + else + { + RHI_WARN(false, "Framebuffer invalid at apply_view"); + } + } + + bgfx::setViewRect(view, desc.x, desc.y, desc.w, desc.h); + + if (desc.clear_flags != 0) + { + bgfx::setViewClear(view, desc.clear_flags, desc.clear_color); + } + } + + void identity_matrix(f32* mtx) + { + bx::mtxIdentity(mtx); + } + + void submit(const RenderPacket& p, ViewID view) + { + auto* pipeline = get_checked(g_pipelines, p.pipeline, "Pipeline"); + auto* vb = get_checked(g_buffers, p.vertex_buffer, "VertexBuffer"); + Buffer* ib = nullptr; + + if (!pipeline || !vb) + return; + + if (p.index_buffer != InvalidBuffer) + ib = get_checked(g_buffers, p.index_buffer, "IndexBuffer"); + + // Transform matrix (model) + bgfx::setTransform(p.model); + + // Vertex buffer binding with explicit range control + if (vb->is_dynamic) + { + // If count is UINT32_MAX, bgfx will fallback to drawing the full buffer automatically + bgfx::setVertexBuffer(0, vb->dvbh, 0, p.vertex_count); + } else { + bgfx::setVertexBuffer(0, vb->vbh, 0, p.vertex_count); + } + + // Index buffer binding with explicit range control + if (ib && ib->is_index) + { + if (ib->is_dynamic) + { + bgfx::setIndexBuffer(ib->dibh, 0, p.index_count); + } else { + bgfx::setIndexBuffer(ib->ibh, 0, p.index_count); + } + } + + // Uniforms + for (const auto& u : p.uniforms) + { + if (auto* handle = get_checked(g_uniforms, u.handle, "UniformBind")) + { + bgfx::setUniform(*handle, u.data, u.num); + } + } + + // Texture binding + if (auto* tex = get_checked(g_textures, p.texture_handle, "Texture")) + { + if (auto* sampler = get_checked(g_uniforms, p.sampler_uniform, "Sampler")) + { + bgfx::setTexture(p.texture_unit, *sampler, *tex, p.sampler_flags); + } + } + + // Apply pipeline state & submit draw call + bgfx::setState(pipeline->state); + bgfx::submit(view, pipeline->program); + } +} diff --git a/engine/native/rendering/rhi/core.cpp b/engine/native/rendering/rhi/core.cpp new file mode 100644 index 0000000..b3782ef --- /dev/null +++ b/engine/native/rendering/rhi/core.cpp @@ -0,0 +1,289 @@ +module; + +#include +#include +#include +#include +#include + +#include +#include + +#include "macros.h" + +module rendering.rhi; + +import core.stdtypes; +import core.math.constants; + +namespace draco::rendering::rhi +{ + using namespace draco::core::memory; + + HandleRegistry g_buffers; + HandleRegistry g_pipelines; + HandleRegistry g_uniforms; + HandleRegistry g_textures; + HandleRegistry g_framebuffers; + HandleRegistry g_shaders; + HandleRegistry g_layouts; + + std::vector g_deletion_queue; + u16 g_width = 0; + u16 g_height = 0; + + // GPU-safe destruction (delayed by 2 frames) + // This is the industry standard + template + void scrap_later(T handle) + { + if (!bgfx::isValid(handle)) + return; + + g_deletion_queue.push_back({ + bgfx::getStats()->gpuFrameNum, + [handle]() { bgfx::destroy(handle); } + }); + } + + void destroy_later(bgfx::ShaderHandle handle) { scrap_later(handle); } + void destroy_later(bgfx::TextureHandle handle) { scrap_later(handle); } + void destroy_later(bgfx::FrameBufferHandle handle) { scrap_later(handle); } + void destroy_later(bgfx::UniformHandle handle) { scrap_later(handle); } + + void process_deletions() + { + u64 frame = bgfx::getStats()->gpuFrameNum; + + std::erase_if(g_deletion_queue, [frame](const auto& d) + { + if (frame >= d.frame + 2) + { + d.cleanup(); + return true; + } + return false; + }); + } + + bool init(void* display_type, void* window_handle, draco::platform::NativeWindowType window_type, u16 width, u16 height) + { + g_width = width; + g_height = height; + + bgfx::Init init{}; + init.type = bgfx::RendererType::Count; + + init.platformData.ndt = display_type; + init.platformData.nwh = window_handle; + + // Map our internal window type to bgfx's native window handle type + if (window_type == draco::platform::NativeWindowType::Wayland) + { + init.platformData.type = bgfx::NativeWindowHandleType::Wayland; + } + else + { + // Others can work fine with the default type + init.platformData.type = bgfx::NativeWindowHandleType::Default; + } + + init.resolution.width = width; + init.resolution.height = height; + init.resolution.reset = BGFX_RESET_VSYNC; + + if (!bgfx::init(init)) + { + RHI_WARN(false, "bgfx initialization failed"); + return false; + } + + bgfx::setDebug(BGFX_DEBUG_TEXT); + return true; + } + + void resize(u16 width, u16 height) + { + if(width == 0 || height == 0) + return; // Minimized window safety + + if(width == g_width && height == g_height) + return; // No need to resize + + g_width = width; + g_height = height; + + bgfx::reset(width, height, BGFX_RESET_VSYNC); + } + + void shutdown() + { + // Walk all registries and destroy live GPU objects + for (auto& slot : g_buffers.internal().raw()) + { + if (!slot.alive) continue; + + if (bgfx::isValid(slot.value.vbh)) + bgfx::destroy(slot.value.vbh); + + if (bgfx::isValid(slot.value.ibh)) + bgfx::destroy(slot.value.ibh); + + if (bgfx::isValid(slot.value.dvbh)) + bgfx::destroy(slot.value.dvbh); + } + + for (auto& slot : g_pipelines.internal().raw()) + { + if (!slot.alive) continue; + + if (bgfx::isValid(slot.value.program)) + bgfx::destroy(slot.value.program); + } + + for (auto& slot : g_uniforms.internal().raw()) + { + if (!slot.alive) continue; + + if (bgfx::isValid(slot.value)) + bgfx::destroy(slot.value); + } + + for (auto& slot : g_textures.internal().raw()) + { + if (!slot.alive) continue; + + if (bgfx::isValid(slot.value)) + bgfx::destroy(slot.value); + } + + bgfx::shutdown(); + } + + void destroy_buffer(BufferHandle h) + { + auto* buf = get_checked(g_buffers, h, "Buffer"); + + if (!buf) + return; + + if (bgfx::isValid(buf->vbh)) + destroy_later(buf->vbh); + + if (bgfx::isValid(buf->ibh)) + destroy_later(buf->ibh); + + if (bgfx::isValid(buf->dvbh)) + destroy_later(buf->dvbh); + + if (bgfx::isValid(buf->dibh)) + destroy_later(buf->dibh); + + g_buffers.destroy(h); + } + + u64 map_state(PipelineState s, BlendMode blend, DepthTest depth, CullMode cull, bool depth_write) + { + u64 state = 0; + + if ((s & PipelineState::WriteRGB) != PipelineState::Default) + state |= BGFX_STATE_WRITE_RGB; + + if ((s & PipelineState::WriteAlpha) != PipelineState::Default) + state |= BGFX_STATE_WRITE_A; + + if (depth_write) + state |= BGFX_STATE_WRITE_Z; + + switch (depth) + { + case DepthTest::Less: state |= BGFX_STATE_DEPTH_TEST_LESS; break; + case DepthTest::Equal: state |= BGFX_STATE_DEPTH_TEST_EQUAL; break; + case DepthTest::Always: state |= BGFX_STATE_DEPTH_TEST_ALWAYS; break; + case DepthTest::None: break; + } + + + switch (cull) + { + case CullMode::CW: state |= BGFX_STATE_CULL_CW; break; + case CullMode::CCW: state |= BGFX_STATE_CULL_CCW; break; + case CullMode::None: break; + } + + switch (blend) + { + case BlendMode::Alpha: + state |= BGFX_STATE_BLEND_ALPHA; + break; + + case BlendMode::Additive: + state |= BGFX_STATE_BLEND_ADD; + break; + + case BlendMode::Multiply: + state |= BGFX_STATE_BLEND_MULTIPLY; + break; + + case BlendMode::None: + break; + } + + if ((s & PipelineState::MSAA) != PipelineState::Default) + state |= BGFX_STATE_MSAA; + + if ((s & PipelineState::PrimitiveTriStrip) != PipelineState::Default) + state |= BGFX_STATE_PT_TRISTRIP; + + return state; + } + + bgfx::UniformType::Enum map_uniform_type(UniformType t) + { + switch (t) + { + case UniformType::Sampler: return bgfx::UniformType::Sampler; + case UniformType::Vec4: return bgfx::UniformType::Vec4; + case UniformType::Mat3: return bgfx::UniformType::Mat3; + case UniformType::Mat4: return bgfx::UniformType::Mat4; + } + return bgfx::UniformType::Vec4; + } + + bgfx::Attrib::Enum map_attrib(Attrib a) + { + switch (a) + { + case Attrib::Position: return bgfx::Attrib::Position; + case Attrib::Color0: return bgfx::Attrib::Color0; + case Attrib::TexCoord0: return bgfx::Attrib::TexCoord0; + case Attrib::Normal: return bgfx::Attrib::Normal; + case Attrib::Tangent: return bgfx::Attrib::Tangent; + } + + return bgfx::Attrib::Position; + } + + bgfx::AttribType::Enum map_attrib_type(AttribType t) + { + switch (t) + { + case AttribType::Float: return bgfx::AttribType::Float; + case AttribType::Uint8: return bgfx::AttribType::Uint8; + } + + return bgfx::AttribType::Float; + } + + void begin_frame() + { + // Clean up GPU resources safely + process_deletions(); + } + + void end_frame() + { + // Submit frame to GPU + bgfx::frame(); + } +} diff --git a/engine/native/rendering/rhi/macros.h b/engine/native/rendering/rhi/macros.h new file mode 100644 index 0000000..d055a9c --- /dev/null +++ b/engine/native/rendering/rhi/macros.h @@ -0,0 +1,29 @@ +// rendering/rhi/macros.h + +#pragma once +#include +#include + +#ifndef DRACO_RHI_VALIDATION +#define DRACO_RHI_VALIDATION 1 +#endif + +#if DRACO_RHI_VALIDATION + #define RHI_ASSERT(cond, msg, ...) \ + do { \ + if (!(cond)) { \ + std::println("[RHI ERROR] " msg, ##__VA_ARGS__); \ + std::abort(); \ + } \ + } while(0) + + #define RHI_WARN(cond, msg, ...) \ + do { \ + if (!(cond)) { \ + std::println("[RHI WARNING] " msg, ##__VA_ARGS__); \ + } \ + } while(0) +#else + #define RHI_ASSERT(cond, msg, ...) do { (void)(cond); } while(0) + #define RHI_WARN(cond, msg, ...) do { (void)(cond); } while(0) +#endif diff --git a/engine/native/rendering/rhi/pipelines.cpp b/engine/native/rendering/rhi/pipelines.cpp new file mode 100644 index 0000000..c8cce41 --- /dev/null +++ b/engine/native/rendering/rhi/pipelines.cpp @@ -0,0 +1,72 @@ +module; + +#include + +#include + +#include "macros.h" + +module rendering.rhi; + +import core.stdtypes; +import core.math.constants; + +namespace draco::rendering::rhi +{ + PipelineHandle create_pipeline(const PipelineDesc& desc) + { + RHI_ASSERT(desc.vs != InvalidShader, "Pipeline missing vertex shader"); + RHI_ASSERT(desc.fs != InvalidShader, "Pipeline missing fragment shader"); + + bgfx::ProgramHandle prog = bgfx::createProgram(resolve(desc.vs), resolve(desc.fs), true); + + u64 state = map_state(desc.state, desc.blend, desc.depth, desc.cull, desc.depth_write); + + return g_pipelines.create({ prog, state }); + } + + LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc) + { + bgfx::VertexLayout layout; + layout.begin(); + + for (const auto& e : desc.elements) + { + layout.add(map_attrib(e.attrib), e.count, map_attrib_type(e.type), e.normalized); + } + + layout.end(); + + return g_layouts.create({ layout }); + } + + ShaderHandle create_shader(const void* data, u32 size) + { + RHI_ASSERT(data && size > 0, "Invalid shader data"); + + bgfx::ShaderHandle sh = bgfx::createShader(bgfx::copy(data, size)); + + return g_shaders.create(sh); + } + + bgfx::ShaderHandle resolve(ShaderHandle h) + { + auto* sh = g_shaders.get(h); + return sh ? *sh : bgfx::ShaderHandle{ bgfx::kInvalidHandle }; + } + + // For debugging/tooling + bgfx::ShaderHandle* get_shader_native(ShaderHandle h) + { + return get_checked(g_shaders, h, "Shader"); + } + + void destroy_shader(ShaderHandle h) + { + if (auto* sh = get_checked(g_shaders, h, "Shader")) + { + destroy_later(*sh); + g_shaders.destroy(h); + } + } +} diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index 5aaa818..17feaa1 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -3,9 +3,13 @@ module; #include #include #include +#include +#include #include +#include "macros.h" + export module rendering.rhi; import core.stdtypes; @@ -268,3 +272,43 @@ export namespace draco::rendering::rhi return static_cast(static_cast(a) & static_cast(b)); } } + +// These are the things that we don't export but are visible to all implementation files +namespace draco::rendering::rhi +{ + using namespace draco::core::memory; + + extern HandleRegistry g_buffers; + extern HandleRegistry g_pipelines; + extern HandleRegistry g_uniforms; + extern HandleRegistry g_textures; + extern HandleRegistry g_framebuffers; + extern HandleRegistry g_shaders; + extern HandleRegistry g_layouts; + + // Deferred destruction queue (GPU-safe deletion) + extern std::vector g_deletion_queue; + + extern u16 g_width; + extern u16 g_height; + + // Explicit overloads + void destroy_later(bgfx::ShaderHandle handle); + void destroy_later(bgfx::TextureHandle handle); + void destroy_later(bgfx::FrameBufferHandle handle); + void destroy_later(bgfx::UniformHandle handle); + + // Ensures a handle is valid before use + // TODO: Replace with something better + template + auto* get_checked(Registry& reg, HandleT h, const char* name) + { + if (!reg.valid(h)) + { + RHI_WARN(false, "{} handle invalid or stale!", name); + return (decltype(reg.get(h)))nullptr; + } + + return reg.get(h); + } +} diff --git a/engine/native/rendering/rhi/rhi_bgfx.cpp b/engine/native/rendering/rhi/rhi_bgfx.cpp deleted file mode 100644 index 3012113..0000000 --- a/engine/native/rendering/rhi/rhi_bgfx.cpp +++ /dev/null @@ -1,652 +0,0 @@ -module; - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -module rendering.rhi; - -import core.stdtypes; -import core.math.constants; - -namespace draco::rendering::rhi -{ - #ifndef DRACO_RHI_VALIDATION - #define DRACO_RHI_VALIDATION 1 - #endif - - #if DRACO_RHI_VALIDATION - #define RHI_ASSERT(cond, msg, ...) \ - do { \ - if (!(cond)) { \ - std::println("[RHI ERROR] " msg, ##__VA_ARGS__); \ - std::abort(); \ - } \ - } while(0) - - #define RHI_WARN(cond, msg, ...) \ - do { \ - if (!(cond)) { \ - std::println("[RHI WARNING] " msg, ##__VA_ARGS__); \ - } \ - } while(0) - #else - #define RHI_ASSERT(cond, msg, ...) do { (void)(cond); } while(0) - #define RHI_WARN(cond, msg, ...) do { (void)(cond); } while(0) - #endif - - using namespace draco::core::memory; - - static HandleRegistry g_buffers; - static HandleRegistry g_pipelines; - static HandleRegistry g_uniforms; - static HandleRegistry g_textures; - static HandleRegistry g_framebuffers; - static HandleRegistry g_shaders; - static HandleRegistry g_layouts; - - // Deferred destruction queue (GPU-safe deletion) - static std::vector g_deletion_queue; - - static u16 g_width = 0; - static u16 g_height = 0; - - // Ensures a handle is valid before use - // TODO: Replace with something better - template - auto* get_checked(Registry& reg, HandleT h, const char* name) - { - if (!reg.valid(h)) - { - RHI_WARN(false, "{} handle invalid or stale!", name); - return (decltype(reg.get(h)))nullptr; - } - - return reg.get(h); - } - - // GPU-safe destruction (delayed by 2 frames) - // This is the industry standard - template - void destroy_later(T handle) - { - if (!bgfx::isValid(handle)) - return; - - g_deletion_queue.push_back({ - bgfx::getStats()->gpuFrameNum, - [handle]() { bgfx::destroy(handle); } - }); - } - - void process_deletions() - { - u64 frame = bgfx::getStats()->gpuFrameNum; - - std::erase_if(g_deletion_queue, [frame](const auto& d) - { - if (frame >= d.frame + 2) - { - d.cleanup(); - return true; - } - return false; - }); - } - - bool init(void* display_type, void* window_handle, draco::platform::NativeWindowType window_type, u16 width, u16 height) - { - g_width = width; - g_height = height; - - bgfx::Init init{}; - init.type = bgfx::RendererType::Count; - - init.platformData.ndt = display_type; - init.platformData.nwh = window_handle; - - // Map our internal window type to bgfx's native window handle type - if (window_type == draco::platform::NativeWindowType::Wayland) - { - init.platformData.type = bgfx::NativeWindowHandleType::Wayland; - } - else - { - // Others can work fine with the default type - init.platformData.type = bgfx::NativeWindowHandleType::Default; - } - - init.resolution.width = width; - init.resolution.height = height; - init.resolution.reset = BGFX_RESET_VSYNC; - - if (!bgfx::init(init)) - { - RHI_WARN(false, "bgfx initialization failed"); - return false; - } - - bgfx::setDebug(BGFX_DEBUG_TEXT); - return true; - } - - void resize(u16 width, u16 height) - { - if(width == 0 || height == 0) - return; // Minimized window safety - - if(width == g_width && height == g_height) - return; // No need to resize - - g_width = width; - g_height = height; - - bgfx::reset(width, height, BGFX_RESET_VSYNC); - } - - void shutdown() - { - // Walk all registries and destroy live GPU objects - for (auto& slot : g_buffers.internal().raw()) - { - if (!slot.alive) continue; - - if (bgfx::isValid(slot.value.vbh)) - bgfx::destroy(slot.value.vbh); - - if (bgfx::isValid(slot.value.ibh)) - bgfx::destroy(slot.value.ibh); - - if (bgfx::isValid(slot.value.dvbh)) - bgfx::destroy(slot.value.dvbh); - } - - for (auto& slot : g_pipelines.internal().raw()) - { - if (!slot.alive) continue; - - if (bgfx::isValid(slot.value.program)) - bgfx::destroy(slot.value.program); - } - - for (auto& slot : g_uniforms.internal().raw()) - { - if (!slot.alive) continue; - - if (bgfx::isValid(slot.value)) - bgfx::destroy(slot.value); - } - - for (auto& slot : g_textures.internal().raw()) - { - if (!slot.alive) continue; - - if (bgfx::isValid(slot.value)) - bgfx::destroy(slot.value); - } - - bgfx::shutdown(); - } - - PipelineHandle create_pipeline(const PipelineDesc& desc) - { - RHI_ASSERT(desc.vs != InvalidShader, "Pipeline missing vertex shader"); - RHI_ASSERT(desc.fs != InvalidShader, "Pipeline missing fragment shader"); - - bgfx::ProgramHandle prog = bgfx::createProgram(resolve(desc.vs), resolve(desc.fs), true); - - u64 state = map_state(desc.state, desc.blend, desc.depth, desc.cull, desc.depth_write); - - return g_pipelines.create({ prog, state }); - } - - BufferHandle create_vertex_buffer(const void* data, u32 size, LayoutHandle layout_h) - { - RHI_ASSERT(data != nullptr, "Vertex buffer data is null"); - RHI_ASSERT(size > 0, "Vertex buffer size is zero"); - - auto* layout = get_checked(g_layouts, layout_h, "Layout"); - - RHI_ASSERT(layout, "Invalid vertex layout"); - - auto vbh = bgfx::createVertexBuffer(bgfx::copy(data, size), layout->layout); - - Buffer buf; - buf.vbh = vbh; - - return g_buffers.create(buf); - } - - BufferHandle create_index_buffer(const void* data, u32 size) - { - RHI_ASSERT(data != nullptr, "Index buffer data is null"); - RHI_ASSERT(size > 0, "Index buffer size is zero"); - - bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer(bgfx::copy(data, size), BGFX_BUFFER_INDEX32); - - Buffer buf; // Idk why I named it this, it just sounds funny ;) - buf.ibh = ibh; - buf.is_index = true; - - return g_buffers.create(buf); - } - - BufferHandle create_dynamic_vertex_buffer(u32 size, LayoutHandle layout_h) - { - auto* layout = get_checked(g_layouts, layout_h, "Layout"); - RHI_ASSERT(layout, "Invalid layout"); - - bgfx::DynamicVertexBufferHandle dvbh = bgfx::createDynamicVertexBuffer(size, layout->layout); - - RHI_ASSERT(bgfx::isValid(dvbh), "Failed to create dynamic vertex buffer"); - - Buffer buf; - buf.dvbh = dvbh; - buf.is_dynamic = true; - - return g_buffers.create(buf); - } - - void update_dynamic_vertex_buffer(BufferHandle handle, u32 start_vertex, const void* data, u32 size) - { - auto* buf = get_checked(g_buffers, handle, "Buffer"); - - if (!buf) - return; - - RHI_ASSERT(buf->is_dynamic && !buf->is_index, "Not a dynamic vertex buffer"); - RHI_ASSERT(bgfx::isValid(buf->dvbh), "Invalid dynamic vertex buffer handle"); - - const bgfx::Memory* mem = bgfx::copy(data, size); - - bgfx::update(buf->dvbh, start_vertex, mem); - } - - BufferHandle create_dynamic_index_buffer(u32 size, u16 flags) - { - bgfx::DynamicIndexBufferHandle ibh = bgfx::createDynamicIndexBuffer(size, flags); - - RHI_ASSERT(bgfx::isValid(ibh), "Invalid dynamic index buffer handle"); - - Buffer buf{}; - buf.is_dynamic = true; - buf.is_index = true; - buf.dibh = ibh; - - return g_buffers.create(buf); - } - - void update_dynamic_index_buffer(BufferHandle handle, u32 start_index, const void* data, u32 size) - { - auto* buf = get_checked(g_buffers, handle, "DynamicIndexBuffer"); - - if (!buf) - return; - - RHI_ASSERT(buf->is_dynamic && buf->is_index, "Not a dynamic index buffer"); - - const bgfx::Memory* mem = bgfx::copy(data, size); - - bgfx::update(buf->dibh, start_index, mem); - } - - void destroy_buffer(BufferHandle h) - { - auto* buf = get_checked(g_buffers, h, "Buffer"); - - if (!buf) - return; - - if (bgfx::isValid(buf->vbh)) - destroy_later(buf->vbh); - - if (bgfx::isValid(buf->ibh)) - destroy_later(buf->ibh); - - if (bgfx::isValid(buf->dvbh)) - destroy_later(buf->dvbh); - - if (bgfx::isValid(buf->dibh)) - destroy_later(buf->dibh); - - g_buffers.destroy(h); - } - - LayoutHandle create_vertex_layout(const VertexLayoutDesc& desc) - { - bgfx::VertexLayout layout; - layout.begin(); - - for (const auto& e : desc.elements) - { - layout.add(map_attrib(e.attrib), e.count, map_attrib_type(e.type), e.normalized); - } - - layout.end(); - - return g_layouts.create({ layout }); - } - - UniformHandle create_uniform(const char* name, UniformType type, u16 num) - { - RHI_ASSERT(name != nullptr, "Uniform name is null"); - - auto u = bgfx::createUniform(name, map_uniform_type(type), num); - return g_uniforms.create(u); - } - - void set_uniform(UniformHandle h, const void* data, u16 num) - { - auto* u = get_checked(g_uniforms, h, "Uniform"); - if (!u) return; - - RHI_ASSERT(data != nullptr, "Uniform data is null"); - - bgfx::setUniform(*u, data, num); - } - - void destroy_uniform(UniformHandle h) - { - auto* u = get_checked(g_uniforms, h, "Uniform"); - if (!u) return; - - destroy_later(*u); - g_uniforms.destroy(h); - } - - TextureHandle create_texture(const void* data, u32 w, u32 h, u32 flags) - { - RHI_ASSERT(data != nullptr, "Texture data is null"); - RHI_ASSERT(w > 0 && h > 0, "Invalid texture dimensions"); - - auto tex = bgfx::createTexture2D( - w, h, false, 1, - bgfx::TextureFormat::RGBA8, - flags == 0 ? (BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP) : flags, - bgfx::copy(data, w * h * 4) - ); - - return g_textures.create(tex); - } - - ShaderHandle create_shader(const void* data, u32 size) - { - RHI_ASSERT(data && size > 0, "Invalid shader data"); - - bgfx::ShaderHandle sh = bgfx::createShader(bgfx::copy(data, size)); - - return g_shaders.create(sh); - } - - bgfx::ShaderHandle resolve(ShaderHandle h) - { - auto* sh = g_shaders.get(h); - return sh ? *sh : bgfx::ShaderHandle{ bgfx::kInvalidHandle }; - } - - // For debugging/tooling - bgfx::ShaderHandle* get_shader_native(ShaderHandle h) - { - return get_checked(g_shaders, h, "Shader"); - } - - void destroy_shader(ShaderHandle h) - { - if (auto* sh = get_checked(g_shaders, h, "Shader")) - { - destroy_later(*sh); - g_shaders.destroy(h); - } - } - - void perspective(f32* out, f32 fov, f32 aspect, f32 nearp, f32 farp) - { - bx::mtxProj(out, fov, aspect, nearp, farp, bgfx::getCaps()->homogeneousDepth); - } - - void look_at(f32* out, const f32* eye, const f32* at, const f32* up) - { - bx::Vec3 eye_v { eye[0], eye[1], eye[2] }; - bx::Vec3 at_v { at[0], at[1], at[2] }; - bx::Vec3 up_v { up[0], up[1], up[2] }; - - bx::mtxLookAt(out, eye_v, at_v, up_v); - } - - // Note: Internal use only, use apply_view() instead - void set_view_framebuffer(ViewID view, FramebufferHandle h) - { - auto* fb = get_checked(g_framebuffers, h, "Framebuffer"); - - if (!fb) - return; - - bgfx::setViewFrameBuffer(view, fb->fbh); - } - - // Note: Internal use only, use apply_view() instead - void set_view_rect(ViewID view, u16 x, u16 y, u16 w, u16 h) - { - bgfx::setViewRect(view, x, y, w, h); - } - - void set_view_projection(ViewID view, const f32* view_mtx, const f32* proj_mtx) - { - bgfx::setViewTransform(view, view_mtx, proj_mtx); - } - - void set_scissor(const ScissorRect& r) - { - if (!r.enabled) - bgfx::setScissor(math::UINT16_MAX_VAL); - else - bgfx::setScissor(r.x, r.y, r.w, r.h); - } - - void set_stencil(u32 fstencil, u32 bstencil) - { - bgfx::setStencil(fstencil, bstencil); - } - - u64 map_state(PipelineState s, BlendMode blend, DepthTest depth, CullMode cull, bool depth_write) - { - u64 state = 0; - - if ((s & PipelineState::WriteRGB) != PipelineState::Default) - state |= BGFX_STATE_WRITE_RGB; - - if ((s & PipelineState::WriteAlpha) != PipelineState::Default) - state |= BGFX_STATE_WRITE_A; - - if (depth_write) - state |= BGFX_STATE_WRITE_Z; - - switch (depth) - { - case DepthTest::Less: state |= BGFX_STATE_DEPTH_TEST_LESS; break; - case DepthTest::Equal: state |= BGFX_STATE_DEPTH_TEST_EQUAL; break; - case DepthTest::Always: state |= BGFX_STATE_DEPTH_TEST_ALWAYS; break; - case DepthTest::None: break; - } - - - switch (cull) - { - case CullMode::CW: state |= BGFX_STATE_CULL_CW; break; - case CullMode::CCW: state |= BGFX_STATE_CULL_CCW; break; - case CullMode::None: break; - } - - switch (blend) - { - case BlendMode::Alpha: - state |= BGFX_STATE_BLEND_ALPHA; - break; - - case BlendMode::Additive: - state |= BGFX_STATE_BLEND_ADD; - break; - - case BlendMode::Multiply: - state |= BGFX_STATE_BLEND_MULTIPLY; - break; - - case BlendMode::None: - break; - } - - if ((s & PipelineState::MSAA) != PipelineState::Default) - state |= BGFX_STATE_MSAA; - - if ((s & PipelineState::PrimitiveTriStrip) != PipelineState::Default) - state |= BGFX_STATE_PT_TRISTRIP; - - return state; - } - - bgfx::UniformType::Enum map_uniform_type(UniformType t) - { - switch (t) - { - case UniformType::Sampler: return bgfx::UniformType::Sampler; - case UniformType::Vec4: return bgfx::UniformType::Vec4; - case UniformType::Mat3: return bgfx::UniformType::Mat3; - case UniformType::Mat4: return bgfx::UniformType::Mat4; - } - return bgfx::UniformType::Vec4; - } - - bgfx::Attrib::Enum map_attrib(Attrib a) - { - switch (a) - { - case Attrib::Position: return bgfx::Attrib::Position; - case Attrib::Color0: return bgfx::Attrib::Color0; - case Attrib::TexCoord0: return bgfx::Attrib::TexCoord0; - case Attrib::Normal: return bgfx::Attrib::Normal; - case Attrib::Tangent: return bgfx::Attrib::Tangent; - } - - return bgfx::Attrib::Position; - } - - bgfx::AttribType::Enum map_attrib_type(AttribType t) - { - switch (t) - { - case AttribType::Float: - return bgfx::AttribType::Float; - - case AttribType::Uint8: - return bgfx::AttribType::Uint8; - } - - return bgfx::AttribType::Float; - } - - void apply_view(ViewID view, const ViewDesc& desc) - { - if (desc.fb != InvalidFramebuffer) - { - auto* fb = get_checked(g_framebuffers, desc.fb, "Framebuffer"); - - if (fb && bgfx::isValid(fb->fbh)) - { - bgfx::setViewFrameBuffer(view, fb->fbh); - } - else - { - RHI_WARN(false, "Framebuffer invalid at apply_view"); - } - } - - bgfx::setViewRect(view, desc.x, desc.y, desc.w, desc.h); - - if (desc.clear_flags != 0) - { - bgfx::setViewClear(view, desc.clear_flags, desc.clear_color); - } - } - - void identity_matrix(f32* mtx) - { - bx::mtxIdentity(mtx); - } - - void submit(const RenderPacket& p, ViewID view) - { - auto* pipeline = get_checked(g_pipelines, p.pipeline, "Pipeline"); - auto* vb = get_checked(g_buffers, p.vertex_buffer, "VertexBuffer"); - Buffer* ib = nullptr; - - if (!pipeline || !vb) - return; - - if (p.index_buffer != InvalidBuffer) - ib = get_checked(g_buffers, p.index_buffer, "IndexBuffer"); - - // Transform matrix (model) - bgfx::setTransform(p.model); - - // Vertex buffer binding with explicit range control - if (vb->is_dynamic) - { - // If count is UINT32_MAX, bgfx will fallback to drawing the full buffer automatically - bgfx::setVertexBuffer(0, vb->dvbh, 0, p.vertex_count); - } else { - bgfx::setVertexBuffer(0, vb->vbh, 0, p.vertex_count); - } - - // Index buffer binding with explicit range control - if (ib && ib->is_index) - { - if (ib->is_dynamic) - { - bgfx::setIndexBuffer(ib->dibh, 0, p.index_count); - } else { - bgfx::setIndexBuffer(ib->ibh, 0, p.index_count); - } - } - - // Uniforms - for (const auto& u : p.uniforms) - { - if (auto* handle = get_checked(g_uniforms, u.handle, "UniformBind")) - { - bgfx::setUniform(*handle, u.data, u.num); - } - } - - // Texture binding - if (auto* tex = get_checked(g_textures, p.texture_handle, "Texture")) - { - if (auto* sampler = get_checked(g_uniforms, p.sampler_uniform, "Sampler")) - { - bgfx::setTexture(p.texture_unit, *sampler, *tex, p.sampler_flags); - } - } - - // Apply pipeline state & submit draw call - bgfx::setState(pipeline->state); - bgfx::submit(view, pipeline->program); - } - - void begin_frame() - { - // Clean up GPU resources safely - process_deletions(); - } - - void end_frame() - { - // Submit frame to GPU - bgfx::frame(); - } -} diff --git a/engine/native/rendering/rhi/texture.cpp b/engine/native/rendering/rhi/texture.cpp new file mode 100644 index 0000000..babed7d --- /dev/null +++ b/engine/native/rendering/rhi/texture.cpp @@ -0,0 +1,127 @@ +module; + +#include + +#include "macros.h" + +module rendering.rhi; + +import core.stdtypes; +import core.math.constants; + +namespace draco::rendering::rhi +{ + UniformHandle create_uniform(const char* name, UniformType type, u16 num) + { + RHI_ASSERT(name != nullptr, "Uniform name is null"); + + auto u = bgfx::createUniform(name, map_uniform_type(type), num); + return g_uniforms.create(u); + } + + void set_uniform(UniformHandle h, const void* data, u16 num) + { + auto* u = get_checked(g_uniforms, h, "Uniform"); + if (!u) return; + + RHI_ASSERT(data != nullptr, "Uniform data is null"); + + bgfx::setUniform(*u, data, num); + } + + void destroy_uniform(UniformHandle h) + { + auto* u = get_checked(g_uniforms, h, "Uniform"); + if (!u) return; + + destroy_later(*u); + g_uniforms.destroy(h); + } + + TextureHandle create_texture(const void* data, u32 w, u32 h, u32 flags) + { + RHI_ASSERT(data != nullptr, "Texture data is null"); + RHI_ASSERT(w > 0 && h > 0, "Invalid texture dimensions"); + + auto tex = bgfx::createTexture2D( + w, h, false, 1, + bgfx::TextureFormat::RGBA8, + flags == 0 ? (BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP) : flags, + bgfx::copy(data, w * h * 4) + ); + + return g_textures.create(tex); + } + + void destroy_texture(TextureHandle h) + { + auto* tex = get_checked(g_textures, h, "Texture"); + if (!tex) return; + + destroy_later(*tex); + g_textures.destroy(h); + } + + FramebufferHandle create_framebuffer(u32 width, u32 height, TextureFormat format) + { + // We set render target flags so it can be attached to a framebuffer object + u64 flags = BGFX_TEXTURE_RT | BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP; + + bgfx::TextureFormat::Enum bgfx_format = bgfx::TextureFormat::RGBA8; + + bgfx::TextureHandle th = bgfx::createTexture2D(static_cast(width), static_cast(height), false, 1, bgfx_format, flags); + + RHI_ASSERT(bgfx::isValid(th), "Failed to allocate backing texture for Framebuffer"); + + TextureHandle color_tex_h = g_textures.create(th); + + bgfx::FrameBufferHandle fbh = bgfx::createFrameBuffer(1, &th, false); + + if (!bgfx::isValid(fbh)) + { + RHI_WARN(false, "Failed to construct native bgfx Framebuffer target!"); + // Roll back the allocated texture if the framebuffer generation bricks + destroy_texture(color_tex_h); + return InvalidFramebuffer; + } + + FramebufferResource res{}; + res.fbh = fbh; + res.texture = color_tex_h; + + return g_framebuffers.create(res); + } + + void destroy_framebuffer(FramebufferHandle handle) + { + if (auto* fb = get_checked(g_framebuffers, handle, "Framebuffer")) + { + // Safely queue the native hardware framebuffer destruction 2 frames out + destroy_later(fb->fbh); + + // Clean up the associated internal texture resource using existing pipelines + if (fb->texture != InvalidTexture) + { + if (auto* th = g_textures.get(fb->texture)) + { + destroy_later(*th); + } + g_textures.destroy(fb->texture); + } + + // Evict our registry tracking slot + g_framebuffers.destroy(handle); + } + } + + TextureHandle get_framebuffer_texture(FramebufferHandle handle) + { + auto* fb = get_checked(g_framebuffers, handle, "Framebuffer"); + if (!fb) + { + return InvalidTexture; + } + + return fb->texture; + } +} From e79fa0b498c5a8d1542a7f67a50179e7ca41477c Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Sun, 24 May 2026 12:19:09 +0500 Subject: [PATCH 38/41] Fix errors --- engine/native/rendering/rhi/buffers.cpp | 1 - engine/native/rendering/rhi/commands.cpp | 2 - engine/native/rendering/rhi/core.cpp | 80 +++++++++++++++++------ engine/native/rendering/rhi/pipelines.cpp | 2 - engine/native/rendering/rhi/rhi.cppm | 33 ++++++---- engine/native/rendering/rhi/texture.cpp | 1 - 6 files changed, 81 insertions(+), 38 deletions(-) diff --git a/engine/native/rendering/rhi/buffers.cpp b/engine/native/rendering/rhi/buffers.cpp index d4659da..d1e6d11 100644 --- a/engine/native/rendering/rhi/buffers.cpp +++ b/engine/native/rendering/rhi/buffers.cpp @@ -1,7 +1,6 @@ module; #include - #include "macros.h" module rendering.rhi; diff --git a/engine/native/rendering/rhi/commands.cpp b/engine/native/rendering/rhi/commands.cpp index b1e4fbb..4b80115 100644 --- a/engine/native/rendering/rhi/commands.cpp +++ b/engine/native/rendering/rhi/commands.cpp @@ -1,10 +1,8 @@ module; #include - #include #include - #include "macros.h" module rendering.rhi; diff --git a/engine/native/rendering/rhi/core.cpp b/engine/native/rendering/rhi/core.cpp index 6f37d77..91700d4 100644 --- a/engine/native/rendering/rhi/core.cpp +++ b/engine/native/rendering/rhi/core.cpp @@ -4,11 +4,10 @@ module; #include #include #include -#include - +#include +#include #include #include - #include "macros.h" module rendering.rhi; @@ -32,30 +31,71 @@ namespace draco::rendering::rhi u16 g_width = 0; u16 g_height = 0; - // GPU-safe destruction (delayed by 2 frames) - // This is the industry standard - template - void scrap_later(T handle) + void queue_destruction(std::function cb) { - if (!bgfx::isValid(handle)) - return; - g_deletion_queue.push_back({ bgfx::getStats()->gpuFrameNum, - [handle]() { bgfx::destroy(handle); } + std::move(cb) }); } - void destroy_later(bgfx::ShaderHandle handle) { scrap_later(handle); } - void destroy_later(bgfx::ProgramHandle handle) { scrap_later(handle); } - void destroy_later(bgfx::TextureHandle handle) { scrap_later(handle); } - void destroy_later(bgfx::FrameBufferHandle handle) { scrap_later(handle); } - void destroy_later(bgfx::UniformHandle handle) { scrap_later(handle); } - void destroy_later(bgfx::VertexBufferHandle handle) { scrap_later(handle); } - void destroy_later(bgfx::IndexBufferHandle handle) { scrap_later(handle); } - void destroy_later(bgfx::DynamicVertexBufferHandle handle) { scrap_later(handle); } - void destroy_later(bgfx::DynamicIndexBufferHandle handle) { scrap_later(handle); } + // Explicit overloads for each bgfx resource + void destroy_later(bgfx::ShaderHandle handle) + { + queue_destruction([handle]() { + bgfx::destroy(handle); + }); + } + + void destroy_later(bgfx::UniformHandle handle) + { + queue_destruction([handle]() { + bgfx::destroy(handle); + }); + } + void destroy_later(bgfx::VertexBufferHandle handle) + { + queue_destruction([handle]() { + bgfx::destroy(handle); + }); + } + + void destroy_later(bgfx::IndexBufferHandle handle) + { + queue_destruction([handle]() { + bgfx::destroy(handle); + }); + } + + void destroy_later(bgfx::DynamicVertexBufferHandle handle) + { + queue_destruction([handle]() { + bgfx::destroy(handle); + }); + } + + void destroy_later(bgfx::DynamicIndexBufferHandle handle) + { + queue_destruction([handle]() { + bgfx::destroy(handle); + }); + } + + void destroy_later(bgfx::TextureHandle handle) + { + queue_destruction([handle]() { + bgfx::destroy(handle); + }); + } + + void destroy_later(bgfx::FrameBufferHandle handle) + { + queue_destruction([handle]() { + bgfx::destroy(handle); + }); + } + void process_deletions() { u64 frame = bgfx::getStats()->gpuFrameNum; diff --git a/engine/native/rendering/rhi/pipelines.cpp b/engine/native/rendering/rhi/pipelines.cpp index c8cce41..15f70d3 100644 --- a/engine/native/rendering/rhi/pipelines.cpp +++ b/engine/native/rendering/rhi/pipelines.cpp @@ -1,9 +1,7 @@ module; #include - #include - #include "macros.h" module rendering.rhi; diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/native/rendering/rhi/rhi.cppm index f41ff0b..f750aaf 100644 --- a/engine/native/rendering/rhi/rhi.cppm +++ b/engine/native/rendering/rhi/rhi.cppm @@ -271,17 +271,6 @@ export namespace draco::rendering::rhi constexpr PipelineState operator&(PipelineState a, PipelineState b) { return static_cast(static_cast(a) & static_cast(b)); } - - // Explicit overloads - void destroy_later(bgfx::ShaderHandle handle); - void destroy_later(bgfx::ProgramHandle handle); - void destroy_later(bgfx::TextureHandle handle); - void destroy_later(bgfx::FrameBufferHandle handle); - void destroy_later(bgfx::UniformHandle handle); - void destroy_later(bgfx::VertexBufferHandle handle); - void destroy_later(bgfx::IndexBufferHandle handle); - void destroy_later(bgfx::DynamicVertexBufferHandle handle); - void destroy_later(bgfx::DynamicIndexBufferHandle handle); } // These are the things that we don't export but are visible to all implementation files @@ -302,7 +291,7 @@ namespace draco::rendering::rhi extern u16 g_width; extern u16 g_height; - + // Ensures a handle is valid before use // TODO: Replace with something better template @@ -317,3 +306,23 @@ namespace draco::rendering::rhi return reg.get(h); } } + +// Re-export the namespace since the things it uses aren't declared before +// This is a bit hacky but it works +// The problem is that if we move the unexported namespace above the other exported namespace, stuff isn't declared yet & it gives errors +// The same goes for the exported namespace +// In a nutshell, they both rely on each other which is why we use this hack (AR-DEV-1) +export namespace draco::rendering::rhi +{ + void queue_destruction(std::function cb); + + // Explicit overloads for each bgfx resource type + void destroy_later(bgfx::ShaderHandle handle); + void destroy_later(bgfx::UniformHandle handle); + void destroy_later(bgfx::VertexBufferHandle handle); + void destroy_later(bgfx::IndexBufferHandle handle); + void destroy_later(bgfx::DynamicVertexBufferHandle handle); + void destroy_later(bgfx::DynamicIndexBufferHandle handle); + void destroy_later(bgfx::TextureHandle handle); + void destroy_later(bgfx::FrameBufferHandle handle); +} diff --git a/engine/native/rendering/rhi/texture.cpp b/engine/native/rendering/rhi/texture.cpp index babed7d..346eb6c 100644 --- a/engine/native/rendering/rhi/texture.cpp +++ b/engine/native/rendering/rhi/texture.cpp @@ -1,7 +1,6 @@ module; #include - #include "macros.h" module rendering.rhi; From de86d2c2acd0b1e3c1b445fc5a0140419335bbc4 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Mon, 25 May 2026 14:53:11 +0500 Subject: [PATCH 39/41] Apply some suggestions --- cmake/Compiler.cmake | 7 ++----- engine/native/CMakeLists.txt | 5 +++-- engine/native/core/math/constants.cppm | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cmake/Compiler.cmake b/cmake/Compiler.cmake index 2aa645a..bb8f636 100644 --- a/cmake/Compiler.cmake +++ b/cmake/Compiler.cmake @@ -22,11 +22,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") endif() endif() -# Fix Clang 20 implicit function declarations in bgfx thirdparty C dependencies by exposing POSIX extensions -if(NOT WIN32) - add_compile_definitions(_GNU_SOURCE) -endif() - if(WIN32) add_compile_definitions("_${CMAKE_SYSTEM_PROCESSOR}_") +else() + add_compile_definitions(_GNU_SOURCE) endif() diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index 90a5175..6f94b78 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -2,10 +2,11 @@ add_modules_library(core SHARED) add_modules_library(input) add_modules_library(scene) +add_subdirectory(thirdparty SYSTEM) +add_subdirectory(platform) + target_link_libraries(core PUBLIC definitions math io memory) target_link_libraries(input PRIVATE SDL3::SDL3-static core) target_link_libraries(scene PUBLIC renderable) -add_subdirectory(thirdparty SYSTEM) -add_subdirectory(platform) add_subdirectory(rendering) diff --git a/engine/native/core/math/constants.cppm b/engine/native/core/math/constants.cppm index 09bb465..fa5b728 100644 --- a/engine/native/core/math/constants.cppm +++ b/engine/native/core/math/constants.cppm @@ -2,7 +2,6 @@ module; #include #include -#include export module core.math.constants; import core.defs; From e720027095feb905f2aaa1fa72831ddbd795f45c Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Wed, 27 May 2026 00:10:09 +0500 Subject: [PATCH 40/41] Code cleanup --- CMakeLists.txt | 10 +--- engine/native/CMakeLists.txt | 6 +-- engine/native/core/CMakeLists.txt | 2 +- engine/native/core/core.cppm | 1 + engine/native/core/math/math.cppm | 1 + .../transform => core/math}/transform.cpp | 16 ++----- .../transform => core/math}/transform.cppm | 15 ++---- engine/native/main/main.cpp | 47 ++++++++----------- engine/native/rendering/CMakeLists.txt | 2 +- engine/native/rendering/mesh/mesh.cppm | 4 +- engine/native/rendering/renderer/renderer.cpp | 38 +++++++-------- .../native/rendering/renderer/renderer.cppm | 11 ++--- engine/native/rendering/rendering.cppm | 9 ++++ engine/native/scene/CMakeLists.txt | 8 ++-- .../scene/camera/camera_controller.cppm | 2 +- .../native/scene/renderable/renderable.cppm | 4 +- engine/native/scene/scene.cppm | 6 ++- .../transform_component.cpp | 9 ++++ .../transform_component.cppm | 16 +++++++ 19 files changed, 104 insertions(+), 103 deletions(-) rename engine/native/{scene/transform => core/math}/transform.cpp (87%) rename engine/native/{scene/transform => core/math}/transform.cppm (66%) create mode 100644 engine/native/rendering/rendering.cppm create mode 100644 engine/native/scene/transform_component/transform_component.cpp create mode 100644 engine/native/scene/transform_component/transform_component.cppm diff --git a/CMakeLists.txt b/CMakeLists.txt index 6aa2149..988a0e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,16 +39,8 @@ target_link_libraries(draconic memory platform input - rhi - renderer - rendergraph - mesh - material - quad_renderer + rendering scene - camera # Camera controller - transform - renderable bgfx bx bimg diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt index 6f94b78..f712b79 100644 --- a/engine/native/CMakeLists.txt +++ b/engine/native/CMakeLists.txt @@ -1,5 +1,6 @@ add_modules_library(core SHARED) add_modules_library(input) +add_modules_library(rendering) add_modules_library(scene) add_subdirectory(thirdparty SYSTEM) @@ -7,6 +8,5 @@ add_subdirectory(platform) target_link_libraries(core PUBLIC definitions math io memory) target_link_libraries(input PRIVATE SDL3::SDL3-static core) -target_link_libraries(scene PUBLIC renderable) - -add_subdirectory(rendering) +target_link_libraries(rendering PUBLIC rhi rendergraph mesh material quad_renderer renderer) +target_link_libraries(scene PUBLIC renderable transform_component camera) diff --git a/engine/native/core/CMakeLists.txt b/engine/native/core/CMakeLists.txt index cb3ca9e..dd4dfb1 100644 --- a/engine/native/core/CMakeLists.txt +++ b/engine/native/core/CMakeLists.txt @@ -3,6 +3,6 @@ add_modules_library(math) add_modules_library(io) add_modules_library(memory) -target_link_libraries(math PUBLIC definitions) +target_link_libraries(math PUBLIC definitions bx) target_link_libraries(io PUBLIC definitions stb_image) target_link_libraries(memory PUBLIC definitions math) diff --git a/engine/native/core/core.cppm b/engine/native/core/core.cppm index 54d3ebc..9de09a0 100644 --- a/engine/native/core/core.cppm +++ b/engine/native/core/core.cppm @@ -2,3 +2,4 @@ export module core; export import core.defs; export import core.math; export import core.memory; +export import core.io; diff --git a/engine/native/core/math/math.cppm b/engine/native/core/math/math.cppm index 517ec40..9aedc64 100644 --- a/engine/native/core/math/math.cppm +++ b/engine/native/core/math/math.cppm @@ -5,3 +5,4 @@ export import core.math.functions; export import core.math.types; export import core.defs; export import core.stdtypes; +export import core.math.transform; diff --git a/engine/native/scene/transform/transform.cpp b/engine/native/core/math/transform.cpp similarity index 87% rename from engine/native/scene/transform/transform.cpp rename to engine/native/core/math/transform.cpp index dbaf27f..2538a51 100644 --- a/engine/native/scene/transform/transform.cpp +++ b/engine/native/core/math/transform.cpp @@ -4,11 +4,11 @@ module; #include -module scene.transform; +module core.math.transform; import core.stdtypes; -namespace draco::scene::transform +namespace draco::math { Transform make_transform() { @@ -26,22 +26,14 @@ namespace draco::scene::transform t.scale[1] = 1.0f; t.scale[2] = 1.0f; - t.dirty = true; - return t; } - void mark_dirty(Transform& t) - { - t.dirty = true; - } - void set_position(Transform& t, f32 x, f32 y, f32 z) { t.position[0] = x; t.position[1] = y; t.position[2] = z; - t.dirty = true; } void set_rotation(Transform& t, f32 x, f32 y, f32 z) @@ -49,7 +41,6 @@ namespace draco::scene::transform t.rotation[0] = x; t.rotation[1] = y; t.rotation[2] = z; - t.dirty = true; } void set_scale(Transform& t, f32 x, f32 y, f32 z) @@ -57,7 +48,6 @@ namespace draco::scene::transform t.scale[0] = x; t.scale[1] = y; t.scale[2] = z; - t.dirty = true; } void compute_matrix(const Transform& t, f32 out[16]) @@ -85,4 +75,4 @@ namespace draco::scene::transform bx::mtxMul(temp, temp, rz); bx::mtxMul(out, temp, translation); } -} \ No newline at end of file +} diff --git a/engine/native/scene/transform/transform.cppm b/engine/native/core/math/transform.cppm similarity index 66% rename from engine/native/scene/transform/transform.cppm rename to engine/native/core/math/transform.cppm index 1616be0..42b8d52 100644 --- a/engine/native/scene/transform/transform.cppm +++ b/engine/native/core/math/transform.cppm @@ -1,35 +1,30 @@ module; -#include #include #include -export module scene.transform; +export module core.math.transform; import core.stdtypes; -export namespace draco::scene::transform +export namespace draco::math { struct Transform { f32 position[3] = { 0.0f, 0.0f, 0.0f }; f32 rotation[3] = { 0.0f, 0.0f, 0.0f }; // Euler (radians) - f32 scale[3] = { 1.0f, 1.0f, 1.0f }; - - bool dirty = true; + f32 scale[3] = { 1.0f, 1.0f, 1.0f }; }; // Creates a default identity transform Transform make_transform(); - // Recompute matrix from transform (column-major, bx compatible) + // Recompute matrix from transform (column-major) void compute_matrix(const Transform& t, f32 out[16]); // Helpers void set_position(Transform& t, f32 x, f32 y, f32 z); void set_rotation(Transform& t, f32 x, f32 y, f32 z); void set_scale(Transform& t, f32 x, f32 y, f32 z); - - void mark_dirty(Transform& t); -} \ No newline at end of file +} diff --git a/engine/native/main/main.cpp b/engine/native/main/main.cpp index 18eef97..85419af 100644 --- a/engine/native/main/main.cpp +++ b/engine/native/main/main.cpp @@ -6,24 +6,11 @@ #include #include -import core.stdtypes; -import core.io.filesystem; -import core.io.image_loader; - +import core; import input; import platform; import scene; -import scene.camera.controller; -import scene.transform; -import scene.renderable; - -import rendering.rhi; -import rendering.rhi.vertex; -import rendering.rhi.uniform_registry; -import rendering.renderer; -import rendering.mesh; -import rendering.material; -import rendering.quad_renderer; +import rendering; int main(int argc, char* argv[]) { @@ -134,20 +121,20 @@ int main(int argc, char* argv[]) draco::scene::Scene scene; - scene.renderables.push_back({cube_mesh, draco::scene::transform::make_transform(), mat}); - scene.renderables.push_back({plane_mesh, draco::scene::transform::make_transform(), mat}); - scene.renderables.push_back({sphere_mesh, draco::scene::transform::make_transform(), mat}); - scene.renderables.push_back({cylinder_mesh, draco::scene::transform::make_transform(), mat}); - scene.renderables.push_back({capsule_mesh, draco::scene::transform::make_transform(), mat}); - - draco::scene::transform::set_position(scene.renderables[0].transform, -12.0f, 0.0f, 0.0f); - draco::scene::transform::set_position(scene.renderables[1].transform, -6.0f, 0.0f, 0.0f); - draco::scene::transform::set_position(scene.renderables[2].transform, 0.0f, 0.0f, 0.0f); - draco::scene::transform::set_position(scene.renderables[3].transform, 6.0f, 0.0f, 0.0f); - draco::scene::transform::set_position(scene.renderables[4].transform, 12.0f, 0.0f, 0.0f); + scene.renderables.push_back({cube_mesh, draco::math::make_transform(), mat}); + scene.renderables.push_back({plane_mesh, draco::math::make_transform(), mat}); + scene.renderables.push_back({sphere_mesh, draco::math::make_transform(), mat}); + scene.renderables.push_back({cylinder_mesh, draco::math::make_transform(), mat}); + scene.renderables.push_back({capsule_mesh, draco::math::make_transform(), mat}); - draco::scene::transform::set_rotation(scene.renderables[1].transform, -bx::kPiHalf, 0.0f, 0.0f); + draco::math::set_position(scene.renderables[0].transform, -12.0f, 0.0f, 0.0f); + draco::math::set_position(scene.renderables[1].transform, -6.0f, 0.0f, 0.0f); + draco::math::set_position(scene.renderables[2].transform, 0.0f, 0.0f, 0.0f); + draco::math::set_position(scene.renderables[3].transform, 6.0f, 0.0f, 0.0f); + draco::math::set_position(scene.renderables[4].transform, 12.0f, 0.0f, 0.0f); + draco::math::set_rotation(scene.renderables[1].transform, -bx::kPiHalf, 0.0f, 0.0f); + while (running) { static draco::u64 last = SDL_GetTicks(); @@ -188,7 +175,11 @@ int main(int argc, char* argv[]) auto cam = camera.get_camera(); draco::rendering::renderer::begin_frame(cam); - draco::rendering::renderer::render_scene(scene); + + for (const auto& renderable : scene.renderables) + { + draco::rendering::renderer::submit_renderable(renderable.transform, renderable.material, renderable.mesh); + } quad_renderer.begin(); diff --git a/engine/native/rendering/CMakeLists.txt b/engine/native/rendering/CMakeLists.txt index 1753808..97507a2 100644 --- a/engine/native/rendering/CMakeLists.txt +++ b/engine/native/rendering/CMakeLists.txt @@ -10,4 +10,4 @@ target_link_libraries(rendergraph PUBLIC rhi bx) target_link_libraries(mesh PUBLIC memory rhi math core) target_link_libraries(material PUBLIC rhi) target_link_libraries(quad_renderer PUBLIC rhi rendergraph bgfx bx) -target_link_libraries(renderer PUBLIC core rhi rendergraph mesh quad_renderer scene transform bgfx bx) \ No newline at end of file +target_link_libraries(renderer PUBLIC core math rhi rendergraph mesh quad_renderer material bgfx bx) \ No newline at end of file diff --git a/engine/native/rendering/mesh/mesh.cppm b/engine/native/rendering/mesh/mesh.cppm index 31a3c20..6b10d93 100644 --- a/engine/native/rendering/mesh/mesh.cppm +++ b/engine/native/rendering/mesh/mesh.cppm @@ -10,7 +10,9 @@ import rendering.rhi; export namespace draco::rendering::mesh { - using MeshHandle = draco::core::memory::Handle; + struct MeshTag {}; + + using MeshHandle = draco::core::memory::Handle; struct Vertex { diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/native/rendering/renderer/renderer.cpp index 6f37588..0859b5e 100644 --- a/engine/native/rendering/renderer/renderer.cpp +++ b/engine/native/rendering/renderer/renderer.cpp @@ -12,7 +12,7 @@ module; module rendering.renderer; import core.stdtypes; - +import core.math.transform; import rendering.rhi; import rendering.rhi.uniform_registry; import rendering.rendergraph; @@ -20,9 +20,6 @@ import rendering.mesh; import rendering.material; import rendering.quad_renderer; -import scene; -import scene.transform; - namespace draco::rendering::renderer { static constexpr const char* MAIN_PASS = "MainPass"; @@ -103,32 +100,29 @@ namespace draco::rendering::renderer pass->packets.push_back(packet); } - void render_scene(const draco::scene::Scene& scene) + void submit_renderable(const draco::math::Transform& transform, const material::Material& material, mesh::MeshHandle mesh_id) { - for (auto& t : scene.renderables) - { - const auto* mesh = mesh::get(t.mesh); - if (!mesh) continue; + const auto* m = mesh::get(mesh_id); + if (!m) return; - rhi::RenderPacket p{}; + rhi::RenderPacket p{}; - p.vertex_buffer = mesh->vbh; - p.index_buffer = mesh->ibh; + p.vertex_buffer = m->vbh; + p.index_buffer = m->ibh; - p.pipeline = t.material.pipeline; - p.texture_handle = t.material.texture; - p.texture_unit = t.material.texture_unit; - p.sampler_uniform = t.material.sampler; + p.pipeline = material.pipeline; + p.texture_handle = material.texture; + p.texture_unit = material.texture_unit; + p.sampler_uniform = material.sampler; - build_uniforms(t.material, p.uniforms); + build_uniforms(material, p.uniforms); - f32 model[16]; - draco::scene::transform::compute_matrix(t.transform, model); + f32 model[16]; + draco::math::compute_matrix(transform, model); - std::memcpy(p.model, model, sizeof(model)); + std::memcpy(p.model, model, sizeof(model)); - submit_entity(p); - } + submit_entity(p); } void submit_ui(draco::rendering::quad_renderer::QuadRenderer& quad_renderer) diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/native/rendering/renderer/renderer.cppm index c966737..bcc9d18 100644 --- a/engine/native/rendering/renderer/renderer.cppm +++ b/engine/native/rendering/renderer/renderer.cppm @@ -7,11 +7,12 @@ module; export module rendering.renderer; import core.stdtypes; +import core.math.transform; import rendering.rhi; import rendering.rendergraph; import rendering.quad_renderer; - -import scene; +import rendering.material; +import rendering.mesh; export namespace draco::rendering::renderer { @@ -40,12 +41,10 @@ export namespace draco::rendering::renderer { void begin_frame(const Camera& cam); void submit_entity(draco::rendering::rhi::RenderPacket& packet, u16 view); + void submit_renderable(const draco::math::Transform& transform, const material::Material& material, mesh::MeshHandle mesh_id); + void submit_ui(draco::rendering::quad_renderer::QuadRenderer& quad_renderer); void end_frame(); - void render_scene(const draco::scene::Scene& scene); - - void submit_ui(draco::rendering::quad_renderer::QuadRenderer& quad_renderer); - rendergraph::RenderGraph& get_graph(); } diff --git a/engine/native/rendering/rendering.cppm b/engine/native/rendering/rendering.cppm new file mode 100644 index 0000000..9b1f872 --- /dev/null +++ b/engine/native/rendering/rendering.cppm @@ -0,0 +1,9 @@ +export module rendering; +export import rendering.rhi; +export import rendering.rhi.uniform_registry; +export import rendering.rhi.vertex; +export import rendering.rendergraph; +export import rendering.renderer; +export import rendering.mesh; +export import rendering.material; +export import rendering.quad_renderer; diff --git a/engine/native/scene/CMakeLists.txt b/engine/native/scene/CMakeLists.txt index a70693e..905e8a3 100644 --- a/engine/native/scene/CMakeLists.txt +++ b/engine/native/scene/CMakeLists.txt @@ -1,7 +1,7 @@ add_modules_library(camera) -add_modules_library(transform) +add_modules_library(transform_component) add_modules_library(renderable) -target_link_libraries(camera PUBLIC core input renderer bx) -target_link_libraries(transform PUBLIC core bx) -target_link_libraries(renderable PUBLIC core mesh transform material) +target_link_libraries(camera PUBLIC core input rendering bx) +target_link_libraries(transform_component PUBLIC core) +target_link_libraries(renderable PUBLIC core mesh transform_component material) diff --git a/engine/native/scene/camera/camera_controller.cppm b/engine/native/scene/camera/camera_controller.cppm index 535ae48..7dd607a 100644 --- a/engine/native/scene/camera/camera_controller.cppm +++ b/engine/native/scene/camera/camera_controller.cppm @@ -1,7 +1,7 @@ export module scene.camera.controller; import core.stdtypes; -import rendering.renderer; +import rendering; export namespace draco::scene { diff --git a/engine/native/scene/renderable/renderable.cppm b/engine/native/scene/renderable/renderable.cppm index 9bfcdca..6d034a4 100644 --- a/engine/native/scene/renderable/renderable.cppm +++ b/engine/native/scene/renderable/renderable.cppm @@ -2,7 +2,7 @@ export module scene.renderable; import rendering.mesh; import rendering.material; -import scene.transform; +import core.math.transform; export namespace draco::scene::renderable { @@ -10,7 +10,7 @@ export namespace draco::scene::renderable { draco::rendering::mesh::MeshHandle mesh; - transform::Transform transform; + draco::math::Transform transform; draco::rendering::material::Material material; }; diff --git a/engine/native/scene/scene.cppm b/engine/native/scene/scene.cppm index 5c1ee6d..00768e1 100644 --- a/engine/native/scene/scene.cppm +++ b/engine/native/scene/scene.cppm @@ -4,7 +4,9 @@ module; export module scene; -import scene.renderable; +export import scene.renderable; +export import scene.transform_component; +export import scene.camera.controller; export namespace draco::scene { @@ -12,4 +14,4 @@ export namespace draco::scene { std::vector renderables; }; -} \ No newline at end of file +} diff --git a/engine/native/scene/transform_component/transform_component.cpp b/engine/native/scene/transform_component/transform_component.cpp new file mode 100644 index 0000000..3573a1c --- /dev/null +++ b/engine/native/scene/transform_component/transform_component.cpp @@ -0,0 +1,9 @@ +module scene.transform_component; + +namespace draco::scene +{ + void mark_dirty(TransformComponent& t) + { + t.dirty = true; + } +} diff --git a/engine/native/scene/transform_component/transform_component.cppm b/engine/native/scene/transform_component/transform_component.cppm new file mode 100644 index 0000000..98ff5b9 --- /dev/null +++ b/engine/native/scene/transform_component/transform_component.cppm @@ -0,0 +1,16 @@ +export module scene.transform_component; + +import core.math.transform; + +export namespace draco::scene +{ + struct TransformComponent + { + math::Transform local; + math::Transform world; + + bool dirty = true; + }; + + void mark_dirty(TransformComponent& t); +} From b0e9cd2989472ba579a111ee05392a522fcebe84 Mon Sep 17 00:00:00 2001 From: AR-DEV-1 Date: Thu, 28 May 2026 09:56:01 +0500 Subject: [PATCH 41/41] Address some of Jon's concerns --- engine/native/core/math/constants.cppm | 4 +++- engine/native/core/math/transform.cppm | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/native/core/math/constants.cppm b/engine/native/core/math/constants.cppm index fa5b728..210c35d 100644 --- a/engine/native/core/math/constants.cppm +++ b/engine/native/core/math/constants.cppm @@ -27,7 +27,9 @@ export namespace draco::math { constexpr f32 GAIN_CONVERSION_DB = 0.11512925464970228420089957273422; constexpr u16 UINT16_MAX_VAL = std::numeric_limits::max(); constexpr u32 UINT32_MAX_VAL = std::numeric_limits::max(); - constexpr f32 UINT32_MAX_F = static_cast(1.0 / static_cast(UINT32_MAX_VAL)); // Calculated via double precision to prevent rounding errors + // This is a reciprocal for normalization + // Used to map a u32 [0, MAX] range to a float [0, 1.0] range + constexpr f32 UINT32_INVERSE_MAX_F = static_cast(1.0 / static_cast(UINT32_MAX_VAL)); // Calculated via double precision to prevent rounding errors constexpr f32 DECIMAL_LIMIT_F = 8388608.0f; constexpr f32 CMP_EPSILON = 0.000001f; diff --git a/engine/native/core/math/transform.cppm b/engine/native/core/math/transform.cppm index 42b8d52..fc1a589 100644 --- a/engine/native/core/math/transform.cppm +++ b/engine/native/core/math/transform.cppm @@ -17,6 +17,8 @@ export namespace draco::math f32 scale[3] = { 1.0f, 1.0f, 1.0f }; }; + // TODO: Besides compute_matrix, we should make rest of the funcs constexpr funcs + // Creates a default identity transform Transform make_transform();