Fix some issues

Ipotrick · Dec 17, 2024 · f28b786 · f28b786
1 parent bf3d848
commit f28b786
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -170,10 +170,10 @@ if(DAXA_ENABLE_UTILS_PIPELINE_MANAGER_SLANG)
     if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         # NOTE(grundlett): Really hacky. It appears there's no way to create plugin dll dependencies...
         # see https://gitlab.kitware.com/cmake/cmake/-/issues/22993
-        add_custom_command(TARGET daxa POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy ${SLANG_DLL} $<TARGET_FILE_DIR:daxa>
-            COMMAND ${CMAKE_COMMAND} -E copy ${SLANG_GLSLANG_DLL} $<TARGET_FILE_DIR:daxa>
-        )
+        # add_custom_command(TARGET daxa POST_BUILD
+        #     COMMAND ${CMAKE_COMMAND} -E copy ${SLANG_DLL} $<TARGET_FILE_DIR:daxa>
+        #     COMMAND ${CMAKE_COMMAND} -E copy ${SLANG_GLSLANG_DLL} $<TARGET_FILE_DIR:daxa>
+        # )
     else()
         # TODO(grundlett) ...
         # find_file(SLANG_DLL libslang.so)

diff --git a/tests/0_common/base_app.hpp b/tests/0_common/base_app.hpp
@@ -9,6 +9,7 @@ using namespace std::chrono_literals;
 
 #include <daxa/utils/pipeline_manager.hpp>
 
+#include <daxa/utils/task_graph.hpp>
 #include <daxa/utils/imgui.hpp>
 #include <imgui_impl_glfw.h>
 
@@ -32,10 +33,10 @@ struct BaseApp : AppWindow<T>
         daxa::DeviceInfo2 info = {.name = "default device"};
         daxa::ImplicitFeatureFlags required_features = {};
 #if defined(DAXA_ATOMIC_FLOAT_FLAG)
-        required_features |= daxa::ImplicitFeatureFlags::SHADER_ATOMIC_FLOAT;
+        required_features |= daxa::ImplicitFeatureFlagBits::SHADER_ATOMIC_FLOAT;
 #endif
 #if defined(DAXA_RAY_TRACING_FLAG)
-        required_features |= daxa::ImplicitFeatureFlags::BASIC_RAY_TRACING;
+        required_features |= daxa::ImplicitFeatureFlagBits::BASIC_RAY_TRACING;
 #endif
         info = daxa_ctx.choose_device(required_features, info);
         return daxa_ctx.create_device_2(info);

diff --git a/tests/3_samples/2_mpm_mls/camera.h b/tests/3_samples/2_mpm_mls/camera.h
@@ -3,6 +3,7 @@
 #ifndef CAMERA_H
 #define CAMERA_H
 
+#define GLM_ENABLE_EXPERIMENTAL
 #include <array>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>

diff --git a/tests/4_hello_daxa/1_pink_screen/main.cpp b/tests/4_hello_daxa/1_pink_screen/main.cpp
@@ -70,8 +70,8 @@ auto main() -> int
     // The device info contains explicit data.
     // These are settings of the choosen gpu, what resource limits, explicit features, name etc you want for the device.
     daxa::DeviceInfo2 device_info = {
-        .max_allowed_buffers = 1024,
         .explicit_features = {},
+        .max_allowed_buffers = 1024,
         .name = "my device",
     };
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -28,10 +28,10 @@ function(DAXA_CREATE_TEST)
         if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
             # NOTE(grundlett): Really hacky. It appears there's no way to create plugin dll dependencies...
             # see https://gitlab.kitware.com/cmake/cmake/-/issues/22993
-            add_custom_command(TARGET daxa_test_${FOLDER_NAME} POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy ${SLANG_DLL} $<TARGET_FILE_DIR:daxa_test_${FOLDER_NAME}>
-                COMMAND ${CMAKE_COMMAND} -E copy ${SLANG_GLSLANG_DLL} $<TARGET_FILE_DIR:daxa_test_${FOLDER_NAME}>
-            )
+            # add_custom_command(TARGET daxa_test_${FOLDER_NAME} POST_BUILD
+            #     COMMAND ${CMAKE_COMMAND} -E copy ${SLANG_DLL} $<TARGET_FILE_DIR:daxa_test_${FOLDER_NAME}>
+            #     COMMAND ${CMAKE_COMMAND} -E copy ${SLANG_GLSLANG_DLL} $<TARGET_FILE_DIR:daxa_test_${FOLDER_NAME}>
+            # )
         endif()
     endif()
 endfunction()