fixed descriptors
This commit is contained in:
parent
83bb8ebd61
commit
5e3a7738ed
14 changed files with 334 additions and 167 deletions
|
|
@ -11,8 +11,6 @@ typedef VulkanShader<"closesthit.spv", "main", VK_SHADER_STAGE_CLOSEST_HIT_BIT_K
|
|||
typedef VulkanShader<"miss.spv", "main", VK_SHADER_STAGE_MISS_BIT_KHR, 0, {{}}> Misspv;
|
||||
|
||||
int main() {
|
||||
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(500));
|
||||
/*
|
||||
This sets up all necessary things and creates the vulkan device.
|
||||
This must be called before any vulkan related things.
|
||||
|
|
@ -22,11 +20,11 @@ int main() {
|
|||
Raygenspv::CreateShader();
|
||||
Closesthitspv::CreateShader();
|
||||
Misspv::CreateShader();
|
||||
DescriptorLayoutVulkan<Raygenspv, Closesthitspv, Misspv>::Init();
|
||||
PipelineRTVulkan<Raygenspv, Closesthitspv, Misspv, Raygenspv, Closesthitspv, Misspv>::Init();
|
||||
DescriptorPool<1, Raygenspv, Closesthitspv, Misspv> pool;
|
||||
pool.setsCount = 1;
|
||||
pool.BuildPool(0);
|
||||
std::array<VkDescriptorSetLayout, 3> layouts {{Raygenspv::layout, Closesthitspv::layout, Misspv::layout}};
|
||||
PipelineRTVulkan<Raygenspv, Closesthitspv, Misspv, Raygenspv, Closesthitspv, Misspv>::Init(layouts);
|
||||
DescriptorPool pool;
|
||||
pool.sets.resize(1);
|
||||
pool.BuildPool(DescriptorPool::GetPoolSizes<Raygenspv, Closesthitspv, Misspv>(), layouts);
|
||||
|
||||
WindowVulkan window(1280, 720, "HelloVulkan");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue