etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4571 from lioncash/fence

Browse source 
video_core/fence_manager: Remove unnecessary includes
This commit is contained in:
Rodrigo Locatti 2020-08-24 00:32:29 -03:00 committed by GitHub
commit fff2de8224
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/video_core/fence_manager.h
View file

@ -5,15 +5,10 @@
#pragma once #pragma once
#include <algorithm> #include <algorithm>
#include <array>
#include <memory>
#include <queue> #include <queue>
#include "common/assert.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "core/core.h" #include "core/core.h"
#include "core/memory.h"
#include "core/settings.h"
#include "video_core/gpu.h" #include "video_core/gpu.h"
#include "video_core/memory_manager.h" #include "video_core/memory_manager.h"
#include "video_core/rasterizer_interface.h" #include "video_core/rasterizer_interface.h"

7
src/video_core/renderer_opengl/gl_fence_manager.cpp
View file

@ -4,16 +4,17 @@
#include "common/assert.h" #include "common/assert.h"
#include <glad/glad.h>
#include "video_core/renderer_opengl/gl_buffer_cache.h" #include "video_core/renderer_opengl/gl_buffer_cache.h"
#include "video_core/renderer_opengl/gl_fence_manager.h" #include "video_core/renderer_opengl/gl_fence_manager.h"
namespace OpenGL { 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) 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; GLInnerFence::~GLInnerFence() = default;

1
src/video_core/renderer_opengl/gl_fence_manager.h
View file

@ -5,7 +5,6 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <glad/glad.h>
#include "common/common_types.h" #include "common/common_types.h"
#include "video_core/fence_manager.h" #include "video_core/fence_manager.h"