Skip to content
Snippets Groups Projects
Verified Commit d4e5049d authored by Tobias Frisch's avatar Tobias Frisch
Browse files

[#36] Fixed cross-include by outsourcing the enum class

parent 5a812555
No related branches found
No related tags found
1 merge request!49Resolve "Shader Program Reflection"
Pipeline #25566 failed
...@@ -32,7 +32,9 @@ set(vkcv_sources ...@@ -32,7 +32,9 @@ set(vkcv_sources
${vkcv_include}/vkcv/SwapChain.hpp ${vkcv_include}/vkcv/SwapChain.hpp
${vkcv_source}/vkcv/SwapChain.cpp ${vkcv_source}/vkcv/SwapChain.cpp
${vkcv_include}/vkcv/ShaderStage.hpp
${vkcv_include}/vkcv/ShaderProgram.hpp ${vkcv_include}/vkcv/ShaderProgram.hpp
${vkcv_source}/vkcv/ShaderProgram.cpp ${vkcv_source}/vkcv/ShaderProgram.cpp
......
#pragma once #pragma once
#include <vkcv/ShaderProgram.hpp>
#include <vkcv/Handles.hpp>
#include <vulkan/vulkan.hpp> #include <vulkan/vulkan.hpp>
#include "vkcv/Handles.hpp"
#include "vkcv/ShaderStage.hpp"
namespace vkcv namespace vkcv
{ {
struct DescriptorSet struct DescriptorSet
......
...@@ -13,20 +13,11 @@ ...@@ -13,20 +13,11 @@
#include <vulkan/vulkan.hpp> #include <vulkan/vulkan.hpp>
#include <spirv_cross.hpp> #include <spirv_cross.hpp>
#include "vkcv/VertexLayout.hpp" #include "vkcv/VertexLayout.hpp"
#include "vkcv/ShaderStage.hpp"
#include "vkcv/DescriptorConfig.hpp" #include "vkcv/DescriptorConfig.hpp"
namespace vkcv { namespace vkcv {
enum class ShaderStage
{
VERTEX,
TESS_CONTROL,
TESS_EVAL,
GEOMETRY,
FRAGMENT,
COMPUTE
};
struct Shader struct Shader
{ {
std::vector<char> shaderCode; std::vector<char> shaderCode;
......
#pragma once
namespace vkcv {
enum class ShaderStage
{
VERTEX,
TESS_CONTROL,
TESS_EVAL,
GEOMETRY,
FRAGMENT,
COMPUTE
};
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment