diff options
| author | bunnei <bunneidev@gmail.com> | 2020-09-23 18:24:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-23 18:24:27 -0700 |
| commit | d66b897a6d7a2a0bc0a3910fbdb7c1c6028c21d0 (patch) | |
| tree | 7417466362259dae2d1a690d6aef8dcbc14a0b12 /src/video_core/shader | |
| parent | 10e8acc4513b0f286fd485aa366cd8b7900c63ca (diff) | |
| parent | 4f5bbe56ba1a590f4f266945d29b4bc9a04c23fd (diff) | |
Merge pull request #4674 from ReinUsesLisp/timeline-semaphores
renderer_vulkan: Make unconditional use of VK_KHR_timeline_semaphore
Diffstat (limited to 'src/video_core/shader')
| -rw-r--r-- | src/video_core/shader/async_shaders.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/video_core/shader/async_shaders.h b/src/video_core/shader/async_shaders.h index 7cf8d994c..7a99e1dc5 100644 --- a/src/video_core/shader/async_shaders.h +++ b/src/video_core/shader/async_shaders.h @@ -9,6 +9,17 @@ #include <shared_mutex> #include <thread> +// This header includes both Vulkan and OpenGL headers, this has to be fixed +// Unfortunately, including OpenGL will include Windows.h that defines macros that can cause issues. +// Forcefully include glad early and undefine macros +#include <glad/glad.h> +#ifdef CreateEvent +#undef CreateEvent +#endif +#ifdef CreateSemaphore +#undef CreateSemaphore +#endif + #include "common/common_types.h" #include "video_core/renderer_opengl/gl_device.h" #include "video_core/renderer_opengl/gl_resource_manager.h" |