Pipeline creation

include/daxa/c/command_recorder.h

@@ -18,7 +18,7 @@ typedef struct
 {
     void const * data;
     uint64_t size;
-    uint32_t offset;
+    uint32_t offset; // deprecated API 3.1
 } daxa_PushConstantInfo;
 
 typedef struct

include/daxa/c/core.h

@@ -24,9 +24,6 @@
 
 #define _DAXA_TEST_PRINT(...)
 
-#define DAXA_SHADERLANG_GLSL 1
-#define DAXA_SHADERLANG_SLANG 2
-
 static uint32_t const DAXA_ID_INDEX_BITS = 20;
 static uint32_t const DAXA_ID_INDEX_MASK = (1ull << 20) - 1ull;
 static uint32_t const DAXA_ID_INDEX_OFFSET = 0;
@@ -232,6 +229,10 @@ daxa_u32mat4x4;
 #pragma warning(pop)
 #endif
 
+static uint32_t const DAXA_MAX_PUSH_CONSTANT_WORD_SIZE = (32);
+static uint32_t const DAXA_MAX_PUSH_CONSTANT_BYTE_SIZE = (DAXA_MAX_PUSH_CONSTANT_WORD_SIZE * 4);
+static uint32_t const DAXA_PIPELINE_LAYOUT_COUNT = (DAXA_MAX_PUSH_CONSTANT_WORD_SIZE + 1);
+
 // TODO(Raytracing): Should this say like this?
 static uint32_t const DAXA_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE = 0x00000001;
 static uint32_t const DAXA_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING = 0x00000002;

include/daxa/c/pipeline.h

@@ -50,6 +50,19 @@ typedef struct
     daxa_SmallString name;
 } daxa_RayTracingPipelineInfo;
 
+static daxa_RayTracingPipelineInfo const DAXA_DEFAULT_RAY_TRACING_PIPELINE_INFO = {
+    .ray_gen_stages = DAXA_ZERO_INIT,
+    .miss_stages = DAXA_ZERO_INIT,
+    .callable_stages = DAXA_ZERO_INIT,
+    .intersection_stages = DAXA_ZERO_INIT,
+    .closest_hit_stages = DAXA_ZERO_INIT,
+    .any_hit_stages = DAXA_ZERO_INIT,
+    .shader_groups = DAXA_ZERO_INIT,
+    .max_ray_recursion_depth = DAXA_ZERO_INIT,
+    .push_constant_size = DAXA_MAX_PUSH_CONSTANT_BYTE_SIZE,
+    .name = DAXA_ZERO_INIT,
+};
+
 DAXA_EXPORT daxa_RayTracingPipelineInfo const *
 daxa_ray_tracing_pipeline_info(daxa_RayTracingPipeline ray_tracing_pipeline);
 
@@ -74,6 +87,12 @@ typedef struct
     daxa_SmallString name;
 } daxa_ComputePipelineInfo;
 
+static daxa_ComputePipelineInfo const DAXA_DEFAULT_COMPUTE_PIPELINE_INFO = {
+    .shader_info = DAXA_ZERO_INIT,
+    .push_constant_size = DAXA_MAX_PUSH_CONSTANT_BYTE_SIZE,
+    .name = DAXA_ZERO_INIT,
+};
+
 DAXA_EXPORT daxa_ComputePipelineInfo const *
 daxa_compute_pipeline_info(daxa_ComputePipeline compute_pipeline);
 
@@ -192,6 +211,21 @@ typedef struct
     daxa_SmallString name;
 } daxa_RasterPipelineInfo;
 
+static daxa_RasterPipelineInfo const DAXA_DEFAULT_RASTERIZER_PIPELINE_INFO = {
+    .mesh_shader_info = DAXA_ZERO_INIT,
+    .vertex_shader_info = DAXA_ZERO_INIT,
+    .tesselation_control_shader_info = DAXA_ZERO_INIT,
+    .tesselation_evaluation_shader_info = DAXA_ZERO_INIT,
+    .fragment_shader_info = DAXA_ZERO_INIT,
+    .task_shader_info = DAXA_ZERO_INIT,
+    .color_attachments = DAXA_ZERO_INIT,
+    .depth_test = DAXA_ZERO_INIT,
+    .tesselation = DAXA_ZERO_INIT,
+    .raster = DAXA_ZERO_INIT,
+    .push_constant_size = DAXA_MAX_PUSH_CONSTANT_BYTE_SIZE,
+    .name = DAXA_ZERO_INIT,
+};
+
 DAXA_EXPORT daxa_RasterPipelineInfo const *
 daxa_raster_pipeline_info(daxa_RasterPipeline raster_pipeline);
 

