diff --git a/include/vkcv/ShaderProgram.hpp b/include/vkcv/ShaderProgram.hpp
index 9957f4ff0fbb5fc1851d1e66c139f80c8944f7b4..a45394dcffd594faf1c448b8d4b0a0300e579520 100644
--- a/include/vkcv/ShaderProgram.hpp
+++ b/include/vkcv/ShaderProgram.hpp
@@ -48,7 +48,7 @@ namespace vkcv {
* @param[in] stage The stage of the shader
* @return Shader code binary of the given stage
*/
- const std::vector<char> &getShaderBinary(ShaderStage stage) const;
+ const std::vector<uint32_t> &getShaderBinary(ShaderStage stage) const;
/**
* @brief Returns whether a shader exists in the program for a
@@ -91,7 +91,7 @@ namespace vkcv {
*/
void reflectShader(ShaderStage shaderStage);
- std::unordered_map<ShaderStage, std::vector<char> > m_Shaders;
+ std::unordered_map<ShaderStage, std::vector<uint32_t> > m_Shaders;
// contains all vertex input attachments used in the vertex buffer
std::vector<VertexAttachment> m_VertexAttachments;
diff --git a/projects/rtx_ambient_occlusion/src/RTX/RTX.cpp b/projects/rtx_ambient_occlusion/src/RTX/RTX.cpp
index e3c87ffc79dc948d867fcb83868ff675182c3a2b..47560b4d9fddb867dd5573c64fe57c24c69095ce 100644
--- a/projects/rtx_ambient_occlusion/src/RTX/RTX.cpp
+++ b/projects/rtx_ambient_occlusion/src/RTX/RTX.cpp
@@ -147,23 +147,23 @@ namespace vkcv::rtx {
void RTXModule::createRTXPipelineAndLayout(uint32_t pushConstantSize, std::vector<DescriptorSetLayoutHandle> descriptorSetLayouts, ShaderProgram &rtxShader) {
// -- process vkcv::ShaderProgram into vk::ShaderModule
- std::vector<char> rayGenShaderCode = rtxShader.getShaderBinary(ShaderStage::RAY_GEN);
+ std::vector<uint32_t> rayGenShaderCode = rtxShader.getShaderBinary(ShaderStage::RAY_GEN);
vk::ShaderModuleCreateInfo rayGenShaderModuleInfo(
vk::ShaderModuleCreateFlags(), // vk::ShaderModuleCreateFlags flags_,
- rayGenShaderCode.size(), // size_t codeSize
- (const uint32_t*)rayGenShaderCode.data() // const uint32_t* pCode
+ rayGenShaderCode.size() * sizeof(uint32_t), // size_t codeSize
+ rayGenShaderCode.data() // const uint32_t* pCode
);
vk::ShaderModule rayGenShaderModule = m_core->getContext().getDevice().createShaderModule(rayGenShaderModuleInfo);
if (!rayGenShaderModule) {
vkcv_log(LogLevel::ERROR, "The Ray Generation Shader Module could not be created!");
}
- std::vector<char> rayMissShaderCode = rtxShader.getShaderBinary(ShaderStage::RAY_MISS);
+ std::vector<uint32_t> rayMissShaderCode = rtxShader.getShaderBinary(ShaderStage::RAY_MISS);
vk::ShaderModuleCreateInfo rayMissShaderModuleInfo(
vk::ShaderModuleCreateFlags(), // vk::ShaderModuleCreateFlags flags_,
- rayMissShaderCode.size(), //size_t codeSize
- (const uint32_t*)rayMissShaderCode.data() // const uint32_t* pCode
+ rayMissShaderCode.size() * sizeof(uint32_t), //size_t codeSize
+ rayMissShaderCode.data() // const uint32_t* pCode
);
vk::ShaderModule rayMissShaderModule = m_core->getContext().getDevice().createShaderModule(rayMissShaderModuleInfo);
@@ -171,11 +171,11 @@ namespace vkcv::rtx {
vkcv_log(LogLevel::ERROR, "The Ray Miss Shader Module could not be created!");
}
- std::vector<char> rayClosestHitShaderCode = rtxShader.getShaderBinary(ShaderStage::RAY_CLOSEST_HIT);
+ std::vector<uint32_t> rayClosestHitShaderCode = rtxShader.getShaderBinary(ShaderStage::RAY_CLOSEST_HIT);
vk::ShaderModuleCreateInfo rayClosestHitShaderModuleInfo(
vk::ShaderModuleCreateFlags(), // vk::ShaderModuleCreateFlags flags_,
- rayClosestHitShaderCode.size(), //size_t codeSize
- (const uint32_t*)rayClosestHitShaderCode.data() // const uint32_t* pCode_
+ rayClosestHitShaderCode.size() * sizeof(uint32_t), //size_t codeSize
+ rayClosestHitShaderCode.data() // const uint32_t* pCode_
);
vk::ShaderModule rayClosestHitShaderModule = m_core->getContext().getDevice().createShaderModule(rayClosestHitShaderModuleInfo);
if (!rayClosestHitShaderModule) {
diff --git a/src/vkcv/ComputePipelineManager.cpp b/src/vkcv/ComputePipelineManager.cpp
index 2cf8f5efcd10ec3485b2bc746b9de7fbedee6404..264389ca9b5ed118666911b07158ab589a4ca0ee 100644
--- a/src/vkcv/ComputePipelineManager.cpp
+++ b/src/vkcv/ComputePipelineManager.cpp
@@ -112,8 +112,8 @@ namespace vkcv
vk::Result ComputePipelineManager::createShaderModule(vk::ShaderModule &module, const ShaderProgram &shaderProgram, const ShaderStage stage)
{
- std::vector<char> code = shaderProgram.getShaderBinary(stage);
- vk::ShaderModuleCreateInfo moduleInfo({}, code.size(), reinterpret_cast<uint32_t*>(code.data()));
+ std::vector<uint32_t> code = shaderProgram.getShaderBinary(stage);
+ vk::ShaderModuleCreateInfo moduleInfo({}, code.size() * sizeof(uint32_t), code.data());
return m_Device.createShaderModule(&moduleInfo, nullptr, &module);
}
}
\ No newline at end of file
diff --git a/src/vkcv/GraphicsPipelineManager.cpp b/src/vkcv/GraphicsPipelineManager.cpp
index 803008d4c65239433b9e9ae9f57a7d537db0c621..93face1ee3cfa11483d1b1952c0650d967117381 100644
--- a/src/vkcv/GraphicsPipelineManager.cpp
+++ b/src/vkcv/GraphicsPipelineManager.cpp
@@ -110,8 +110,8 @@ namespace vkcv
vk::PipelineShaderStageCreateInfo* outCreateInfo) {
assert(outCreateInfo);
- std::vector<char> code = shaderProgram.getShaderBinary(stage);
- vk::ShaderModuleCreateInfo vertexModuleInfo({}, code.size(), reinterpret_cast<uint32_t*>(code.data()));
+ std::vector<uint32_t> code = shaderProgram.getShaderBinary(stage);
+ vk::ShaderModuleCreateInfo vertexModuleInfo({}, code.size() * sizeof(uint32_t), code.data());
vk::ShaderModule shaderModule;
if (device.createShaderModule(&vertexModuleInfo, nullptr, &shaderModule) != vk::Result::eSuccess)
return false;
diff --git a/src/vkcv/ShaderProgram.cpp b/src/vkcv/ShaderProgram.cpp
index 416947110a6b372ef9495cce02db49db230285c3..4b2afbd43cd965a14b6e2748122f9866077e8f6f 100644
--- a/src/vkcv/ShaderProgram.cpp
+++ b/src/vkcv/ShaderProgram.cpp
@@ -14,19 +14,25 @@ namespace vkcv {
* @param[in] relative path to the shader code
* @return vector of chars as a buffer for the code
*/
- std::vector<char> readShaderCode(const std::filesystem::path &shaderPath) {
+ std::vector<uint32_t> readShaderCode(const std::filesystem::path &shaderPath) {
std::ifstream file (shaderPath.string(), std::ios::ate | std::ios::binary);
if (!file.is_open()) {
- vkcv_log(LogLevel::ERROR, "The file could not be opened");
- return std::vector<char>{};
+ vkcv_log(LogLevel::ERROR, "The file could not be opened: %s", shaderPath.c_str());
+ return std::vector<uint32_t>();
}
size_t fileSize = (size_t)file.tellg();
- std::vector<char> buffer(fileSize);
+
+ if (fileSize % sizeof(uint32_t) != 0) {
+ vkcv_log(LogLevel::ERROR, "The file is not a valid shader: %s", shaderPath.c_str());
+ return std::vector<uint32_t>();
+ }
+
+ std::vector<uint32_t> buffer(fileSize / sizeof(uint32_t));
file.seekg(0);
- file.read(buffer.data(), fileSize);
+ file.read(reinterpret_cast<char*>(buffer.data()), fileSize);
file.close();
return buffer;
@@ -82,7 +88,7 @@ namespace vkcv {
vkcv_log(LogLevel::WARNING, "Overwriting existing shader stage");
}
- const std::vector<char> shaderCode = readShaderCode(path);
+ const std::vector<uint32_t> shaderCode = readShaderCode(path);
if (shaderCode.empty()) {
return false;
@@ -93,7 +99,7 @@ namespace vkcv {
}
}
- const std::vector<char> &ShaderProgram::getShaderBinary(ShaderStage stage) const
+ const std::vector<uint32_t> &ShaderProgram::getShaderBinary(ShaderStage stage) const
{
return m_Shaders.at(stage);
}
@@ -108,13 +114,9 @@ namespace vkcv {
void ShaderProgram::reflectShader(ShaderStage shaderStage)
{
- auto shaderCodeChar = m_Shaders.at(shaderStage);
- std::vector<uint32_t> shaderCode;
-
- for (uint32_t i = 0; i < shaderCodeChar.size()/4; i++)
- shaderCode.push_back(((uint32_t*) shaderCodeChar.data())[i]);
+ auto shaderCode = m_Shaders.at(shaderStage);
- spirv_cross::Compiler comp(move(shaderCode));
+ spirv_cross::Compiler comp(shaderCode);
spirv_cross::ShaderResources resources = comp.get_shader_resources();
//reflect vertex input