diff options
| author | Stenzek <stenzek@gmail.com> | 2017-09-30 16:25:36 +1000 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2017-11-22 18:47:04 +1000 |
| commit | 49a9c33bd75df2b8cebd58eab10f140c79a8f65c (patch) | |
| tree | c770303bf41043303322e7bb230615d96ad2ea6c /Source/Core/VideoBackends/Null | |
| parent | 5860c97144a01c4203e98671e158086c672bcf97 (diff) | |
VideoCommon: Move abstract texture creation function to Renderer
Diffstat (limited to 'Source/Core/VideoBackends/Null')
| -rw-r--r-- | Source/Core/VideoBackends/Null/Render.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Null/Render.h | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Null/TextureCache.h | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/Null/Render.cpp b/Source/Core/VideoBackends/Null/Render.cpp index b1a88f7a80..6b045a0c6a 100644 --- a/Source/Core/VideoBackends/Null/Render.cpp +++ b/Source/Core/VideoBackends/Null/Render.cpp @@ -4,6 +4,7 @@ #include "Common/Logging/Log.h" +#include "VideoBackends/Null/NullTexture.h" #include "VideoBackends/Null/Render.h" #include "VideoCommon/VideoConfig.h" @@ -21,6 +22,11 @@ Renderer::~Renderer() UpdateActiveConfig(); } +std::unique_ptr<AbstractTexture> Renderer::CreateTexture(const TextureConfig& config) +{ + return std::make_unique<NullTexture>(config); +} + void Renderer::RenderText(const std::string& text, int left, int top, u32 color) { NOTICE_LOG(VIDEO, "RenderText: %s", text.c_str()); diff --git a/Source/Core/VideoBackends/Null/Render.h b/Source/Core/VideoBackends/Null/Render.h index 2a21918f81..9ba2ef575b 100644 --- a/Source/Core/VideoBackends/Null/Render.h +++ b/Source/Core/VideoBackends/Null/Render.h @@ -14,6 +14,8 @@ public: Renderer(); ~Renderer() override; + std::unique_ptr<AbstractTexture> CreateTexture(const TextureConfig& config) override; + void RenderText(const std::string& pstr, int left, int top, u32 color) 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 {} diff --git a/Source/Core/VideoBackends/Null/TextureCache.h b/Source/Core/VideoBackends/Null/TextureCache.h index 2b3283c056..6f09108392 100644 --- a/Source/Core/VideoBackends/Null/TextureCache.h +++ b/Source/Core/VideoBackends/Null/TextureCache.h @@ -35,12 +35,6 @@ public: bool scale_by_half, unsigned int cbuf_id, const float* colmat) override { } - -private: - std::unique_ptr<AbstractTexture> CreateTexture(const TextureConfig& config) override - { - return std::make_unique<NullTexture>(config); - } }; } // Null name space |
