(gpu) change code convention

Author: Arthapz

.clang-format

@@ -23,13 +23,22 @@ BitFieldColonSpacing: After
 BreakBeforeConceptDeclarations: 'true'
 BreakBinaryOperations: RespectPrecedence
 EmptyLineBeforeAccessModifier: LogicalBlock
+EnumTrailingComma: Insert
+FixNamespaceComments: 'true'
 IndentExternBlock: Indent
 IndentGotoLabels: 'false'
 IndentRequiresClause: 'true'
 InsertBraces: 'false'
 InsertTrailingCommas: Wrapped
 LambdaBodyIndentation: Signature
 PPIndentWidth: 4
+PenaltyBreakAssignment: 1000
+PenaltyReturnTypeOnItsOwnLine: 1000
+PenaltyBreakBeforeFirstCallParameter: 1000
+PenaltyBreakOpenParenthesis: 1000
+PenaltyBreakBeforeMemberAccess: 10
+PenaltyIndentedWhitespace: 1
+ContinuationIndentWidth: 2
 ReferenceAlignment: Left
 # RemoveBracesLLVM: 'true'
 RequiresClausePosition: OwnLine
@@ -40,9 +49,18 @@ SpaceBeforeCaseColon: 'false'
 AlwaysBreakAfterDefinitionReturnType: None
 SpaceBeforeSquareBrackets: 'false'
 SpaceInEmptyBlock: 'false'
-AttributeMacros: [STORMKIT_FORCE_INLINE, STORMKIT_API, STORMKIT_PRIVATE, STORMKIT_PUBLIC]
+AttributeMacros: [STORMKIT_FORCE_INLINE, STORMKIT_API, STORMKIT_PRIVATE, STORMKIT_PUBLIC, STORMKIT_CONST, STORMKIT_PURE, STORMKIT_INTRINSIC]
 IfMacros: [CASE_DO, CASE_DO_RETURN, CASE, CASE_ARGS_DO]
 BreakAfterAttributes: Always
+Macros:
+  - STORMKIT_FORCE_INLINE=[[maybe_unused]]
+  - STORMKIT_API=[[maybe_unused]]
+  - STORMKIT_PRIVATE=[[maybe_unused]]
+  - STORMKIT_PUBLIC=[[maybe_unused]]
+  - STORMKIT_CONST=[[maybe_unused]]
+  - STORMKIT_PURE=[[maybe_unused]]
+  - STORMKIT_INTRINSIC=[[maybe_unused]]
+  
 QualifierAlignment: Custom
 QualifierOrder: [static, inline, volatile, restrict, constexpr, const, type]
 
@@ -64,7 +82,6 @@ ColumnLimit: '100'
 CompactNamespaces: 'true'
 ConstructorInitializerAllOnOneLineOrOnePerLine: 'false'
 ConstructorInitializerIndentWidth: '4'
-ContinuationIndentWidth: '4'
 IncludeBlocks: Preserve
 IndentCaseLabels: 'true'
 IndentWidth: '4'
@@ -76,7 +93,6 @@ MaxEmptyLinesToKeep: '1'
 NamespaceIndentation: All
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: false
-PenaltyBreakAssignment: '0'
 PointerAlignment: Left
 SortIncludes: 'true'
 SortUsingDeclarations: 'true'
@@ -91,7 +107,6 @@ SpacesInAngles: 'false'
 Standard: c++20
 TabWidth: '4'
 UseTab: Never
-PenaltyBreakBeforeFirstCallParameter: '120'
 ---
 Language: ObjC
 AlignAfterOpenBracket: Align
@@ -137,8 +152,12 @@ MaxEmptyLinesToKeep: '1'
 NamespaceIndentation: All
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: false
-PenaltyBreakAssignment: '0'
 PointerAlignment: Right
+PenaltyBreakAssignment: 1000
+PenaltyReturnTypeOnItsOwnLine: 1000
+PenaltyBreakBeforeFirstCallParameter: 1000
+PenaltyBreakOpenParenthesis: 1000
+PenaltyBreakBeforeMemberAccess: 10
 SortIncludes: 'true'
 SortUsingDeclarations: 'true'
 SpaceAfterTemplateKeyword: 'false'
@@ -152,7 +171,6 @@ SpacesInAngles: 'false'
 Standard: c++20
 TabWidth: '4'
 UseTab: Never
-PenaltyBreakBeforeFirstCallParameter: '120'
 PenaltyIndentedWhitespace: '1'
 QualifierAlignment: Custom
 QualifierOrder: [static, inline, volatile, restrict, constexpr, const, type]

.github/workflows/Linux.yml

@@ -79,6 +79,7 @@ jobs:
               libelf-dev
               libdwarf-dev
               mold
+              nasm
               llvm${{ env.LLVM_VERSION }}
               llvm${{ env.LLVM_VERSION }}-dev
               llvm${{ env.LLVM_VERSION }}-runtime