include/daxa/command_recorder.hpp

@@ -15,7 +15,7 @@ namespace daxa
     {
         void const * data = {};
         u64 size = {};
-        u32 offset = {};
+        [[deprecated("parameter ignored. API: 3.1")]] u32 offset = {};
     };
 
     struct CommandRecorderInfo
@@ -312,12 +312,11 @@ namespace daxa
 
         void push_constant_vptr(PushConstantInfo const & info);
         template <typename T>
-        void push_constant(T const & constant, u32 offset = 0)
+        void push_constant(T const & constant, [[maybe_unused]] [[deprecated("parameter ignored. API: 3.1")]] u32 offset = 0)
         {
             push_constant_vptr({
                 .data = static_cast<void const *>(&constant),
                 .size = static_cast<u32>(sizeof(T)),
-                .offset = offset,
             });
         }
         void set_pipeline(RasterPipeline const & pipeline);

include/daxa/daxa.inl

@@ -8,30 +8,17 @@
 #define DAXA_BUFFER_DEVICE_ADDRESS_BUFFER_BINDING 4
 #define DAXA_ACCELERATION_STRUCTURE_BINDING 5
 
+#define DAXA_LANGUAGE_C 0
+#define DAXA_LANGUAGE_CPP 0
+#define DAXA_LANGUAGE_GLSL 2
+#define DAXA_LANGUAGE_SLANG 3
+#define DAXA_LANGUAGE_HLSL DAXA_LANGUAGE_SLANG
+
 #if defined(_STDC_) // C
-#define DAXA_SHADER 0
-#elif defined(__cplusplus) // C++
-#define DAXA_SHADER 0
-#elif defined(GL_core_profile) // GLSL
-#define DAXA_SHADER 1
-#define DAXA_SHADERLANG DAXA_SHADERLANG_GLSL
-#else // SLANG
-#define DAXA_SHADER 1
-#define DAXA_SHADERLANG DAXA_SHADERLANG_SLANG
-#endif
 
-#if DAXA_SHADER
-#define DAXA_SHADERLANG_GLSL 1
-#define DAXA_SHADERLANG_SLANG 2
-#if DAXA_SHADERLANG == DAXA_SHADERLANG_GLSL
-#include <daxa/daxa.glsl>
-#elif DAXA_SHADERLANG == DAXA_SHADERLANG_SLANG
-#include "daxa/daxa.slang"
-#endif
-#else
-#if defined(_STDC_)
+#define DAXA_SHADER 0
+#define DAXA_LANGUAGE DAXA_LANGUAGE_C
 #include <daxa/c/daxa.h>
-
 /// @brief Buffer ptr enable is ignored in c++.
 #define DAXA_DECL_BUFFER_PTR(STRUCT_TYPE)
 #define DAXA_DECL_BUFFER_PTR_ALIGN(STRUCT_TYPE, ALIGN)
@@ -40,9 +27,11 @@
 /// @brief Buffer ptr types map to the buffer device address type in daxa.
 #define daxa_BufferPtr(x) daxa_DeviceAddress
 
-#else
-#include <daxa/daxa.hpp>
+#elif defined(__cplusplus) // C++
 
+#define DAXA_SHADER 0
+#define DAXA_LANGUAGE DAXA_LANGUAGE_CPP
+#include <daxa/daxa.hpp>
 /// @brief Buffer ptr enable is ignored in c++.
 #define DAXA_DECL_BUFFER_PTR(STRUCT_TYPE)
 #define DAXA_DECL_BUFFER_PTR_ALIGN(STRUCT_TYPE, ALIGN)
@@ -51,5 +40,16 @@
 /// @brief Buffer ptr types map to the buffer device address type in daxa.
 #define daxa_BufferPtr(x) daxa::types::DeviceAddress
 
