diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-08-24 03:44:48 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-08-24 03:44:50 +0200 |
| commit | f3bb52c0a97d9500a600640e280170b32a1d2785 (patch) | |
| tree | 924efbf7e31b9e5d918908457f550286d3bc12eb /src/video_core | |
| parent | Merge pull request #4561 from lioncash/key-constexpr (diff) | |
| download | yuzu-f3bb52c0a97d9500a600640e280170b32a1d2785.tar yuzu-f3bb52c0a97d9500a600640e280170b32a1d2785.tar.gz yuzu-f3bb52c0a97d9500a600640e280170b32a1d2785.tar.bz2 yuzu-f3bb52c0a97d9500a600640e280170b32a1d2785.tar.lz yuzu-f3bb52c0a97d9500a600640e280170b32a1d2785.tar.xz yuzu-f3bb52c0a97d9500a600640e280170b32a1d2785.tar.zst yuzu-f3bb52c0a97d9500a600640e280170b32a1d2785.zip | |
Diffstat (limited to 'src/video_core')
| -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 @@ #pragma once #include <algorithm> -#include <array> -#include <memory> #include <queue> -#include "common/assert.h" #include "common/common_types.h" #include "core/core.h" -#include "core/memory.h" -#include "core/settings.h" #include "video_core/gpu.h" #include "video_core/memory_manager.h" #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 @@ #include "common/assert.h" +#include <glad/glad.h> + #include "video_core/renderer_opengl/gl_buffer_cache.h" #include "video_core/renderer_opengl/gl_fence_manager.h" namespace OpenGL { -GLInnerFence::GLInnerFence(u32 payload, bool is_stubbed) - : VideoCommon::FenceBase(payload, is_stubbed), sync_object{} {} +GLInnerFence::GLInnerFence(u32 payload, bool is_stubbed) : FenceBase(payload, is_stubbed) {} GLInnerFence::GLInnerFence(GPUVAddr address, u32 payload, bool is_stubbed) - : VideoCommon::FenceBase(address, payload, is_stubbed), sync_object{} {} + : FenceBase(address, payload, is_stubbed) {} GLInnerFence::~GLInnerFence() = default; 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 @@ #pragma once #include <memory> -#include <glad/glad.h> #include "common/common_types.h" #include "video_core/fence_manager.h" |