@@ -123,7 +124,7 @@ jobs:
       - name: Setup XMake
         uses: xmake-io/github-action-setup-xmake@v1
         with:
-          xmake-version: Arthapz/xmake#branch@improve-jobgraph-support2
+          xmake-version: branch@dev
           actions-cache-folder: .xmake-cache
 
       - name: Cache XMake

.github/workflows/Windows.yml

@@ -82,7 +82,7 @@ jobs:
         if: ${{ !steps.restore-xmakecache.outputs.cache-hit }}
         uses: xmake-io/github-action-setup-xmake@v1
         with:
-          xmake-version: Arthapz/xmake#branch@fix-cmake-clang-msstl
+          xmake-version: branch@dev
           actions-cache-folder: '.xmake-cache'
 
       - name: Cache XMake

.github/workflows/macOS.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Install build tools
         uses: tecolicom/actions-use-homebrew-tools@v1
         with:
-          tools: llvm ninja meson mold
+          tools: llvm ninja meson mold nasm pkgconf
           verbose: true
 
       - name: Checkout
@@ -78,7 +78,7 @@ jobs:
       - name: Setup XMake
         uses: xmake-io/github-action-setup-xmake@v1
         with:
-          xmake-version: Arthapz/xmake#branch@improve-jobgraph-support2
+          xmake-version: branch@dev
           actions-cache-folder: .xmake-cache
 
       - name: Cache XMake

examples/engine/sprites/src/Constants.mpp

