Merge pull request #4571 from lioncash/fence

video_core/fence_manager: Remove unnecessary includes

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"

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)
+GLInnerFence::GLInnerFence(u32 payload, bool is_stubbed) : FenceBase(payload, is_stubbed) {}
-    : VideoCommon::FenceBase(payload, is_stubbed), sync_object{} {}
 
 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;
 

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"