diff options
| author |  bunnei | 2020-09-23 18:24:27 -0700 |
|---|---|---|
| committer |  GitHub | 2020-09-23 18:24:27 -0700 |
| commit | d66b897a6d7a2a0bc0a3910fbdb7c1c6028c21d0 (patch) | |
| tree | 7417466362259dae2d1a690d6aef8dcbc14a0b12 /src/video_core/shader | |
| parent | Merge pull request #4618 from german77/GcAdapterAutoMap (diff) | |
| parent | vk_query_cache: Hack counter destructor to avoid reserving queries (diff) | |
| download | yuzu-d66b897a6d7a2a0bc0a3910fbdb7c1c6028c21d0.tar.gz yuzu-d66b897a6d7a2a0bc0a3910fbdb7c1c6028c21d0.tar.xz yuzu-d66b897a6d7a2a0bc0a3910fbdb7c1c6028c21d0.zip | |
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 @@ | |||
| 9 | #include <shared_mutex> | 9 | #include <shared_mutex> |
| 10 | #include <thread> | 10 | #include <thread> |
| 11 | 11 | ||
| 12 | // This header includes both Vulkan and OpenGL headers, this has to be fixed | ||
| 13 | // Unfortunately, including OpenGL will include Windows.h that defines macros that can cause issues. | ||
| 14 | // Forcefully include glad early and undefine macros | ||
| 15 | #include <glad/glad.h> | ||
| 16 | #ifdef CreateEvent | ||
| 17 | #undef CreateEvent | ||
| 18 | #endif | ||
| 19 | #ifdef CreateSemaphore | ||
| 20 | #undef CreateSemaphore | ||
| 21 | #endif | ||
| 22 | |||
| 12 | #include "common/common_types.h" | 23 | #include "common/common_types.h" |
| 13 | #include "video_core/renderer_opengl/gl_device.h" | 24 | #include "video_core/renderer_opengl/gl_device.h" |
| 14 | #include "video_core/renderer_opengl/gl_resource_manager.h" | 25 | #include "video_core/renderer_opengl/gl_resource_manager.h" |