thirdpartymirrors/lsfg-vk
1
0
Fork 0
mirror of https://github.com/PancakeTAS/lsfg-vk.git synced 2025-10-30 07:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more comfortable way to initialize shader

Browse source
This commit is contained in:
PancakeTAS 2025-06-29 16:52:01 +02:00
parent 2717f02f0f
commit d3f5d87d61
No known key found for this signature in database
3 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/core/shadermodule.hpp
View file

@ -3,6 +3,7 @@
#include "device.hpp" #include "device.hpp"
#include <utility>
#include <vulkan/vulkan_core.h> #include <vulkan/vulkan_core.h>
#include <string> #include <string>
@ -30,7 +31,7 @@ namespace Vulkan::Core {
/// @throws ls::vulkan_error if object creation fails. /// @throws ls::vulkan_error if object creation fails.
/// ///
ShaderModule(const Device& device, const std::string& path, ShaderModule(const Device& device, const std::string& path,
std::vector<VkDescriptorType> descriptorTypes); const std::vector<std::pair<size_t, VkDescriptorType>>& descriptorTypes);
/// Get the Vulkan handle. /// Get the Vulkan handle.
[[nodiscard]] auto handle() const { return *this->shaderModule; } [[nodiscard]] auto handle() const { return *this->shaderModule; }

20
src/core/shadermodule.cpp
View file

@ -7,7 +7,7 @@
using namespace Vulkan::Core; using namespace Vulkan::Core;
ShaderModule::ShaderModule(const Device& device, const std::string& path, ShaderModule::ShaderModule(const Device& device, const std::string& path,
std::vector<VkDescriptorType> descriptorTypes) { const std::vector<std::pair<size_t, VkDescriptorType>>& descriptorTypes) {
if (!device) if (!device)
throw std::invalid_argument("Invalid Vulkan device"); throw std::invalid_argument("Invalid Vulkan device");
@ -46,14 +46,16 @@ ShaderModule::ShaderModule(const Device& device, const std::string& path,
); );
// create descriptor set layout // create descriptor set layout
std::vector<VkDescriptorSetLayoutBinding> layoutBindings(descriptorTypes.size()); std::vector<VkDescriptorSetLayoutBinding> layoutBindings;
for (size_t i = 0; i < descriptorTypes.size(); ++i) size_t bindIdx = 0;
layoutBindings.at(i) = { for (const auto &[count, type] : descriptorTypes)
.binding = static_cast<uint32_t>(i), for (size_t i = 0; i < count; i++, bindIdx++)
.descriptorType = descriptorTypes.at(i), layoutBindings.emplace_back(VkDescriptorSetLayoutBinding {
.descriptorCount = 1, .binding = static_cast<uint32_t>(bindIdx),
.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT .descriptorType = type,
}; .descriptorCount = 1,
.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT
});
const VkDescriptorSetLayoutCreateInfo layoutDesc{ const VkDescriptorSetLayoutCreateInfo layoutDesc{
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,

17
src/main.cpp
View file

@ -11,19 +11,10 @@ int main() {
const Vulkan::Device device(instance); const Vulkan::Device device(instance);
const Vulkan::Core::ShaderModule computeShader(device, "shaders/downsample.spv", const Vulkan::Core::ShaderModule computeShader(device, "shaders/downsample.spv",
{ { { 1, VK_DESCRIPTOR_TYPE_SAMPLER},
VK_DESCRIPTOR_TYPE_SAMPLER, { 1, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, { 7, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE},
VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, { 1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER} });
VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER
}
);
const Vulkan::Core::Pipeline computePipeline(device, computeShader); const Vulkan::Core::Pipeline computePipeline(device, computeShader);
std::cerr << "Application finished" << '\n'; std::cerr << "Application finished" << '\n';