-#endif
-#endif
+#elif defined(GL_core_profile) // GLSL
+
+#define DAXA_SHADER 1
+#define DAXA_LANGUAGE DAXA_LANGUAGE_GLSL
+#include <daxa/daxa.glsl>
+
+#else // SLANG
+
+#define DAXA_SHADER 1
+#define DAXA_LANGUAGE DAXA_LANGUAGE_SLANG
+#include "daxa/daxa.slang"
+
+#endif

include/daxa/daxa.slang

@@ -147,9 +147,19 @@ namespace daxa
         {
             return value == 0;
         }
+        SamplerState get()
+        {
+            return samplers[index()];
+        }
     };
 
 #if defined(DAXA_RAY_TRACING)
+    [[vk::binding(DAXA_ACCELERATION_STRUCTURE_BINDING, 0)]] RaytracingAccelerationStructure RayTracingAccelerationStructureTable[];
+    extension RaytracingAccelerationStructure
+    {
+        static RaytracingAccelerationStructure get(daxa::TlasId i) { return RayTracingAccelerationStructureTable[i.index()]; }
+    }
+
     struct TlasId
     {
         daxa_u64 value;
@@ -165,13 +175,11 @@ namespace daxa
         {
             return value == 0;
         }
+        RaytracingAccelerationStructure get()
+        {
+            return RayTracingAccelerationStructureTable[index()];
+        }
     };
-
-    [[vk::binding(DAXA_ACCELERATION_STRUCTURE_BINDING, 0)]] RaytracingAccelerationStructure RayTracingAccelerationStructureTable[];
-    extension RaytracingAccelerationStructure
-    {
-        static RaytracingAccelerationStructure get(daxa::TlasId i) { return RayTracingAccelerationStructureTable[i.index()]; }
-    }
 #endif // DAXA_RAY_TRACING
 
     extension ByteAddressBuffer
@@ -211,7 +219,7 @@ namespace daxa\
         TYPE<T> get_coherent() { return TYPE<T>::get_coherent(id); }\
     };    \
     __generic<T : ITexelElement>\
-    struct TYPE ## Idx\
+    struct TYPE ## Index\
     {\
         ImageViewIndex index;\
         TYPE<T> get() { return TYPE<T>::get(index); }\

include/daxa/device.hpp

@@ -201,21 +201,21 @@ namespace daxa
         using Data = u32;
     };
     using DeviceFlags = Flags<DeviceFlagsProperties>;
-    struct [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] DeviceFlagBits
+    struct [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] DeviceFlagBits
     {
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags NONE = {0x00000000};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags BUFFER_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT = {0x1 << 0};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags CONSERVATIVE_RASTERIZATION = {0x1 << 1};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags MESH_SHADER = {0x1 << 2};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags SHADER_ATOMIC64 = {0x1 << 3};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags IMAGE_ATOMIC64 = {0x1 << 4};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags VK_MEMORY_MODEL = {0x1 << 5};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags RAY_TRACING = {0x1 << 6};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags SHADER_FLOAT16 = {0x1 << 7};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags ROBUST_BUFFER_ACCESS = {0x1 << 9};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags ROBUST_IMAGE_ACCESS = {0x1 << 10};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags DYNAMIC_STATE_3 = {0x1 << 11};
-        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead")]] static inline constexpr DeviceFlags SHADER_ATOMIC_FLOAT = {0x1 << 12};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags NONE = {0x00000000};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags BUFFER_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT = {0x1 << 0};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags CONSERVATIVE_RASTERIZATION = {0x1 << 1};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags MESH_SHADER = {0x1 << 2};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags SHADER_ATOMIC64 = {0x1 << 3};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags IMAGE_ATOMIC64 = {0x1 << 4};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags VK_MEMORY_MODEL = {0x1 << 5};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags RAY_TRACING = {0x1 << 6};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags SHADER_FLOAT16 = {0x1 << 7};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags ROBUST_BUFFER_ACCESS = {0x1 << 9};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags ROBUST_IMAGE_ACCESS = {0x1 << 10};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags DYNAMIC_STATE_3 = {0x1 << 11};
+        [[deprecated("Use ExplicitFeatureFlags or ImplicitFeatureFlags instead, API:3.1")]] static inline constexpr DeviceFlags SHADER_ATOMIC_FLOAT = {0x1 << 12};
     };
 #endif
 
