Fixing build for the millionth time

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
+2 -1
View File
@@ -12,7 +12,8 @@
],
"windowsSdkVersion": "10.0.18362.0",
"compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.25.28610/bin/Hostx64/x64/cl.exe",
"intelliSenseMode": "msvc-x64"
"intelliSenseMode": "msvc-x64",
"configurationProvider": "ms-vscode.cmake-tools"
}
],
"version": 4
+1 -1
View File
@@ -1,7 +1,7 @@
{
"telemetry.enableTelemetry": false,
"cmake.buildDirectory": "${workspaceFolder}/bin/${buildType}",
"git.autofetch": false,
"git.enabled": false,
"files.associations": {
"*.h": "cpp",
"xstring": "cpp",
+17 -17
View File
@@ -67,28 +67,28 @@ target_link_libraries(SeeleEngine ${SLANG_LIBRARY})
target_link_libraries(SeeleEngine ${ASSIMP_LIBRARIES})
target_link_libraries(SeeleEngine ${JSON_LIBRARY})
target_precompile_headers(SeeleEngine
PRIVATE
<assert.h>
<memory>
<atomic>
<cstring>
<iostream>
<string>
<thread>
<functional>
<filesystem>
<fstream>
<mutex>
<condition_variable>
<boost/serialization/serialization.hpp>
<boost/crc.hpp>)
#target_precompile_headers(SeeleEngine
# PRIVATE
# <assert.h>
# <memory>
# <atomic>
# <cstring>
# <iostream>
# <string>
# <thread>
# <functional>
# <filesystem>
# <fstream>
# <mutex>
# <condition_variable>
# <boost/serialization/serialization.hpp>
# <boost/crc.hpp>)
add_subdirectory(src/)
if(MSVC)
set(_CRT_SECURE_NO_WARNINGS)
target_compile_options(SeeleEngine PRIVATE /DEBUG:FASTLINK /Zi)
# target_compile_options(SeeleEngine PRIVATE /DEBUG:FASTLINK /Zi)
else()
target_compile_options(SeeleEngine PRIVATE -Wall -Wextra -pedantic)
endif()
+1
View File
@@ -7,6 +7,7 @@
#include "Material/Material.h"
#include "Graphics/Graphics.h"
#include "Graphics/WindowManager.h"
#include <iostream>
using namespace Seele;
+1
View File
@@ -3,6 +3,7 @@
#include "Containers/List.h"
#include <thread>
#include <future>
#include <filesystem>
namespace Seele
{
+1
View File
@@ -3,6 +3,7 @@
#include "Containers/List.h"
#include <thread>
#include <future>
#include <filesystem>
namespace Seele
{
+1
View File
@@ -3,6 +3,7 @@
#include "Containers/List.h"
#include <thread>
#include <future>
#include <filesystem>
namespace Seele
{
@@ -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)
{
@@ -1,6 +1,7 @@
#pragma once
#include "Graphics/GraphicsResources.h"
#include <vulkan/vulkan.h>
#include "Graphics/GraphicsResources.h"
#include <functional>
namespace Seele
{
@@ -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;
+1
View File
@@ -3,6 +3,7 @@
#include "Graphics/VertexShaderInput.h"
#include <nlohmann/json.hpp>
#include <sstream>
#include <iostream>
Gfx::ShaderMap Material::shaderMap;
std::mutex Material::shaderMapLock;
+2 -2
View File
@@ -93,7 +93,7 @@ public:
inline void removeRef()
{
refCount--;
if (refCount.load() == 0)
if (refCount == 0)
{
delete this;
}
@@ -105,7 +105,7 @@ public:
private:
T *handle;
std::atomic_uint64_t refCount;
uint64 refCount;
};
template <typename T>