@@ -31,12 +31,12 @@ export {
     // using namespace stormkit::gpu;
     // return std::array { VertexInputAttributeDescription { .location = 0,
     //.binding  = 0,
-    //.format   = Format::Float2,
+    //.format   = Format::f322,
     //.offset =
     // offsetof(Vertex, position) },
     // VertexInputAttributeDescription { .location = 1,
     //.binding  = 0,
-    //.format   = Format::Float3,
+    //.format   = Format::f323,
     //.offset = offsetof(Vertex, color) } };
     //}();
 

examples/engine/sprites/src/SpritesApp.mpp

@@ -7,7 +7,7 @@ export module SpritesApp;
 import std;
 
 import stormkit.core;
-import stormkit.Gpu;
+import stormkit.gpu;
 import stormkit.Engine;
 import stormkit.wsi;
 
@@ -50,7 +50,7 @@ auto SpritesApp::run(std::span<const std::string_view> _) -> Int {
 
     auto& render_system = world.add_system<engine::SpriteRenderSystem>(renderer, window.extent());
     m_application->setUpdateFrameGraphCallback(
-        bindFront(&engine::SpriteRenderSystem::updateFrameGraph, &render_system));
+        bind_front(&engine::SpriteRenderSystem::updateFrameGraph, &render_system));
 
     engine::makeSprite(world, { 32.f, 32.f });
 

examples/engine/sprites/xmake.lua

@@ -15,8 +15,6 @@ do
         add_defines("STORMKIT_ASSERT=0")
     end
 
-    if is_plat("windows") then add_ldflags("-Wl,/SUBSYSTEM:CONSOLE", { force = true }) end
-
     add_files("src/*.cpp")
     add_files("src/*.mpp")
     add_files("shaders/*.nzsl")

examples/engine/triangle/src/TriangleApp.mpp

@@ -7,7 +7,7 @@ export module TriangleApp;
 import std;
 
 import stormkit.core;
-import stormkit.Gpu;
+import stormkit.gpu;
 import stormkit.Engine;
 import stormkit.wsi;
 
@@ -49,7 +49,7 @@ auto TriangleApp::run(std::span<const std::string_view> _) -> Int {
     m_application = engine::Application::create(APPLICATION_NAME, { 800u, 600u }, WINDOW_TITLE)
                         .transform_error(assert("Failed to initialize Render engine"))
                         .value();
-    m_application->setUpdateFrameGraphCallback(bindFront(&TriangleApp::updateFrameGraph, this));
+    m_application->setUpdateFrameGraphCallback(bind_front(&TriangleApp::updateFrameGraph, this));
 
     auto& window        = m_application->window();
     auto& event_handler = m_application->eventHandler();
@@ -59,12 +59,12 @@ auto TriangleApp::run(std::span<const std::string_view> _) -> Int {
     m_window_extent = window.extent();
 
     m_vertex_shader
-        = gpu::Shader::fromBytes(renderer.device(), SHADER_DATA, gpu::ShaderStageFlag::Vertex)
+        = gpu::Shader::load_from_bytes(renderer.device(), SHADER_DATA, gpu::ShaderStageFlag::Vertex)
               .transform_error(assert("Failed to load vertex shader"))
               .value();
 
     m_fragment_shader
-        = gpu::Shader::fromBytes(renderer.device(), SHADER_DATA, gpu::ShaderStageFlag::Fragment)
+        = gpu::Shader::load_from_bytes(renderer.device(), SHADER_DATA, gpu::ShaderStageFlag::Fragment)
               .transform_error(assert("Failed to load fragment shader"))
               .value();
 
@@ -139,7 +139,7 @@ auto TriangleApp::updateFrameGraph(engine::FrameGraphBuilder& graph,
                               .value();
                 }
 
-                cmb.bindPipeline(m_pipeline);
+                cmb.bind_pipeline(m_pipeline);
                 cmb.draw(3);
             });
 

examples/engine/triangle/xmake.lua

@@ -17,8 +17,6 @@ do
         add_defines("STORMKIT_ASSERT=0")
     end
 
-    if is_plat("windows") then add_ldflags("-Wl,/SUBSYSTEM:CONSOLE", { force = true }) end
-
     add_files("src/*.cpp")
     add_files("src/*.mpp")
     add_files("shaders/*.nzsl")

examples/entities/gameoflife/src/App.cpp

@@ -1,7 +1,7 @@
 #ifdef STORMKIT_BUILD_MODULES
 module App;
 
-import stormkit.Gpu;
+import stormkit.gpu;
 
 import Components;
 import Systems;
@@ -25,12 +25,12 @@ App::~App() {
     ilog("Cleaning");
 }
 
-auto App::run([[maybe_unused]] const int argc, [[maybe_unused]] const char** argv) -> Int32 {
+auto App::run([[maybe_unused]] const int argc, [[maybe_unused]] CZString argv[]) -> i32 {
     using Clock = std::chrono::high_resolution_clock;
 
     using namespace stormkit::literals;
 
-    doInitWindow();
+    do_initWindow();
 
     m_board = image::Image {
         { BOARD_SIZE, BOARD_SIZE },
@@ -80,7 +80,7 @@ auto App::run([[maybe_unused]] const int argc, [[maybe_unused]] const char** arg
     return EXIT_SUCCESS;
 }
 
-auto App::doInitWindow() -> void {
+auto App::do_initWindow() -> void {
     const auto window_style = wsi::WindowStyle::ALL;
 
     m_window = allocate<wsi::Window>(WINDOW_TITLE, math::ExtentU { 800u, 600u }, window_style);
@@ -153,7 +153,7 @@ auto App::handleMouse(const stormkit::wsi::MouseButtonPushedEventData& event) ->
         createCell(x, y);
 }
 
-auto App::createCell(stormkit::UInt32 x, stormkit::UInt32 y) -> void {
+auto App::createCell(stormkit::u32 x, stormkit::u32 y) -> void {
     auto  e        = m_entities.make_entity();
     auto& position = m_entities.add_component<PositionComponent>(e);
 

examples/entities/gameoflife/src/App.mpp

@@ -31,14 +31,14 @@ export {
         App();
         ~App() override;
 
-        auto run(const int argc, const char** argv) -> stormkit::Int32 override;
+        auto run(const int argc, CZString argv[]) -> stormkit::i32 override;
 
       private:
-        auto doInitWindow() -> void;
+        auto do_initWindow() -> void;
 
         auto handleKeyboard(const stormkit::wsi::KeyReleasedEventData& event) -> void;
         auto handleMouse(const stormkit::wsi::MouseButtonPushedEventData& event) -> void;
-        auto createCell(stormkit::UInt32 x, stormkit::UInt32 y) -> void;
+        auto createCell(stormkit::u32 x, stormkit::u32 y) -> void;
 
         std::unique_ptr<stormkit::wsi::Window> m_window;
 

examples/entities/gameoflife/src/Components.mpp

@@ -17,8 +17,8 @@ export {
 #endif
 
     struct PositionComponent: public stormkit::entities::Component {
-        stormkit::UInt32 x;
-        stormkit::UInt32 y;
+        stormkit::u32 x;
+        stormkit::u32 y;
 
         static constexpr Type TYPE = stormkit::entities::component_hash("PositionComponent");
     };

examples/entities/gameoflife/src/Constants.mpp

@@ -9,7 +9,7 @@ import std;
 
 import stormkit.core;
 import stormkit.log;
-import stormkit.Gpu;
+import stormkit.gpu;
 
 export {
 #else
@@ -30,11 +30,11 @@ export {
     inline constexpr auto MESH_VERTEX_ATTRIBUTE_DESCRIPTIONS = std::array {
         stormkit::gpu::VertexInputAttributeDescription { .location = 0,
                                                         .binding  = 0,
-                                                        .format   = stormkit::gpu::format::Float2,
+                                                        .format   = stormkit::gpu::format::f322,
                                                         .offset   = 0                       },
         stormkit::gpu::VertexInputAttributeDescription { .location = 1,
                                                         .binding  = 0,
-                                                        .format   = stormkit::gpu::format::Float2,
+                                                        .format   = stormkit::gpu::format::f322,
                                                         .offset
                                                          = sizeof(stormkit::math::Vector2F) }
     };