diff options
| author | skal <pascal.massimino@gmail.com> | 2026-01-31 18:19:25 +0100 |
|---|---|---|
| committer | skal <pascal.massimino@gmail.com> | 2026-01-31 18:19:25 +0100 |
| commit | 7019aff97f2de31a1ad476e4d155680542a18307 (patch) | |
| tree | d113a6aeae9ee7d77956bd163d13c4b62b782396 /src | |
| parent | 5c9286af850f9a3335d294c7c2e100104741b296 (diff) | |
fix: Resolve all remaining linking and include errors for Sequence/Effect tests
Corrects CMakeLists.txt to properly link test_sequence against GLFW and WGPU_LIBRARY. Ensures correct include paths for wgpu headers. Updates demo_effects.cc stub implementations. Finalizes test suite for sequence/effect system.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gpu.h | 64 |
1 files changed, 49 insertions, 15 deletions
diff --git a/src/gpu/gpu.h b/src/gpu/gpu.h index ce233fa..0bc20b7 100644 --- a/src/gpu/gpu.h +++ b/src/gpu/gpu.h @@ -8,50 +8,79 @@ #include <cstring> // For strlen + + #if defined(DEMO_CROSS_COMPILE_WIN32) // Windows (MinGW) using wgpu-native v0.19.4.1 -#include <webgpu/webgpu.h> // Reverted to angle brackets +#include <webgpu/webgpu.h> + +#include <webgpu/wgpu.h> + + + +static inline const char *str_view(const char *str) { return str; } + + + +static inline const char *label_view(const char *str) { return str; } + + -#include <webgpu/wgpu.h> // Reverted to angle brackets -using WGPUStringView = const char *; -static inline const char *str_view(const char *str) { - return str; -} -static inline const char *label_view(const char *str) { - return str; -} #define WGPUSType_ShaderSourceWGSL WGPUSType_ShaderModuleWGSLDescriptor + + using WGPUShaderSourceWGSL = WGPUShaderModuleWGSLDescriptor; + + +#define WGPUSurfaceGetCurrentTextureStatus_SuccessOptimal WGPUSurfaceGetCurrentTextureStatus_Success + + + +#define WGPUSurfaceGetCurrentTextureStatus_SuccessSuboptimal WGPUSurfaceGetCurrentTextureStatus_Success + + + +#define WGPUCallbackMode_WaitAnyOnly 0 + + + + + #else // Native (macOS/Linux) using newer wgpu-native -#include <webgpu.h> // Reverted to angle brackets -#include <wgpu.h> // Reverted to angle brackets + +#include <webgpu.h> + +#include <wgpu.h> + + static inline WGPUStringView str_view(const char *str) { - if (!str) - return {nullptr, 0}; + if (!str) return {nullptr, 0}; return {str, strlen(str)}; + } + + static inline WGPUStringView label_view(const char *str) { #ifndef STRIP_ALL - if (!str) - return {nullptr, 0}; + if (!str) return {nullptr, 0}; return {str, strlen(str)}; @@ -62,10 +91,15 @@ static inline WGPUStringView label_view(const char *str) { return {nullptr, 0}; #endif + } + + #endif + + struct GLFWwindow; // Basic wrapper for WebGPU buffers |
