Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing build for the millionth time

Browse Source
This commit is contained in:
Dynamitos
2020-08-11 22:38:19 +02:00
parent 839be06f90
commit 6814587b54
12 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Graphics/Vulkan/VulkanDescriptorSets.cpp
+3 -3
View File
@@ -112,7 +112,7 @@ void DescriptorSet::updateSampler(uint32_t binding, Gfx::PSamplerState samplerSt
init::DescriptorImageInfo(
vulkanSampler->sampler,
VK_NULL_HANDLE,
VK_IMAGE_LAYOUT_BEGIN_RANGE);
VK_IMAGE_LAYOUT_UNDEFINED);
imageInfos.add(imageInfo);
VkWriteDescriptorSet writeDescriptor = init::WriteDescriptorSet(setHandle, VK_DESCRIPTOR_TYPE_SAMPLER, binding, &imageInfos.back());
@@ -162,7 +162,7 @@ void DescriptorSet::writeChanges()
DescriptorAllocator::DescriptorAllocator(PGraphics graphics, DescriptorLayout &layout)
: layout(layout), graphics(graphics)
{
uint32 perTypeSizes[VK_DESCRIPTOR_TYPE_END_RANGE];
uint32 perTypeSizes[VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT]; // TODO: FIX ENUM
std::memset(perTypeSizes, 0, sizeof(perTypeSizes));
for (uint32 i = 0; i < layout.getBindings().size(); ++i)
{
@@ -171,7 +171,7 @@ DescriptorAllocator::DescriptorAllocator(PGraphics graphics, DescriptorLayout &l
perTypeSizes[typeIndex] += 256;
}
Array<VkDescriptorPoolSize> poolSizes;
for (uint32 i = 0; i < VK_DESCRIPTOR_TYPE_END_RANGE; ++i)
for (uint32 i = 0; i < VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT; ++i)
{
if (perTypeSizes[i] > 0)
{
src/Engine/Graphics/Vulkan/VulkanGraphicsResources.h
+2 -1
View File
@@ -1,6 +1,7 @@
#pragma once
#include "Graphics/GraphicsResources.h"
#include <vulkan/vulkan.h>
#include "Graphics/GraphicsResources.h"
#include <functional>
namespace Seele
{
src/Engine/Graphics/Vulkan/VulkanPipelineCache.cpp
+2 -1
View File
@@ -5,6 +5,7 @@
#include "VulkanRenderPass.h"
#include "VulkanDescriptorSets.h"
#include "VulkanShader.h"
#include <fstream>
using namespace Seele;
using namespace Seele::Vulkan;
@@ -230,7 +231,7 @@ PGraphicsPipeline PipelineCache::createPipeline(const GraphicsPipelineCreateInfo
std::memcpy(blendState.blendConstants, gfxInfo.colorBlend.blendConstants, sizeof(float)*4);
uint32 numDynamicEnabled = 0;
StaticArray<VkDynamicState, VK_DYNAMIC_STATE_RANGE_SIZE> dynamicEnabled;
StaticArray<VkDynamicState, 2> dynamicEnabled;
dynamicEnabled[numDynamicEnabled++] = VK_DYNAMIC_STATE_VIEWPORT;
dynamicEnabled[numDynamicEnabled++] = VK_DYNAMIC_STATE_SCISSOR;