diff --git a/src/utils/impl_imgui.cpp b/src/utils/impl_imgui.cpp index 6dfbb5c0..cf9e398a 100644 --- a/src/utils/impl_imgui.cpp +++ b/src/utils/impl_imgui.cpp @@ -418,7 +418,7 @@ namespace daxa .image_view_id = font_sheet.default_view(), .sampler_id = this->font_sampler, }); - io.Fonts->SetTexID(nullptr); + io.Fonts->SetTexID({}); } ImplImGuiRenderer::~ImplImGuiRenderer() diff --git a/tests/2_daxa_api/12_async_queues/main.cpp b/tests/2_daxa_api/12_async_queues/main.cpp index 9ea54da6..4d326ee2 100644 --- a/tests/2_daxa_api/12_async_queues/main.cpp +++ b/tests/2_daxa_api/12_async_queues/main.cpp @@ -137,8 +137,8 @@ namespace tests rec.pipeline_barrier({daxa::AccessConsts::TRANSFER_WRITE, daxa::AccessConsts::TRANSFER_READ_WRITE}); rec.copy_buffer_to_buffer({ .src_buffer = buffer, - .src_offset = sizeof(daxa::u32) * 0, .dst_buffer = buffer, + .src_offset = sizeof(daxa::u32) * 0, .dst_offset = sizeof(daxa::u32) * 1, .size = sizeof(daxa::u32), }); @@ -160,8 +160,8 @@ namespace tests rec.pipeline_barrier({daxa::AccessConsts::TRANSFER_READ_WRITE, daxa::AccessConsts::TRANSFER_READ_WRITE}); rec.copy_buffer_to_buffer({ .src_buffer = buffer, - .src_offset = sizeof(daxa::u32) * 1, .dst_buffer = buffer, + .src_offset = sizeof(daxa::u32) * 1, .dst_offset = sizeof(daxa::u32) * 2, .size = sizeof(daxa::u32), }); @@ -170,8 +170,8 @@ namespace tests device.submit_commands({ .queue = daxa::QUEUE_COMPUTE_1, .command_lists = std::array{commands}, - .signal_binary_semaphores = std::array{sema1}, .wait_binary_semaphores = std::array{sema0}, + .signal_binary_semaphores = std::array{sema1}, }); } @@ -185,8 +185,8 @@ namespace tests rec.pipeline_barrier({daxa::AccessConsts::TRANSFER_READ_WRITE, daxa::AccessConsts::TRANSFER_READ_WRITE}); rec.copy_buffer_to_buffer({ .src_buffer = buffer, - .src_offset = sizeof(daxa::u32) * 2, .dst_buffer = buffer, + .src_offset = sizeof(daxa::u32) * 2, .dst_offset = sizeof(daxa::u32) * 3, .size = sizeof(daxa::u32), }); diff --git a/tests/3_samples/1_mandelbrot/main.cpp b/tests/3_samples/1_mandelbrot/main.cpp index 59bab121..2521b49f 100644 --- a/tests/3_samples/1_mandelbrot/main.cpp +++ b/tests/3_samples/1_mandelbrot/main.cpp @@ -1,5 +1,5 @@ #define DAXA_SHADERLANG DAXA_SHADERLANG_SLANG -#define APPNAME "Daxa Sample: Sphere tracing" +#define APPNAME "Daxa Sample: Mandelbrot" #include <0_common/base_app.hpp> using namespace daxa::types; diff --git a/tests/3_samples/1_mandelbrot/shaders/shared.inl b/tests/3_samples/1_mandelbrot/shaders/shared.inl index 33ddf2e2..30a459d1 100644 --- a/tests/3_samples/1_mandelbrot/shaders/shared.inl +++ b/tests/3_samples/1_mandelbrot/shaders/shared.inl @@ -4,14 +4,22 @@ struct GpuInput { - daxa::f32 time; - daxa::f32 delta_time; + daxa_f32 time; + daxa_f32 delta_time; }; +DAXA_DECL_BUFFER_PTR(GpuInput) struct ComputePush { +#if DAXA_SHADERLANG == DAXA_SHADERLANG_GLSL + daxa_ImageViewId image_id; + daxa_BufferId input_buffer_id; + daxa_BufferPtr(GpuInput) ptr; + daxa_u32vec2 frame_dim; +#else daxa::RWTexture2DId image_id; daxa::BufferId input_buffer_id; daxa_BufferPtr(GpuInput) ptr; daxa_u32vec2 frame_dim; +#endif }; diff --git a/tests/3_samples/3_hello_triangle_compute/shaders/compute.hlsl b/tests/3_samples/3_hello_triangle_compute/shaders/compute.hlsl index 530af755..20ee2102 100644 --- a/tests/3_samples/3_hello_triangle_compute/shaders/compute.hlsl +++ b/tests/3_samples/3_hello_triangle_compute/shaders/compute.hlsl @@ -7,7 +7,7 @@ void main(uint3 pixel_i : SV_DispatchThreadID) // clang-format on { - RWTexture2D render_image = daxa_RWTexture2D(p.image); + RWTexture2D render_image = RWTexture2D.get(p.image); if (pixel_i.x >= p.frame_dim.x || pixel_i.y >= p.frame_dim.y) return; diff --git a/tests/4_hello_daxa/1_pink_screen/main.cpp b/tests/4_hello_daxa/1_pink_screen/main.cpp index e74bbe13..8911ca9e 100644 --- a/tests/4_hello_daxa/1_pink_screen/main.cpp +++ b/tests/4_hello_daxa/1_pink_screen/main.cpp @@ -99,7 +99,8 @@ auto main() -> int // These features pose no downsides, so they are always enabled when present. // We must check if the gpu supports the implicit features we want for the device. daxa::ImplicitFeatureFlags required_implicit_features = {}; - if (!(properties.explicit_features & required_explicit_features) || !(properties.implicit_features & required_implicit_features)) + if ((required_explicit_features & properties.explicit_features) != required_explicit_features || + (required_implicit_features & properties.implicit_features) != required_implicit_features) { continue; } @@ -109,7 +110,7 @@ auto main() -> int { continue; } - + // If a device fulfills all our requirements, we pick it: device_info.physical_device_index = i; break; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4a5ed749..8824fa26 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -111,10 +111,10 @@ DAXA_CREATE_TEST( FOLDER 2_daxa_api 9_shader_integration LIBS glfw ) -DAXA_CREATE_TEST( - FOLDER 2_daxa_api 10_raytracing - LIBS glfw -) +# DAXA_CREATE_TEST( +# FOLDER 2_daxa_api 10_raytracing +# LIBS glfw +# ) DAXA_CREATE_TEST( FOLDER 2_daxa_api 11_mesh_shader LIBS glfw @@ -132,10 +132,10 @@ DAXA_CREATE_TEST( FOLDER 3_samples 1_mandelbrot LIBS glfw ) -DAXA_CREATE_TEST( - FOLDER 3_samples 2_mpm_mls - LIBS glfw -) +# DAXA_CREATE_TEST( +# FOLDER 3_samples 2_mpm_mls +# LIBS glfw +# ) DAXA_CREATE_TEST( FOLDER 3_samples 3_hello_triangle_compute LIBS glfw