sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renderer: Improve code

This commit is contained in:
Jérôme Leclercq 2021-05-25 15:37:27 +02:00
parent 001c9a6a61
commit 59cfc74ab4
3 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Renderer/Enums.hpp
View File

@ -114,6 +114,8 @@ namespace Nz
Max = Unknown Max = Unknown
}; };
constexpr std::size_t RenderAPICount = static_cast<std::size_t>(RenderAPI::Max) + 1;
enum class RenderDeviceType enum class RenderDeviceType
{ {
Integrated, ///< Hardware-accelerated chipset integrated to a CPU (ex: Intel Graphics HD 4000) Integrated, ///< Hardware-accelerated chipset integrated to a CPU (ex: Intel Graphics HD 4000)

4
include/Nazara/Renderer/Renderer.hpp
View File

@ -44,10 +44,12 @@ namespace Nz
struct Config struct Config
{ {
Nz::RenderAPI preferredAPI = Nz::RenderAPI::Unknown; Nz::RenderAPI preferredAPI = RenderAPI::Unknown;
}; };
private: private:
void LoadBackend(const Config& config);
std::unique_ptr<RendererImpl> m_rendererImpl; std::unique_ptr<RendererImpl> m_rendererImpl;
DynLib m_rendererLib; DynLib m_rendererLib;

87
src/Nazara/Renderer/Renderer.cpp
View File

@ -11,6 +11,7 @@
#include <Nazara/Renderer/RenderBuffer.hpp> #include <Nazara/Renderer/RenderBuffer.hpp>
#include <Nazara/Utility/AbstractBuffer.hpp> #include <Nazara/Utility/AbstractBuffer.hpp>
#include <Nazara/Utility/Buffer.hpp> #include <Nazara/Utility/Buffer.hpp>
#include <Nazara/Utility/Image.hpp>
#include <Nazara/Utility/Utility.hpp> #include <Nazara/Utility/Utility.hpp>
#include <filesystem> #include <filesystem>
#include <stdexcept> #include <stdexcept>
@ -30,9 +31,50 @@
namespace Nz namespace Nz
{ {
namespace Renderer::Renderer(Config config) :
ModuleBase("Renderer", this)
{ {
std::array<const char*, UnderlyingCast(RenderAPI::Max) + 1> s_rendererPaths = { LoadBackend(config);
Buffer::SetBufferFactory(DataStorage::Hardware, [](Buffer* parent, BufferType type) -> std::unique_ptr<AbstractBuffer> { return std::make_unique<RenderBuffer>(parent, type); });
}
Renderer::~Renderer()
{
// Uninitialize module here
Buffer::SetBufferFactory(DataStorage::Hardware, nullptr);
m_rendererImpl.reset();
}
std::shared_ptr<RenderDevice> Renderer::InstanciateRenderDevice(std::size_t deviceIndex)
{
return m_rendererImpl->InstanciateRenderDevice(deviceIndex);
}
RenderAPI Renderer::QueryAPI() const
{
return m_rendererImpl->QueryAPI();
}
std::string Renderer::QueryAPIString() const
{
return m_rendererImpl->QueryAPIString();
}
UInt32 Renderer::QueryAPIVersion() const
{
return m_rendererImpl->QueryAPIVersion();
}
const std::vector<RenderDeviceInfo>& Renderer::QueryRenderDevices() const
{
return m_rendererImpl->QueryRenderDevices();
}
void Renderer::LoadBackend(const Config& config)
{
constexpr std::array<const char*, RenderAPICount> rendererPaths = {
NazaraRendererPrefix "NazaraDirect3DRenderer" NazaraRendererDebugSuffix, // Direct3D NazaraRendererPrefix "NazaraDirect3DRenderer" NazaraRendererDebugSuffix, // Direct3D
NazaraRendererPrefix "NazaraMantleRenderer" NazaraRendererDebugSuffix, // Mantle NazaraRendererPrefix "NazaraMantleRenderer" NazaraRendererDebugSuffix, // Mantle
NazaraRendererPrefix "NazaraMetalRenderer" NazaraRendererDebugSuffix, // Metal NazaraRendererPrefix "NazaraMetalRenderer" NazaraRendererDebugSuffix, // Metal
@ -41,11 +83,7 @@ namespace Nz
nullptr // Unknown nullptr // Unknown
}; };
}
Renderer::Renderer(Config config) :
ModuleBase("Renderer", this)
{
struct RendererImplementations struct RendererImplementations
{ {
std::filesystem::path fileName; std::filesystem::path fileName;
@ -55,7 +93,7 @@ namespace Nz
auto RegisterImpl = [&](RenderAPI api, auto ComputeScore) auto RegisterImpl = [&](RenderAPI api, auto ComputeScore)
{ {
const char* rendererName = s_rendererPaths[UnderlyingCast(api)]; const char* rendererName = rendererPaths[UnderlyingCast(api)];
assert(rendererName); assert(rendererName);
std::filesystem::path fileName(rendererName); std::filesystem::path fileName(rendererName);
@ -122,41 +160,6 @@ namespace Nz
m_rendererLib = std::move(chosenLib); m_rendererLib = std::move(chosenLib);
NazaraDebug("Using " + m_rendererImpl->QueryAPIString() + " as renderer"); NazaraDebug("Using " + m_rendererImpl->QueryAPIString() + " as renderer");
Buffer::SetBufferFactory(DataStorage::Hardware, [](Buffer* parent, BufferType type) -> std::unique_ptr<AbstractBuffer> { return std::make_unique<RenderBuffer>(parent, type); });
}
Renderer::~Renderer()
{
// Uninitialize module here
Buffer::SetBufferFactory(DataStorage::Hardware, nullptr);
m_rendererImpl.reset();
}
std::shared_ptr<RenderDevice> Renderer::InstanciateRenderDevice(std::size_t deviceIndex)
{
return m_rendererImpl->InstanciateRenderDevice(deviceIndex);
}
RenderAPI Renderer::QueryAPI() const
{
return m_rendererImpl->QueryAPI();
}
std::string Renderer::QueryAPIString() const
{
return m_rendererImpl->QueryAPIString();
}
UInt32 Renderer::QueryAPIVersion() const
{
return m_rendererImpl->QueryAPIVersion();
}
const std::vector<RenderDeviceInfo>& Renderer::QueryRenderDevices() const
{
return m_rendererImpl->QueryRenderDevices();
} }
Renderer* Renderer::s_instance = nullptr; Renderer* Renderer::s_instance = nullptr;