diff --git a/include/Nazara/OpenGLRenderer/OpenGLDevice.hpp b/include/Nazara/OpenGLRenderer/OpenGLDevice.hpp index a75140840..8398c8e61 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLDevice.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLDevice.hpp @@ -36,7 +36,7 @@ namespace Nz std::shared_ptr InstantiateCommandPool(QueueType queueType) override; std::shared_ptr InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) override; std::shared_ptr InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) override; - std::shared_ptr InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) override; + std::shared_ptr InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) override; std::shared_ptr InstantiateTexture(const TextureInfo& params) override; std::shared_ptr InstantiateTextureSampler(const TextureSamplerInfo& params) override; diff --git a/include/Nazara/OpenGLRenderer/OpenGLShaderStage.hpp b/include/Nazara/OpenGLRenderer/OpenGLShaderStage.hpp index 8768befb7..0463f5b49 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLShaderStage.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLShaderStage.hpp @@ -9,14 +9,14 @@ #include #include -#include +#include #include #include #include namespace Nz { - class NAZARA_OPENGLRENDERER_API OpenGLShaderStage : public ShaderStageImpl + class NAZARA_OPENGLRENDERER_API OpenGLShaderStage : public ShaderStage { public: OpenGLShaderStage(OpenGLDevice& device, ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize); diff --git a/include/Nazara/Renderer.hpp b/include/Nazara/Renderer.hpp index 3b792a6b1..3d3a8e027 100644 --- a/include/Nazara/Renderer.hpp +++ b/include/Nazara/Renderer.hpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/Nazara/Renderer/RenderDevice.hpp b/include/Nazara/Renderer/RenderDevice.hpp index 000aca2e2..fb26dc58f 100644 --- a/include/Nazara/Renderer/RenderDevice.hpp +++ b/include/Nazara/Renderer/RenderDevice.hpp @@ -21,7 +21,7 @@ namespace Nz { class CommandPool; - class ShaderStageImpl; + class ShaderStage; class NAZARA_RENDERER_API RenderDevice { @@ -33,8 +33,8 @@ namespace Nz virtual std::shared_ptr InstantiateCommandPool(QueueType queueType) = 0; virtual std::shared_ptr InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) = 0; virtual std::shared_ptr InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) = 0; - virtual std::shared_ptr InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) = 0; - std::shared_ptr InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const std::filesystem::path& sourcePath); + virtual std::shared_ptr InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) = 0; + std::shared_ptr InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const std::filesystem::path& sourcePath); virtual std::shared_ptr InstantiateTexture(const TextureInfo& params) = 0; virtual std::shared_ptr InstantiateTextureSampler(const TextureSamplerInfo& params) = 0; }; diff --git a/include/Nazara/Renderer/RenderStates.hpp b/include/Nazara/Renderer/RenderStates.hpp index dca3d4c7c..d04a2fe1e 100644 --- a/include/Nazara/Renderer/RenderStates.hpp +++ b/include/Nazara/Renderer/RenderStates.hpp @@ -15,7 +15,7 @@ namespace Nz { - class ShaderStageImpl; + class ShaderStage; struct RenderStates { diff --git a/include/Nazara/Renderer/ShaderStageImpl.hpp b/include/Nazara/Renderer/ShaderStage.hpp similarity index 58% rename from include/Nazara/Renderer/ShaderStageImpl.hpp rename to include/Nazara/Renderer/ShaderStage.hpp index 4bee731e2..c24c287ad 100644 --- a/include/Nazara/Renderer/ShaderStageImpl.hpp +++ b/include/Nazara/Renderer/ShaderStage.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERER_SHADERSTAGEIMPL_HPP -#define NAZARA_RENDERER_SHADERSTAGEIMPL_HPP +#ifndef NAZARA_RENDERER_SHADERSTAGE_HPP +#define NAZARA_RENDERER_SHADERSTAGE_HPP #include #include @@ -13,12 +13,12 @@ namespace Nz { - class NAZARA_RENDERER_API ShaderStageImpl + class NAZARA_RENDERER_API ShaderStage { public: - ShaderStageImpl() = default; - virtual ~ShaderStageImpl(); + ShaderStage() = default; + virtual ~ShaderStage(); }; } -#endif // NAZARA_RENDERER_SHADERSTAGEIMPL_HPP +#endif // NAZARA_RENDERER_SHADERSTAGE_HPP diff --git a/include/Nazara/VulkanRenderer/VulkanDevice.hpp b/include/Nazara/VulkanRenderer/VulkanDevice.hpp index b7d8e095c..873c7dc9c 100644 --- a/include/Nazara/VulkanRenderer/VulkanDevice.hpp +++ b/include/Nazara/VulkanRenderer/VulkanDevice.hpp @@ -27,7 +27,7 @@ namespace Nz std::shared_ptr InstantiateCommandPool(QueueType queueType) override; std::shared_ptr InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) override; std::shared_ptr InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) override; - std::shared_ptr InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) override; + std::shared_ptr InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) override; std::shared_ptr InstantiateTexture(const TextureInfo& params) override; std::shared_ptr InstantiateTextureSampler(const TextureSamplerInfo& params) override; diff --git a/include/Nazara/VulkanRenderer/VulkanShaderStage.hpp b/include/Nazara/VulkanRenderer/VulkanShaderStage.hpp index 50644f102..059183853 100644 --- a/include/Nazara/VulkanRenderer/VulkanShaderStage.hpp +++ b/include/Nazara/VulkanRenderer/VulkanShaderStage.hpp @@ -9,13 +9,13 @@ #include #include -#include +#include #include #include namespace Nz { - class NAZARA_VULKANRENDERER_API VulkanShaderStage : public ShaderStageImpl + class NAZARA_VULKANRENDERER_API VulkanShaderStage : public ShaderStage { public: VulkanShaderStage() = default; diff --git a/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp b/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp index e7c0c070f..3085a7955 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp @@ -68,7 +68,7 @@ namespace Nz return std::make_shared(std::move(pipelineLayoutInfo)); } - std::shared_ptr OpenGLDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) + std::shared_ptr OpenGLDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) { return std::make_shared(*this, type, lang, source, sourceSize); } diff --git a/src/Nazara/Renderer/RenderDevice.cpp b/src/Nazara/Renderer/RenderDevice.cpp index a4d377db6..0a56e5f46 100644 --- a/src/Nazara/Renderer/RenderDevice.cpp +++ b/src/Nazara/Renderer/RenderDevice.cpp @@ -11,7 +11,7 @@ namespace Nz { RenderDevice::~RenderDevice() = default; - std::shared_ptr RenderDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const std::filesystem::path& sourcePath) + std::shared_ptr RenderDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const std::filesystem::path& sourcePath) { File file(sourcePath); if (!file.Open(OpenMode_ReadOnly | OpenMode_Text)) diff --git a/src/Nazara/Renderer/ShaderStageImpl.cpp b/src/Nazara/Renderer/ShaderStage.cpp similarity index 71% rename from src/Nazara/Renderer/ShaderStageImpl.cpp rename to src/Nazara/Renderer/ShaderStage.cpp index dd3e48a63..1b2b87813 100644 --- a/src/Nazara/Renderer/ShaderStageImpl.cpp +++ b/src/Nazara/Renderer/ShaderStage.cpp @@ -2,10 +2,10 @@ // This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include namespace Nz { - ShaderStageImpl::~ShaderStageImpl() = default; + ShaderStage::~ShaderStage() = default; } diff --git a/src/Nazara/VulkanRenderer/VulkanDevice.cpp b/src/Nazara/VulkanRenderer/VulkanDevice.cpp index adc23c0b8..2d67003e7 100644 --- a/src/Nazara/VulkanRenderer/VulkanDevice.cpp +++ b/src/Nazara/VulkanRenderer/VulkanDevice.cpp @@ -39,7 +39,7 @@ namespace Nz return pipelineLayout; } - std::shared_ptr VulkanDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) + std::shared_ptr VulkanDevice::InstantiateShaderStage(ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize) { auto stage = std::make_shared(); if (!stage->Create(*this, type, lang, source, sourceSize))