From ef70fe05bfae4e47f4acb40756d16de0ef1dd259 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 15 Sep 2020 05:24:28 -0700 Subject: normalize common filenames in VideoBackends/Null --- Source/Core/VideoBackends/Null/CMakeLists.txt | 8 +-- Source/Core/VideoBackends/Null/Null.vcxproj | 8 +-- Source/Core/VideoBackends/Null/NullBackend.cpp | 4 +- Source/Core/VideoBackends/Null/NullRender.cpp | 84 ++++++++++++++++++++++ Source/Core/VideoBackends/Null/NullRender.h | 47 ++++++++++++ .../Core/VideoBackends/Null/NullVertexManager.cpp | 17 +++++ Source/Core/VideoBackends/Null/NullVertexManager.h | 20 ++++++ Source/Core/VideoBackends/Null/Render.cpp | 84 ---------------------- Source/Core/VideoBackends/Null/Render.h | 47 ------------ Source/Core/VideoBackends/Null/VertexManager.cpp | 17 ----- Source/Core/VideoBackends/Null/VertexManager.h | 20 ------ 11 files changed, 178 insertions(+), 178 deletions(-) create mode 100644 Source/Core/VideoBackends/Null/NullRender.cpp create mode 100644 Source/Core/VideoBackends/Null/NullRender.h create mode 100644 Source/Core/VideoBackends/Null/NullVertexManager.cpp create mode 100644 Source/Core/VideoBackends/Null/NullVertexManager.h delete mode 100644 Source/Core/VideoBackends/Null/Render.cpp delete mode 100644 Source/Core/VideoBackends/Null/Render.h delete mode 100644 Source/Core/VideoBackends/Null/VertexManager.cpp delete mode 100644 Source/Core/VideoBackends/Null/VertexManager.h (limited to 'Source/Core/VideoBackends') diff --git a/Source/Core/VideoBackends/Null/CMakeLists.txt b/Source/Core/VideoBackends/Null/CMakeLists.txt index 6713f7d1c5..19f295950d 100644 --- a/Source/Core/VideoBackends/Null/CMakeLists.txt +++ b/Source/Core/VideoBackends/Null/CMakeLists.txt @@ -1,13 +1,13 @@ add_library(videonull NullBackend.cpp + NullRender.cpp + NullRender.h NullTexture.cpp NullTexture.h + NullVertexManager.cpp + NullVertexManager.h PerfQuery.h - Render.cpp - Render.h TextureCache.h - VertexManager.cpp - VertexManager.h VideoBackend.h ) diff --git a/Source/Core/VideoBackends/Null/Null.vcxproj b/Source/Core/VideoBackends/Null/Null.vcxproj index b9001c2718..965d57a6c5 100644 --- a/Source/Core/VideoBackends/Null/Null.vcxproj +++ b/Source/Core/VideoBackends/Null/Null.vcxproj @@ -17,16 +17,16 @@ + - - + + + - - diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp index ab061bc7d3..353cd67b0f 100644 --- a/Source/Core/VideoBackends/Null/NullBackend.cpp +++ b/Source/Core/VideoBackends/Null/NullBackend.cpp @@ -7,10 +7,10 @@ // This backend tries not to do anything in the backend, // but everything in VideoCommon. +#include "VideoBackends/Null/NullRender.h" +#include "VideoBackends/Null/NullVertexManager.h" #include "VideoBackends/Null/PerfQuery.h" -#include "VideoBackends/Null/Render.h" #include "VideoBackends/Null/TextureCache.h" -#include "VideoBackends/Null/VertexManager.h" #include "VideoBackends/Null/VideoBackend.h" #include "Common/Common.h" diff --git a/Source/Core/VideoBackends/Null/NullRender.cpp b/Source/Core/VideoBackends/Null/NullRender.cpp new file mode 100644 index 0000000000..df99931908 --- /dev/null +++ b/Source/Core/VideoBackends/Null/NullRender.cpp @@ -0,0 +1,84 @@ +// Copyright 2015 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#include "VideoBackends/Null/NullRender.h" + +#include "VideoBackends/Null/NullTexture.h" + +#include "VideoCommon/AbstractPipeline.h" +#include "VideoCommon/AbstractShader.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/VideoConfig.h" + +namespace Null +{ +// Init functions +Renderer::Renderer() : ::Renderer(1, 1, 1.0f, AbstractTextureFormat::RGBA8) +{ + UpdateActiveConfig(); +} + +Renderer::~Renderer() +{ + UpdateActiveConfig(); +} + +bool Renderer::IsHeadless() const +{ + return true; +} + +std::unique_ptr Renderer::CreateTexture(const TextureConfig& config) +{ + return std::make_unique(config); +} + +std::unique_ptr Renderer::CreateStagingTexture(StagingTextureType type, + const TextureConfig& config) +{ + return std::make_unique(type, config); +} + +class NullShader final : public AbstractShader +{ +public: + explicit NullShader(ShaderStage stage) : AbstractShader(stage) {} +}; + +std::unique_ptr +Renderer::CreateShaderFromSource(ShaderStage stage, [[maybe_unused]] std::string_view source) +{ + return std::make_unique(stage); +} + +std::unique_ptr Renderer::CreateShaderFromBinary(ShaderStage stage, + const void* data, size_t length) +{ + return std::make_unique(stage); +} + +class NullPipeline final : public AbstractPipeline +{ +}; + +std::unique_ptr Renderer::CreatePipeline(const AbstractPipelineConfig& config, + const void* cache_data, + size_t cache_data_length) +{ + return std::make_unique(); +} + +std::unique_ptr Renderer::CreateFramebuffer(AbstractTexture* color_attachment, + AbstractTexture* depth_attachment) +{ + return NullFramebuffer::Create(static_cast(color_attachment), + static_cast(depth_attachment)); +} + +std::unique_ptr +Renderer::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl) +{ + return std::make_unique(vtx_decl); +} +} // namespace Null diff --git a/Source/Core/VideoBackends/Null/NullRender.h b/Source/Core/VideoBackends/Null/NullRender.h new file mode 100644 index 0000000000..21bd9c9c2c --- /dev/null +++ b/Source/Core/VideoBackends/Null/NullRender.h @@ -0,0 +1,47 @@ +// Copyright 2015 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#pragma once + +#include "VideoCommon/RenderBase.h" + +namespace Null +{ +class Renderer final : public ::Renderer +{ +public: + Renderer(); + ~Renderer() override; + + bool IsHeadless() const override; + + std::unique_ptr CreateTexture(const TextureConfig& config) override; + std::unique_ptr + CreateStagingTexture(StagingTextureType type, const TextureConfig& config) override; + std::unique_ptr + CreateFramebuffer(AbstractTexture* color_attachment, AbstractTexture* depth_attachment) override; + + std::unique_ptr CreateShaderFromSource(ShaderStage stage, + std::string_view source) override; + std::unique_ptr CreateShaderFromBinary(ShaderStage stage, const void* data, + size_t length) override; + std::unique_ptr + CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl) override; + std::unique_ptr CreatePipeline(const AbstractPipelineConfig& config, + const void* cache_data = nullptr, + size_t cache_data_length = 0) override; + + u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override { return 0; } + void PokeEFB(EFBAccessType type, const EfbPokeData* points, size_t num_points) override {} + u16 BBoxRead(int index) override { return 0; } + void BBoxWrite(int index, u16 value) override {} + + void ClearScreen(const MathUtil::Rectangle& rc, bool colorEnable, bool alphaEnable, + bool zEnable, u32 color, u32 z) override + { + } + + void ReinterpretPixelData(EFBReinterpretType convtype) override {} +}; +} // namespace Null diff --git a/Source/Core/VideoBackends/Null/NullVertexManager.cpp b/Source/Core/VideoBackends/Null/NullVertexManager.cpp new file mode 100644 index 0000000000..6828a0250e --- /dev/null +++ b/Source/Core/VideoBackends/Null/NullVertexManager.cpp @@ -0,0 +1,17 @@ +// Copyright 2015 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#include "VideoBackends/Null/NullVertexManager.h" + +namespace Null +{ +VertexManager::VertexManager() = default; + +VertexManager::~VertexManager() = default; + +void VertexManager::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_vertex) +{ +} + +} // namespace Null diff --git a/Source/Core/VideoBackends/Null/NullVertexManager.h b/Source/Core/VideoBackends/Null/NullVertexManager.h new file mode 100644 index 0000000000..1ca0d15177 --- /dev/null +++ b/Source/Core/VideoBackends/Null/NullVertexManager.h @@ -0,0 +1,20 @@ +// Copyright 2015 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#pragma once + +#include "VideoCommon/VertexManagerBase.h" + +namespace Null +{ +class VertexManager final : public VertexManagerBase +{ +public: + VertexManager(); + ~VertexManager() override; + +protected: + void DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_vertex) override; +}; +} // namespace Null diff --git a/Source/Core/VideoBackends/Null/Render.cpp b/Source/Core/VideoBackends/Null/Render.cpp deleted file mode 100644 index 7e8719baf5..0000000000 --- a/Source/Core/VideoBackends/Null/Render.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2015 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#include "VideoBackends/Null/Render.h" - -#include "VideoBackends/Null/NullTexture.h" - -#include "VideoCommon/AbstractPipeline.h" -#include "VideoCommon/AbstractShader.h" -#include "VideoCommon/NativeVertexFormat.h" -#include "VideoCommon/VideoConfig.h" - -namespace Null -{ -// Init functions -Renderer::Renderer() : ::Renderer(1, 1, 1.0f, AbstractTextureFormat::RGBA8) -{ - UpdateActiveConfig(); -} - -Renderer::~Renderer() -{ - UpdateActiveConfig(); -} - -bool Renderer::IsHeadless() const -{ - return true; -} - -std::unique_ptr Renderer::CreateTexture(const TextureConfig& config) -{ - return std::make_unique(config); -} - -std::unique_ptr Renderer::CreateStagingTexture(StagingTextureType type, - const TextureConfig& config) -{ - return std::make_unique(type, config); -} - -class NullShader final : public AbstractShader -{ -public: - explicit NullShader(ShaderStage stage) : AbstractShader(stage) {} -}; - -std::unique_ptr -Renderer::CreateShaderFromSource(ShaderStage stage, [[maybe_unused]] std::string_view source) -{ - return std::make_unique(stage); -} - -std::unique_ptr Renderer::CreateShaderFromBinary(ShaderStage stage, - const void* data, size_t length) -{ - return std::make_unique(stage); -} - -class NullPipeline final : public AbstractPipeline -{ -}; - -std::unique_ptr Renderer::CreatePipeline(const AbstractPipelineConfig& config, - const void* cache_data, - size_t cache_data_length) -{ - return std::make_unique(); -} - -std::unique_ptr Renderer::CreateFramebuffer(AbstractTexture* color_attachment, - AbstractTexture* depth_attachment) -{ - return NullFramebuffer::Create(static_cast(color_attachment), - static_cast(depth_attachment)); -} - -std::unique_ptr -Renderer::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl) -{ - return std::make_unique(vtx_decl); -} -} // namespace Null diff --git a/Source/Core/VideoBackends/Null/Render.h b/Source/Core/VideoBackends/Null/Render.h deleted file mode 100644 index 21bd9c9c2c..0000000000 --- a/Source/Core/VideoBackends/Null/Render.h +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2015 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#pragma once - -#include "VideoCommon/RenderBase.h" - -namespace Null -{ -class Renderer final : public ::Renderer -{ -public: - Renderer(); - ~Renderer() override; - - bool IsHeadless() const override; - - std::unique_ptr CreateTexture(const TextureConfig& config) override; - std::unique_ptr - CreateStagingTexture(StagingTextureType type, const TextureConfig& config) override; - std::unique_ptr - CreateFramebuffer(AbstractTexture* color_attachment, AbstractTexture* depth_attachment) override; - - std::unique_ptr CreateShaderFromSource(ShaderStage stage, - std::string_view source) override; - std::unique_ptr CreateShaderFromBinary(ShaderStage stage, const void* data, - size_t length) override; - std::unique_ptr - CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl) override; - std::unique_ptr CreatePipeline(const AbstractPipelineConfig& config, - const void* cache_data = nullptr, - size_t cache_data_length = 0) override; - - u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override { return 0; } - void PokeEFB(EFBAccessType type, const EfbPokeData* points, size_t num_points) override {} - u16 BBoxRead(int index) override { return 0; } - void BBoxWrite(int index, u16 value) override {} - - void ClearScreen(const MathUtil::Rectangle& rc, bool colorEnable, bool alphaEnable, - bool zEnable, u32 color, u32 z) override - { - } - - void ReinterpretPixelData(EFBReinterpretType convtype) override {} -}; -} // namespace Null diff --git a/Source/Core/VideoBackends/Null/VertexManager.cpp b/Source/Core/VideoBackends/Null/VertexManager.cpp deleted file mode 100644 index 329f89a2a2..0000000000 --- a/Source/Core/VideoBackends/Null/VertexManager.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2015 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#include "VideoBackends/Null/VertexManager.h" - -namespace Null -{ -VertexManager::VertexManager() = default; - -VertexManager::~VertexManager() = default; - -void VertexManager::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_vertex) -{ -} - -} // namespace Null diff --git a/Source/Core/VideoBackends/Null/VertexManager.h b/Source/Core/VideoBackends/Null/VertexManager.h deleted file mode 100644 index 1ca0d15177..0000000000 --- a/Source/Core/VideoBackends/Null/VertexManager.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#pragma once - -#include "VideoCommon/VertexManagerBase.h" - -namespace Null -{ -class VertexManager final : public VertexManagerBase -{ -public: - VertexManager(); - ~VertexManager() override; - -protected: - void DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_vertex) override; -}; -} // namespace Null -- cgit v1.2.3