GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[WIP] Shader handling rework

Browse Source
This commit is contained in:
GeorgH93
2023-08-29 23:08:11 +02:00
parent 5735b93870
commit 5aec41ead4
13 changed files with 181 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openVulkanoCpp/Vulkan/Pipeline.hpp
View File

@@ -34,7 +34,7 @@ namespace openVulkanoCpp::Vulkan
private:
void CreatePipelineLayout()
{
vk::PushConstantRange camPushConstantDesc = { vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eFragment, 0, 3 * sizeof(Math::Matrix4f) + sizeof(Math::Vector4f) + 4 * sizeof(float) };
vk::PushConstantRange camPushConstantDesc = { vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eFragment, 0, 3 * sizeof(Math::Matrix4f) + sizeof(Math::Vector4f) + 8 * sizeof(float) };
std::array<vk::PushConstantRange, 1> camPushConstantDescs = { camPushConstantDesc };
vk::DescriptorSetLayoutBinding nodeLayoutBinding = { 0, vk::DescriptorType::eUniformBufferDynamic, 1, vk::ShaderStageFlagBits::eVertex };
//vk::DescriptorSetLayoutBinding textureLayoutBinding = { 0, vk::DescriptorType::image };

2
openVulkanoCpp/Vulkan/Renderer.cpp
View File

@@ -6,7 +6,7 @@
#include "Renderer.hpp"
#include "VulkanDrawContext.hpp"
#include "Scene/Shader.hpp"
#include "Scene/Shader/Shader.hpp"
#include "Scene/Geometry.hpp"
#include "Scene/VulkanGeometry.hpp"
#include "Scene/VulkanNode.hpp"

2
openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp
View File

@@ -6,7 +6,7 @@
#include "VulkanShader.hpp"
#include "Vulkan/Context.hpp"
#include "Scene/Shader.hpp"
#include "Scene/Shader/Shader.hpp"
#include "Vulkan/Resources/IShaderOwner.hpp"
namespace openVulkanoCpp::Vulkan

2
openVulkanoCpp/Vulkan/VulkanDrawContext.cpp
View File

@@ -5,7 +5,7 @@
*/
#include "VulkanDrawContext.hpp"
#include "Scene/Shader.hpp"
#include "Scene/Shader/Shader.hpp"
#include "Scene/VulkanShader.hpp"
namespace openVulkanoCpp::Vulkan