aster/include/aster/core/constants.h

@@ -13,8 +13,6 @@
 #include <glm/glm.hpp>
 #include <glm/gtx/quaternion.hpp>
 
-#include <atomic>
-
 using c8 = char;
 using u8 = uint8_t;
 using u16 = uint16_t;

aster/include/aster/core/global.h

@@ -247,7 +247,7 @@ struct fmt::formatter<eastl::fixed_string<TType, TCount, TOverflow>> : nested_fo
     // ReSharper disable once CppInconsistentNaming
     format(const eastl::fixed_string<TType, TCount, TOverflow> &str, format_context &ctx) const
     {
-      return write_padded(ctx, [this, str](auto out) { return fmt::format_to(out, "{}", nested(str.c_str())); });
+        return write_padded(ctx, [this, str](auto out) { return v11::format_to(out, "{}", nested(str.c_str())); });
     }
 };
 

aster/include/aster/systems/device.h

@@ -272,14 +272,14 @@ struct VertexInput
 enum class ShaderType
 {
     eInvalid = 0,
-    eVertex = VK_SHADER_STAGE_VERTEX_BIT,
+    eVertex = vk::ShaderStageFlagBits::eVertex,
-    eTesselationControl = VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT,
+    eTesselationControl = vk::ShaderStageFlagBits::eTessellationControl,
-    eTesselationEvaluation = VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT,
+    eTesselationEvaluation = vk::ShaderStageFlagBits::eTessellationEvaluation,
-    eGeometry = VK_SHADER_STAGE_GEOMETRY_BIT,
+    eGeometry = vk::ShaderStageFlagBits::eGeometry,
-    eFragment = VK_SHADER_STAGE_FRAGMENT_BIT,
+    eFragment = vk::ShaderStageFlagBits::eFragment,
-    eCompute = VK_SHADER_STAGE_COMPUTE_BIT,
+    eCompute = vk::ShaderStageFlagBits::eCompute,
-    eTask = VK_SHADER_STAGE_TASK_BIT_EXT,
+    eTask = vk::ShaderStageFlagBits::eTaskEXT,
-    eMesh = VK_SHADER_STAGE_MESH_BIT_EXT,
+    eMesh = vk::ShaderStageFlagBits::eMeshEXT,
     eMax,
 };
 
@@ -473,8 +473,6 @@ struct Frame
     ~Frame() = default;
 };
 
-class CommitManager;
-
 class Device final
 {
   public: // TODO: Temp

aster/src/aster/core/global.cpp

@@ -56,18 +56,18 @@ struct fmt::formatter<MemorySize>
         // return format_to(ctx.out(), "({}, {})", foo.a, foo.b); // --== KEY LINE ==--
         if (mem.m_Gigabytes > 0)
         {
-            return fmt::format_to(ctx.out(), "{}.{} GB", mem.m_Gigabytes, static_cast<u16>(mem.m_Megabytes / 1024.0));
+            return v11::format_to(ctx.out(), "{}.{} GB", mem.m_Gigabytes, static_cast<u16>(mem.m_Megabytes / 1024.0));
         }
         if (mem.m_Megabytes > 0)
         {
-            return fmt::format_to(ctx.out(), "{}.{} MB", mem.m_Megabytes, static_cast<u16>(mem.m_Kilobytes / 1024.0));
+            return v11::format_to(ctx.out(), "{}.{} MB", mem.m_Megabytes, static_cast<u16>(mem.m_Kilobytes / 1024.0));
         }
         if (mem.m_Kilobytes > 0)
         {
-            return fmt::format_to(ctx.out(), "{}.{} KB", mem.m_Kilobytes, static_cast<u16>(mem.m_Bytes / 1024.0));
+            return v11::format_to(ctx.out(), "{}.{} KB", mem.m_Kilobytes, static_cast<u16>(mem.m_Bytes / 1024.0));
         }
 
-        return fmt::format_to(ctx.out(), "{} Bytes", mem.m_Bytes);
+        return v11::format_to(ctx.out(), "{} Bytes", mem.m_Bytes);
     }
 };
 

aster/src/aster/systems/device.cpp

@@ -1070,7 +1070,6 @@ systems::Device::Device(const DeviceCreateInfo &createInfo)
     std::array compilerOptions = {
         useOriginalEntrypointNames,
         bindlessSpaceIndex,
-        scalarLayout,
     };
 
     const slang::TargetDesc spirvTargetDesc = {

flake.lock

@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742976680,
+        "lastModified": 1738734093,
-        "narHash": "sha256-Lcyi6YyR0PgN5rOrmM6mM/1MJIYhGi6rrq0+eiqvUb4=",
+        "narHash": "sha256-UEYOKfXXKU49fR7dGB05As0s2pGbLK4xDo48Qtdm7xs=",
-        "owner": "kidrigger",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "51cf54bdbd9c1a0a2f833cced82451df0d9c25bd",
+        "rev": "5b2753b0356d1c951d7a3ef1d086ba5a71fff43c",
         "type": "github"
       },
       "original": {
-        "owner": "kidrigger",
+        "owner": "NixOS",
-        "ref": "imgui-docking",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:kidrigger/nixpkgs/imgui-docking";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
   outputs = {self, nixpkgs, flake-utils }:
@@ -26,7 +26,7 @@
           ccls
           clang-tools
           lldb
-          (imgui.override {IMGUI_BUILD_VULKAN_BINDING = true; IMGUI_BUILD_GLFW_BINDING=true; IMGUI_EXPERIMENTAL_DOCKING = true; })
+          (imgui.override {IMGUI_BUILD_VULKAN_BINDING = true; IMGUI_BUILD_GLFW_BINDING=true; })
         ];
 
         buildInputs = [    
@@ -50,7 +50,6 @@
           directx-shader-compiler
           glslang
           shaderc
-          shader-slang
         ];
         };
       }

shell.nix

@@ -0,0 +1,38 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+let eabase = pkgs.callPackage ./vendored-nix/eabase {}; in
+let eastl = pkgs.callPackage ./vendored-nix/eastl { inherit eabase; }; in
+let tinygltf = pkgs.callPackage ./vendored-nix/tinygltf {}; in
+let debugbreak = pkgs.callPackage ./vendored-nix/scottt-debugbreak {}; in
+    
+pkgs.clangStdenv.mkDerivation {
+  name = "aster-env";
+
+  nativeBuildInputs = with pkgs; [
+    cmake
+    ninja    
+    (imgui.override {IMGUI_BUILD_VULKAN_BINDING = true; IMGUI_BUILD_GLFW_BINDING=true; })
+  ];
+
+  buildInputs = with pkgs; [
+    glm
+    glfw3
+    eastl
+    fmt
+    eabase
+    eastl
+    entt
+    tinygltf
+    debugbreak
+    stb
+
+    # vulkan
+    vulkan-headers
+    vulkan-loader
+    vulkan-validation-layers
+    vulkan-memory-allocator
+    directx-shader-compiler
+    glslang
+    shaderc
+  ];
+}