@@ -323,7 +323,7 @@ namespace daxa
     };
 
 #if !DAXA_REMOVE_DEPRECATED
-    [[deprecated("Use create_device_2 and Instance::choose_device instead")]] DAXA_EXPORT_CXX auto default_device_score(DeviceProperties const & device_props) -> i32;
+    [[deprecated("Use create_device_2 and Instance::choose_device instead, API:3.1")]] DAXA_EXPORT_CXX auto default_device_score(DeviceProperties const & device_props) -> i32;
 
     struct [[deprecated("Use DeviceInfo2 instead")]] DeviceInfo
     {
@@ -585,27 +585,27 @@ namespace daxa
 #if !DAXA_REMOVE_DEPRECATED
         /// DEPRECATED:
 
-        [[deprecated("Use tlas_build_sizes or as_build_sizes Instead")]] [[nodiscard]] auto get_tlas_build_sizes(TlasBuildInfo const & info) { return tlas_build_sizes(info); }
-        [[deprecated("Use blas_build_sizes or as_build_sizes Instead")]] [[nodiscard]] auto get_blas_build_sizes(BlasBuildInfo const & info) { return blas_build_sizes(info); }
-        [[deprecated("Use buffer_memory_requirements or memory_requirements Instead")]] [[nodiscard]] auto get_memory_requirements(BufferInfo const & info) const { return buffer_memory_requirements(info); }
-        [[deprecated("Use image_memory_requirements or memory_requirements Instead")]] [[nodiscard]] auto get_memory_requirements(ImageInfo const & info) const { return image_memory_requirements(info); }
-        [[deprecated("Use buffer_info or info instead")]] [[nodiscard]] auto info_buffer(BufferId id) const { return buffer_info(id); }
-        [[deprecated("Use image_info or info instead")]] [[nodiscard]] auto info_image(ImageId id) const { return image_info(id); }
-        [[deprecated("Use image_view_info or info instead")]] [[nodiscard]] auto info_image_view(ImageViewId id) const { return image_view_info(id); }
-        [[deprecated("Use sampler_info or info instead")]] [[nodiscard]] auto info_sampler(SamplerId id) const { return sampler_info(id); }
-        [[deprecated("Use tlas_info or info instead")]] [[nodiscard]] auto info_tlas(TlasId id) const { return tlas_info(id); }
-        [[deprecated("Use blas_info or info instead")]] [[nodiscard]] auto info_blas(BlasId id) const { return blas_info(id); }
+        [[deprecated("Use tlas_build_sizes or as_build_sizes Instead, API:3.0")]] [[nodiscard]] auto get_tlas_build_sizes(TlasBuildInfo const & info) { return tlas_build_sizes(info); }
+        [[deprecated("Use blas_build_sizes or as_build_sizes Instead, API:3.0")]] [[nodiscard]] auto get_blas_build_sizes(BlasBuildInfo const & info) { return blas_build_sizes(info); }
+        [[deprecated("Use buffer_memory_requirements or memory_requirements Instead, API:3.0")]] [[nodiscard]] auto get_memory_requirements(BufferInfo const & info) const { return buffer_memory_requirements(info); }
+        [[deprecated("Use image_memory_requirements or memory_requirements Instead, API:3.0")]] [[nodiscard]] auto get_memory_requirements(ImageInfo const & info) const { return image_memory_requirements(info); }
+        [[deprecated("Use buffer_info or info instead, API:3.0")]] [[nodiscard]] auto info_buffer(BufferId id) const { return buffer_info(id); }
+        [[deprecated("Use image_info or info instead, API:3.0")]] [[nodiscard]] auto info_image(ImageId id) const { return image_info(id); }
+        [[deprecated("Use image_view_info or info instead, API:3.0")]] [[nodiscard]] auto info_image_view(ImageViewId id) const { return image_view_info(id); }
+        [[deprecated("Use sampler_info or info instead, API:3.0")]] [[nodiscard]] auto info_sampler(SamplerId id) const { return sampler_info(id); }
+        [[deprecated("Use tlas_info or info instead, API:3.0")]] [[nodiscard]] auto info_tlas(TlasId id) const { return tlas_info(id); }
+        [[deprecated("Use blas_info or info instead, API:3.0")]] [[nodiscard]] auto info_blas(BlasId id) const { return blas_info(id); }
 
         template <typename T>
-        [[deprecated("Use buffer_host_address_as instead")]] [[nodiscard]] auto get_host_address_as(BufferId id) const
+        [[deprecated("Use buffer_host_address_as instead, API:3.0")]] [[nodiscard]] auto get_host_address_as(BufferId id) const
         {
             return buffer_host_address_as<T>(id);
         }
 
-        [[deprecated("Use buffer_host_address instead")]] [[nodiscard]] auto get_host_address(BufferId id) const { return buffer_host_address(id); }
-        [[deprecated("Use buffer_device_address or device_address instead")]] [[nodiscard]] auto get_device_address(BufferId id) const { return buffer_device_address(id); }
-        [[deprecated("Use blas_device_address or device_address instead")]] [[nodiscard]] auto get_device_address(BlasId id) const { return blas_device_address(id); }
-        [[deprecated("Use tlas_device_address or device_address instead")]] [[nodiscard]] auto get_device_address(TlasId id) const { return tlas_device_address(id); }
+        [[deprecated("Use buffer_host_address instead, API:3.0")]] [[nodiscard]] auto get_host_address(BufferId id) const { return buffer_host_address(id); }
+        [[deprecated("Use buffer_device_address or device_address instead, API:3.0")]] [[nodiscard]] auto get_device_address(BufferId id) const { return buffer_device_address(id); }
+        [[deprecated("Use blas_device_address or device_address instead, API:3.0")]] [[nodiscard]] auto get_device_address(BlasId id) const { return blas_device_address(id); }
+        [[deprecated("Use tlas_device_address or device_address instead, API:3.0")]] [[nodiscard]] auto get_device_address(TlasId id) const { return tlas_device_address(id); }
 #endif
 
       protected:

include/daxa/instance.hpp

@@ -31,15 +31,15 @@ namespace daxa
         Instance() = default;
 
 #if !DAXA_REMOVE_DEPRECATED
-        [[deprecated("Use create_device_2 instead")]] [[nodiscard]] auto create_device(DeviceInfo const & device_info) -> Device;
+        [[deprecated("Use create_device_2 instead, API:3.0")]] [[nodiscard]] auto create_device(DeviceInfo const & device_info) -> Device;
 #endif
         [[nodiscard]] auto create_device_2(DeviceInfo2 const & device_info) -> Device;
 
         /// Convenience function to pick a physical device.
         /// Picks first supported device that satisfies the given device info and desired implicit features.
-        auto choose_device(ImplicitFeatureFlags desired_features, DeviceInfo2 const & base_info) -> DeviceInfo2;
+        [[nodiscard]] auto choose_device(ImplicitFeatureFlags desired_features, DeviceInfo2 const & base_info) -> DeviceInfo2;
 
-        auto list_devices_properties() -> std::span<DeviceProperties const>;
+        [[nodiscard]] auto list_devices_properties() -> std::span<DeviceProperties const>;
 
         /// THREADSAFETY:
         /// * reference MUST NOT be read after the object is destroyed.

include/daxa/pipeline.hpp

@@ -61,8 +61,8 @@ namespace daxa
         Span<ShaderInfo const> closest_hit_shaders = {};
         Span<ShaderInfo const> miss_hit_shaders = {};
         Span<RayTracingShaderGroupInfo const> shader_groups = {};
-        u32 max_ray_recursion_depth;
-        u32 push_constant_size = {};
+        u32 max_ray_recursion_depth = {};
+        u32 push_constant_size = DAXA_MAX_PUSH_CONSTANT_BYTE_SIZE;
         SmallString name = {};
     };
 
@@ -97,7 +97,7 @@ namespace daxa
     struct ComputePipelineInfo
     {
         ShaderInfo shader_info = {};
-        u32 push_constant_size = {};
+        u32 push_constant_size = DAXA_MAX_PUSH_CONSTANT_BYTE_SIZE;
         SmallString name = {};
     };
 
@@ -191,7 +191,7 @@ namespace daxa
         Optional<DepthTestInfo> depth_test = {};
         Optional<TesselationInfo> tesselation = {};
         RasterizerInfo raster = {};
-        u32 push_constant_size = {};
+        u32 push_constant_size = DAXA_MAX_PUSH_CONSTANT_BYTE_SIZE;
         SmallString name = {};
     };