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

Renderer: Rename ShaderStageImpl to ShaderStage

This commit is contained in:
Jérôme Leclercq 2020-10-30 23:06:15 +01:00
parent 0d779077c1
commit 009e5a0466
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/OpenGLRenderer/OpenGLDevice.hpp
View File

@ -36,7 +36,7 @@ namespace Nz
std::shared_ptr<CommandPool> InstantiateCommandPool(QueueType queueType) override; std::shared_ptr<CommandPool> InstantiateCommandPool(QueueType queueType) override;
std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) override; std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) override;
std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) override; std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) override;
std::shared_ptr<ShaderStageImpl> InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) override; std::shared_ptr<ShaderStage> InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) override;
std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) override; std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) override;
std::shared_ptr<TextureSampler> InstantiateTextureSampler(const TextureSamplerInfo& params) override; std::shared_ptr<TextureSampler> InstantiateTextureSampler(const TextureSamplerInfo& params) override;

4
include/Nazara/OpenGLRenderer/OpenGLShaderStage.hpp
View File

@ -9,14 +9,14 @@
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Enums.hpp> #include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Renderer/ShaderStageImpl.hpp> #include <Nazara/Renderer/ShaderStage.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Context.hpp> #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Shader.hpp> #include <Nazara/OpenGLRenderer/Wrapper/Shader.hpp>
#include <vector> #include <vector>
namespace Nz namespace Nz
{ {
class NAZARA_OPENGLRENDERER_API OpenGLShaderStage : public ShaderStageImpl class NAZARA_OPENGLRENDERER_API OpenGLShaderStage : public ShaderStage
{ {
public: public:
OpenGLShaderStage(OpenGLDevice& device, ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize); OpenGLShaderStage(OpenGLDevice& device, ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize);

2
include/Nazara/Renderer.hpp
View File

@ -53,7 +53,7 @@
#include <Nazara/Renderer/RenderWindowImpl.hpp> #include <Nazara/Renderer/RenderWindowImpl.hpp>
#include <Nazara/Renderer/RenderWindowParameters.hpp> #include <Nazara/Renderer/RenderWindowParameters.hpp>
#include <Nazara/Renderer/ShaderBinding.hpp> #include <Nazara/Renderer/ShaderBinding.hpp>
#include <Nazara/Renderer/ShaderStageImpl.hpp> #include <Nazara/Renderer/ShaderStage.hpp>
#include <Nazara/Renderer/Texture.hpp> #include <Nazara/Renderer/Texture.hpp>
#include <Nazara/Renderer/TextureSampler.hpp> #include <Nazara/Renderer/TextureSampler.hpp>
#include <Nazara/Renderer/UploadPool.hpp> #include <Nazara/Renderer/UploadPool.hpp>

6
include/Nazara/Renderer/RenderDevice.hpp
View File

@ -21,7 +21,7 @@
namespace Nz namespace Nz
{ {
class CommandPool; class CommandPool;
class ShaderStageImpl; class ShaderStage;
class NAZARA_RENDERER_API RenderDevice class NAZARA_RENDERER_API RenderDevice
{ {
@ -33,8 +33,8 @@ namespace Nz
virtual std::shared_ptr<CommandPool> InstantiateCommandPool(QueueType queueType) = 0; virtual std::shared_ptr<CommandPool> InstantiateCommandPool(QueueType queueType) = 0;
virtual std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) = 0; virtual std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) = 0;
virtual std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) = 0; virtual std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) = 0;
virtual std::shared_ptr<ShaderStageImpl> InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) = 0; virtual std::shared_ptr<ShaderStage> InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) = 0;
std::shared_ptr<ShaderStageImpl> InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const std::filesystem::path& sourcePath); std::shared_ptr<ShaderStage> InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const std::filesystem::path& sourcePath);
virtual std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) = 0; virtual std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) = 0;
virtual std::shared_ptr<TextureSampler> InstantiateTextureSampler(const TextureSamplerInfo& params) = 0; virtual std::shared_ptr<TextureSampler> InstantiateTextureSampler(const TextureSamplerInfo& params) = 0;
}; };

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

