diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/fence_manager.h | 5 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_fence_manager.cpp | 7 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_fence_manager.h | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h index 8b2a6a42c..06cc12d5a 100644 --- a/src/video_core/fence_manager.h +++ b/src/video_core/fence_manager.h | |||
| @@ -5,15 +5,10 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <algorithm> | 7 | #include <algorithm> |
| 8 | #include <array> | ||
| 9 | #include <memory> | ||
| 10 | #include <queue> | 8 | #include <queue> |
| 11 | 9 | ||
| 12 | #include "common/assert.h" | ||
| 13 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 14 | #include "core/core.h" | 11 | #include "core/core.h" |
| 15 | #include "core/memory.h" | ||
| 16 | #include "core/settings.h" | ||
| 17 | #include "video_core/gpu.h" | 12 | #include "video_core/gpu.h" |
| 18 | #include "video_core/memory_manager.h" | 13 | #include "video_core/memory_manager.h" |
| 19 | #include "video_core/rasterizer_interface.h" | 14 | #include "video_core/rasterizer_interface.h" |
diff --git a/src/video_core/renderer_opengl/gl_fence_manager.cpp b/src/video_core/renderer_opengl/gl_fence_manager.cpp index ec5421afa..3d2588dd2 100644 --- a/src/video_core/renderer_opengl/gl_fence_manager.cpp +++ b/src/video_core/renderer_opengl/gl_fence_manager.cpp | |||
| @@ -4,16 +4,17 @@ | |||
| 4 | 4 | ||
| 5 | #include "common/assert.h" | 5 | #include "common/assert.h" |
| 6 | 6 | ||
| 7 | #include <glad/glad.h> | ||
| 8 | |||
| 7 | #include "video_core/renderer_opengl/gl_buffer_cache.h" | 9 | #include "video_core/renderer_opengl/gl_buffer_cache.h" |
| 8 | #include "video_core/renderer_opengl/gl_fence_manager.h" | 10 | #include "video_core/renderer_opengl/gl_fence_manager.h" |
| 9 | 11 | ||
| 10 | namespace OpenGL { | 12 | namespace OpenGL { |
| 11 | 13 | ||
| 12 | GLInnerFence::GLInnerFence(u32 payload, bool is_stubbed) | 14 | GLInnerFence::GLInnerFence(u32 payload, bool is_stubbed) : FenceBase(payload, is_stubbed) {} |
| 13 | : VideoCommon::FenceBase(payload, is_stubbed), sync_object{} {} | ||
| 14 | 15 | ||
| 15 | GLInnerFence::GLInnerFence(GPUVAddr address, u32 payload, bool is_stubbed) | 16 | GLInnerFence::GLInnerFence(GPUVAddr address, u32 payload, bool is_stubbed) |
| 16 | : VideoCommon::FenceBase(address, payload, is_stubbed), sync_object{} {} | 17 | : FenceBase(address, payload, is_stubbed) {} |
| 17 | 18 | ||
| 18 | GLInnerFence::~GLInnerFence() = default; | 19 | GLInnerFence::~GLInnerFence() = default; |
| 19 | 20 | ||
diff --git a/src/video_core/renderer_opengl/gl_fence_manager.h b/src/video_core/renderer_opengl/gl_fence_manager.h index c917b3343..1686cf5c8 100644 --- a/src/video_core/renderer_opengl/gl_fence_manager.h +++ b/src/video_core/renderer_opengl/gl_fence_manager.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <glad/glad.h> | ||
| 9 | 8 | ||
| 10 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 11 | #include "video_core/fence_manager.h" | 10 | #include "video_core/fence_manager.h" |