summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Null
diff options
context:
space:
mode:
authoriwubcode <iwubcode@users.noreply.github.com>2017-08-06 23:05:42 -0500
committeriwubcode <iwubcode@users.noreply.github.com>2017-11-17 22:11:29 -0600
commit33bc286baaafe31b2b564dd5d5574307cbd9e921 (patch)
tree5386d3079307b82abe0b6768d0f84a6618ca2d27 /Source/Core/VideoBackends/Null
parent081b92b8a7927fe699c5515cb1c90dcf8fe44179 (diff)
Remove old XFB logic
Diffstat (limited to 'Source/Core/VideoBackends/Null')
-rw-r--r--Source/Core/VideoBackends/Null/FramebufferManager.h33
-rw-r--r--Source/Core/VideoBackends/Null/Null.vcxproj1
-rw-r--r--Source/Core/VideoBackends/Null/NullBackend.cpp4
3 files changed, 2 insertions, 36 deletions
diff --git a/Source/Core/VideoBackends/Null/FramebufferManager.h b/Source/Core/VideoBackends/Null/FramebufferManager.h
deleted file mode 100644
index 0419ee36f8..0000000000
--- a/Source/Core/VideoBackends/Null/FramebufferManager.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015 Dolphin Emulator Project
-// Licensed under GPLv2+
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <utility>
-
-#include "Common/CommonTypes.h"
-#include "VideoCommon/FramebufferManagerBase.h"
-
-class XFBSource : public XFBSourceBase
-{
-public:
- void CopyEFB(float gamma) override {}
-};
-
-class FramebufferManager : public FramebufferManagerBase
-{
-public:
- std::unique_ptr<XFBSourceBase> CreateXFBSource(unsigned int target_width,
- unsigned int target_height,
- unsigned int layers) override
- {
- return std::make_unique<XFBSource>();
- }
-
- std::pair<u32, u32> GetTargetSize() const override { return std::make_pair(0, 0); }
- void CopyToRealXFB(u32 xfb_addr, u32 fb_stride, u32 fb_height, const EFBRectangle& source_rc,
- float gamma = 1.0f) override
- {
- }
-};
diff --git a/Source/Core/VideoBackends/Null/Null.vcxproj b/Source/Core/VideoBackends/Null/Null.vcxproj
index 178575ef81..664488035e 100644
--- a/Source/Core/VideoBackends/Null/Null.vcxproj
+++ b/Source/Core/VideoBackends/Null/Null.vcxproj
@@ -43,7 +43,6 @@
<ClCompile Include="VertexManager.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="FramebufferManager.h" />
<ClInclude Include="NullTexture.h" />
<ClInclude Include="PerfQuery.h" />
<ClInclude Include="Render.h" />
diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp
index 2a52fe7172..1bb8d6248e 100644
--- a/Source/Core/VideoBackends/Null/NullBackend.cpp
+++ b/Source/Core/VideoBackends/Null/NullBackend.cpp
@@ -7,7 +7,6 @@
// This backend tries not to do anything in the backend,
// but everything in VideoCommon.
-#include "VideoBackends/Null/FramebufferManager.h"
#include "VideoBackends/Null/PerfQuery.h"
#include "VideoBackends/Null/Render.h"
#include "VideoBackends/Null/ShaderCache.h"
@@ -15,6 +14,7 @@
#include "VideoBackends/Null/VertexManager.h"
#include "VideoBackends/Null/VideoBackend.h"
+#include "VideoCommon/FramebufferManagerBase.h"
#include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
@@ -68,7 +68,7 @@ void VideoBackend::Video_Prepare()
g_renderer = std::make_unique<Renderer>();
g_vertex_manager = std::make_unique<VertexManager>();
g_perf_query = std::make_unique<PerfQuery>();
- g_framebuffer_manager = std::make_unique<FramebufferManager>();
+ g_framebuffer_manager = std::make_unique<FramebufferManagerBase>();
g_texture_cache = std::make_unique<TextureCache>();
VertexShaderCache::s_instance = std::make_unique<VertexShaderCache>();
GeometryShaderCache::s_instance = std::make_unique<GeometryShaderCache>();