@ -15,7 +15,7 @@
namespace Nz namespace Nz
{ {
class ShaderStageImpl; class ShaderStage;
struct RenderStates struct RenderStates
{ {

12
include/Nazara/Renderer/ShaderStageImpl.hpp → include/Nazara/Renderer/ShaderStage.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#ifndef NAZARA_RENDERER_SHADERSTAGEIMPL_HPP #ifndef NAZARA_RENDERER_SHADERSTAGE_HPP
#define NAZARA_RENDERER_SHADERSTAGEIMPL_HPP #define NAZARA_RENDERER_SHADERSTAGE_HPP
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Config.hpp> #include <Nazara/Renderer/Config.hpp>
@ -13,12 +13,12 @@
namespace Nz namespace Nz
{ {
class NAZARA_RENDERER_API ShaderStageImpl class NAZARA_RENDERER_API ShaderStage
{ {
public: public:
ShaderStageImpl() = default; ShaderStage() = default;
virtual ~ShaderStageImpl(); virtual ~ShaderStage();
}; };
} }
#endif // NAZARA_RENDERER_SHADERSTAGEIMPL_HPP #endif // NAZARA_RENDERER_SHADERSTAGE_HPP

2
include/Nazara/VulkanRenderer/VulkanDevice.hpp
View File

@ -27,7 +27,7 @@ namespace Nz
std::shared_ptr<CommandPool> InstantiateCommandPool(QueueType queueType) override; std::shared_ptr<CommandPool> InstantiateCommandPool(QueueType queueType) override;
std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) override; std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) override;
std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) override; std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) override;
std::shared_ptr<ShaderStageImpl> InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) override; std::shared_ptr<ShaderStage> InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) override;
std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) override; std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) override;
std::shared_ptr<TextureSampler> InstantiateTextureSampler(const TextureSamplerInfo& params) override; std::shared_ptr<TextureSampler> InstantiateTextureSampler(const TextureSamplerInfo& params) override;

4
include/Nazara/VulkanRenderer/VulkanShaderStage.hpp
View File

@ -9,13 +9,13 @@
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Enums.hpp> #include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Renderer/ShaderStageImpl.hpp> #include <Nazara/Renderer/ShaderStage.hpp>
#include <Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp> #include <Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp>
#include <vector> #include <vector>
namespace Nz namespace Nz
{ {
class NAZARA_VULKANRENDERER_API VulkanShaderStage : public ShaderStageImpl class NAZARA_VULKANRENDERER_API VulkanShaderStage : public ShaderStage
{ {
public: public:
VulkanShaderStage() = default; VulkanShaderStage() = default;

2
src/Nazara/OpenGLRenderer/OpenGLDevice.cpp
View File

@ -68,7 +68,7 @@ namespace Nz
return std::make_shared<OpenGLRenderPipelineLayout>(std::move(pipelineLayoutInfo)); return std::make_shared<OpenGLRenderPipelineLayout>(std::move(pipelineLayoutInfo));
} }
std::shared_ptr<ShaderStageImpl> OpenGLDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) std::shared_ptr<ShaderStage> OpenGLDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize)
{ {
return std::make_shared<OpenGLShaderStage>(*this, type, lang, source, sourceSize); return std::make_shared<OpenGLShaderStage>(*this, type, lang, source, sourceSize);
} }

2
src/Nazara/Renderer/RenderDevice.cpp
View File

@ -11,7 +11,7 @@ namespace Nz
{ {
RenderDevice::~RenderDevice() = default; RenderDevice::~RenderDevice() = default;
std::shared_ptr<ShaderStageImpl> RenderDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const std::filesystem::path& sourcePath) std::shared_ptr<ShaderStage> RenderDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const std::filesystem::path& sourcePath)
{ {
File file(sourcePath); File file(sourcePath);
if (!file.Open(OpenMode_ReadOnly | OpenMode_Text)) if (!file.Open(OpenMode_ReadOnly | OpenMode_Text))

4
src/Nazara/Renderer/ShaderStageImpl.cpp → src/Nazara/Renderer/ShaderStage.cpp
View File

@ -2,10 +2,10 @@
// This file is part of the "Nazara Engine - Renderer module" // This file is part of the "Nazara Engine - Renderer module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Renderer/ShaderStageImpl.hpp> #include <Nazara/Renderer/ShaderStage.hpp>
#include <Nazara/Renderer/Debug.hpp> #include <Nazara/Renderer/Debug.hpp>
namespace Nz namespace Nz
{ {
ShaderStageImpl::~ShaderStageImpl() = default; ShaderStage::~ShaderStage() = default;
} }

2
src/Nazara/VulkanRenderer/VulkanDevice.cpp
View File

@ -39,7 +39,7 @@ namespace Nz
return pipelineLayout; return pipelineLayout;
} }
std::shared_ptr<ShaderStageImpl> VulkanDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) std::shared_ptr<ShaderStage> VulkanDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize)
{ {
auto stage = std::make_shared<VulkanShaderStage>(); auto stage = std::make_shared<VulkanShaderStage>();
if (!stage->Create(*this, type, lang, source, sourceSize)) if (!stage->Create(*this, type, lang, source, sourceSize))