From 2a449f78bbefe8d8217edc4f9bc7bcf6b116b614 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 20 Dec 2015 23:39:03 +0100 Subject: [PATCH] More vulkan fixing --- Common/Common.vcxproj | 3 ++- Core/Core.vcxproj | 4 +-- GPU/GPU.vcxproj | 4 +-- UI/UI.vcxproj | 4 +-- Windows/GPU/WindowsVulkanContext.cpp | 17 +++++++++--- Windows/GPU/WindowsVulkanContext.h | 2 -- Windows/PPSSPP.vcxproj | 13 +++++----- Windows/WindowsHost.cpp | 4 ++- ext/libarmips.vcxproj | 5 ++-- ext/libkirk/libkirk.vcxproj | 4 +-- ext/native/native.vcxproj | 5 ++-- ext/native/thin3d/VulkanContext.cpp | 29 +++++++++++---------- ext/native/thin3d/VulkanContext.h | 4 +-- ext/native/thin3d/thin3d_vulkan.cpp | 39 ++++++++++++++++++---------- ext/native/thin3d/vulkan_utils.cpp | 1 - ext/zlib/zlib.vcxproj | 4 +-- headless/Headless.vcxproj | 4 +-- unittest/UnitTests.vcxproj | 12 ++++----- 18 files changed, 91 insertions(+), 67 deletions(-) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 48727fc67..c8fc1adc2 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -170,6 +170,7 @@ true false MultiThreaded + true Windows @@ -323,4 +324,4 @@ - \ No newline at end of file + diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 09b1d79cf..514cf98e7 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -45,7 +45,6 @@ StaticLibrary false - false Unicode v140_xp @@ -158,6 +157,7 @@ USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_M_X64=1;_LIB;NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) false MultiThreaded + true true @@ -737,4 +737,4 @@ - \ No newline at end of file + diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index 831975535..8ac43081a 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -45,7 +45,6 @@ StaticLibrary false - false Unicode v140_xp @@ -168,6 +167,7 @@ false USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;_LIB;NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) MultiThreaded + true true @@ -350,4 +350,4 @@ - \ No newline at end of file + diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 5886b99bf..596eba30a 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -104,7 +104,6 @@ StaticLibrary false v140_xp - false Unicode @@ -212,6 +211,7 @@ true false MultiThreaded + true Windows @@ -227,4 +227,4 @@ - \ No newline at end of file + diff --git a/Windows/GPU/WindowsVulkanContext.cpp b/Windows/GPU/WindowsVulkanContext.cpp index add7bc62f..b19be7a81 100644 --- a/Windows/GPU/WindowsVulkanContext.cpp +++ b/Windows/GPU/WindowsVulkanContext.cpp @@ -73,10 +73,17 @@ bool WindowsVulkanContext::Init(HINSTANCE hInst, HWND hWnd, std::string *error_m g_Vulkan->InitObjects(hInst, hWnd, true); _CrtCheckMemory(); + + VkClearValue clearVal[2]; + memset(clearVal, 0, sizeof(clearVal)); + clearVal[0].color.float32[0] = 0.5f; + g_Vulkan->BeginSurfaceRenderPass(clearVal); return true; } void WindowsVulkanContext::Shutdown() { + g_Vulkan->EndSurfaceRenderPass(); + g_Vulkan->DestroyObjects(); delete g_Vulkan; g_Vulkan = nullptr; @@ -87,6 +94,12 @@ Thin3DContext *WindowsVulkanContext::CreateThin3DContext() { } void WindowsVulkanContext::SwapBuffers() { + g_Vulkan->EndSurfaceRenderPass(); + + VkClearValue clearVal[2]; + memset(clearVal, 0, sizeof(clearVal)); + clearVal[0].color.float32[0] = 0.5f; + g_Vulkan->BeginSurfaceRenderPass(clearVal); } void WindowsVulkanContext::Resize() { @@ -101,7 +114,3 @@ void WindowsVulkanContext::Resize() { void WindowsVulkanContext::SwapInterval(int interval) { } - -Thin3DContext *Vulkan_CreateThin3DContext() { - return T3DCreateVulkanContext(g_Vulkan); -} diff --git a/Windows/GPU/WindowsVulkanContext.h b/Windows/GPU/WindowsVulkanContext.h index 99e736d01..5fc24a866 100644 --- a/Windows/GPU/WindowsVulkanContext.h +++ b/Windows/GPU/WindowsVulkanContext.h @@ -32,5 +32,3 @@ public: Thin3DContext *CreateThin3DContext() override; }; -void Vulkan_BeginSurfaceRender(); -void Vulkan_EndSurfaceRender(); diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index c889776f6..8fdfd0717 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -39,7 +39,6 @@ Application Unicode - false v140_xp @@ -135,7 +134,7 @@ Disabled - ..\ext\vulkan\vulkan-1.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;dxerr.lib;%(AdditionalDependencies) + ..\ext\vulkan\vulkan-1.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) true Windows MachineX86 @@ -175,11 +174,10 @@ x64\Debug\glslang.lib;..\ext\vulkan\vulkan-1.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) true $(OutDir)$(ProjectName).pdb - Windows - MachineX64 true NotSet /ignore:4049 /ignore:4217 %(AdditionalOptions) + Windows ../Windows/git-version-gen.cmd @@ -208,7 +206,7 @@ false - ..\ext\vulkan\vulkan-1.lib;dxerr.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) + ..\ext\vulkan\vulkan-1.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) %(AdditionalLibraryDirectories) true @@ -252,7 +250,7 @@ false - ..\ext\vulkan\vulkan-1.lib;dxerr.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) + ..\ext\vulkan\vulkan-1.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) true Windows @@ -260,6 +258,7 @@ true MachineX64 /ignore:4049 /ignore:4217 %(AdditionalOptions) + true ../Windows/git-version-gen.cmd @@ -454,4 +453,4 @@ - \ No newline at end of file + diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index b46c16e53..06f78162d 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -69,7 +69,9 @@ static BOOL PostDialogMessage(Dialog *dialog, UINT message, WPARAM wParam = 0, L } WindowsHost::WindowsHost(HINSTANCE hInstance, HWND mainWindow, HWND displayWindow) - : gfx_(nullptr), hInstance_(hInstance), mainWindow_(mainWindow), displayWindow_(displayWindow) + : gfx_(nullptr), hInstance_(hInstance), + mainWindow_(mainWindow), + displayWindow_(displayWindow) { mouseDeltaX = 0; mouseDeltaY = 0; diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj index f4f042f23..22bc0bba0 100644 --- a/ext/libarmips.vcxproj +++ b/ext/libarmips.vcxproj @@ -67,7 +67,6 @@ StaticLibrary false v140_xp - false Unicode @@ -221,6 +220,8 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded armips + false + true Windows @@ -333,4 +334,4 @@ - \ No newline at end of file + diff --git a/ext/libkirk/libkirk.vcxproj b/ext/libkirk/libkirk.vcxproj index 661bf7f60..cdc3e4f73 100644 --- a/ext/libkirk/libkirk.vcxproj +++ b/ext/libkirk/libkirk.vcxproj @@ -46,7 +46,6 @@ StaticLibrary false v140_xp - false Unicode @@ -129,6 +128,7 @@ true false MultiThreaded + true true @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 238f515b3..62927609f 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -46,7 +46,6 @@ StaticLibrary false - false Unicode v140_xp @@ -160,6 +159,8 @@ true false MultiThreaded + false + true Windows @@ -749,4 +750,4 @@ - \ No newline at end of file + diff --git a/ext/native/thin3d/VulkanContext.cpp b/ext/native/thin3d/VulkanContext.cpp index a324fe7b4..cb94b9328 100644 --- a/ext/native/thin3d/VulkanContext.cpp +++ b/ext/native/thin3d/VulkanContext.cpp @@ -9,7 +9,10 @@ #undef new #endif +#pragma warning(push) +#pragma warning(disable:4996) #include "glslang/SPIRV/GlslangToSpv.h" +#pragma warning(pop) #ifdef USE_CRT_DBG #define new DBG_NEW @@ -61,19 +64,19 @@ VulkanContext::VulkanContext(const char *app_name, uint32_t flags) device_extension_names.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME); if (flags & VULKAN_FLAG_VALIDATE) { - instance_layer_names.push_back("VK_LAYER_LUNARG_Threading"); - instance_layer_names.push_back("VK_LAYER_LUNARG_DrawState"); - instance_layer_names.push_back("VK_LAYER_LUNARG_Image"); - instance_layer_names.push_back("VK_LAYER_LUNARG_MemTracker"); - instance_layer_names.push_back("VK_LAYER_LUNARG_ObjectTracker"); - instance_layer_names.push_back("VK_LAYER_LUNARG_ParamChecker"); + instance_layer_names.push_back("VK_LAYER_LUNARG_threading"); + instance_layer_names.push_back("VK_LAYER_LUNARG_draw_state"); + instance_layer_names.push_back("VK_LAYER_LUNARG_image"); + instance_layer_names.push_back("VK_LAYER_LUNARG_mem_tracker"); + instance_layer_names.push_back("VK_LAYER_LUNARG_object_tracker"); + instance_layer_names.push_back("VK_LAYER_LUNARG_param_checker"); - device_layer_names.push_back("VK_LAYER_LUNARG_Threading"); - device_layer_names.push_back("VK_LAYER_LUNARG_DrawState"); - device_layer_names.push_back("VK_LAYER_LUNARG_Image"); - device_layer_names.push_back("VK_LAYER_LUNARG_MemTracker"); - device_layer_names.push_back("VK_LAYER_LUNARG_ObjectTracker"); - device_layer_names.push_back("VK_LAYER_LUNARG_ParamChecker"); + device_layer_names.push_back("VK_LAYER_LUNARG_threading"); + device_layer_names.push_back("VK_LAYER_LUNARG_draw_state"); + device_layer_names.push_back("VK_LAYER_LUNARG_image"); + device_layer_names.push_back("VK_LAYER_LUNARG_mem_tracker"); + device_layer_names.push_back("VK_LAYER_LUNARG_object_tracker"); + device_layer_names.push_back("VK_LAYER_LUNARG_param_checker"); instance_extension_names.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME); } @@ -542,7 +545,7 @@ VkResult VulkanContext::CreateDevice(int physical_device) { assert(queue_count >= 1); bool found = false; - for (int i = 0; i < queue_count; i++) { + for (int i = 0; i < (int)queue_count; i++) { if (queue_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) { queue_info.queueFamilyIndex = i; found = true; diff --git a/ext/native/thin3d/VulkanContext.h b/ext/native/thin3d/VulkanContext.h index e1beaa09e..c6fe04afc 100644 --- a/ext/native/thin3d/VulkanContext.h +++ b/ext/native/thin3d/VulkanContext.h @@ -40,8 +40,8 @@ #include #endif // _WIN32 -#include "ext/vulkan/vulkan.h" -#include "ext/vulkan/vk_sdk_platform.h" +#include "vulkan/vulkan.h" +#include "vulkan/vk_sdk_platform.h" /* Amount of time, in nanoseconds, to wait for a command buffer to complete */ #define FENCE_TIMEOUT 10000000000 diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index d6be27a68..3a2a2adb3 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -124,7 +124,8 @@ public: b.sharingMode = VK_SHARING_MODE_EXCLUSIVE; b.queueFamilyIndexCount = 0; b.pQueueFamilyIndices = nullptr; - assert(VK_SUCCESS == vkCreateBuffer(device, &b, nullptr, &buffer_)); + VkResult res = vkCreateBuffer(device, &b, nullptr, &buffer_); + assert(VK_SUCCESS == res); // Okay, that's the buffer. Now let's allocate some memory for it. VkMemoryAllocateInfo alloc; @@ -133,8 +134,10 @@ public: memMan->memory_type_from_properties(0xFFFFFFFF, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &alloc.memoryTypeIndex); alloc.allocationSize = size; - assert(VK_SUCCESS == vkAllocateMemory(device, &alloc, nullptr, &deviceMemory_)); - assert(VK_SUCCESS == vkBindBufferMemory(device, buffer_, deviceMemory_, 0)); + res = vkAllocateMemory(device, &alloc, nullptr, &deviceMemory_); + assert(VK_SUCCESS == res); + res = vkBindBufferMemory(device, buffer_, deviceMemory_, 0); + assert(VK_SUCCESS == res); } void Destroy(VkDevice device) { @@ -146,7 +149,8 @@ public: void Begin(VkDevice device) { offset_ = 0; - assert(VK_SUCCESS == vkMapMemory(device, deviceMemory_, 0, size_, 0, (void **)(&writePtr_))); + VkResult res = vkMapMemory(device, deviceMemory_, 0, size_, 0, (void **)(&writePtr_)); + assert(VK_SUCCESS == res); } void End(VkDevice device) { @@ -273,7 +277,7 @@ private: // invoke Compile again to recreate the shader then link them together. class Thin3DVKShader : public Thin3DShader { public: - Thin3DVKShader(bool isFragmentShader) : module_(nullptr), ok_(false) { + Thin3DVKShader(VulkanContext *vulkan, bool isFragmentShader) : vulkan_(vulkan), module_(nullptr), ok_(false) { stage_ = isFragmentShader ? VK_SHADER_STAGE_FRAGMENT_BIT : VK_SHADER_STAGE_VERTEX_BIT; } bool Compile(VkDevice device, const char *source); @@ -283,6 +287,7 @@ public: VkShaderModule Get() const { return module_; } private: + VulkanContext *vulkan_; VkShaderModule module_; VkShaderStageFlagBits stage_; bool ok_; @@ -305,7 +310,7 @@ bool Thin3DVKShader::Compile(VkDevice device, const char *source) { } #endif - if (vulkan->CreateShaderModule(spirv, &module_)) { + if (CreateShaderModule(device, spirv, &module_)) { ok_ = true; } else { ok_ = false; @@ -596,7 +601,7 @@ public: s.maxLod = 0.0; // TODO: Actually support mipmaps VkResult res = vkCreateSampler(vulkan_->Device(), &s, nullptr, &sampler_); - assert(res); + assert(VK_SUCCESS == res); } ~Thin3DVKSamplerState() { vkDestroySampler(vulkan_->Device(), sampler_, nullptr); @@ -781,7 +786,7 @@ Thin3DVKContext::Thin3DVKContext(VulkanContext *vulkan) res = vkCreateFence(device_, &f, nullptr, &cmdFences_[1]); assert(VK_SUCCESS == res); // Create as already signalled, so we can wait for it the first time. - // f.flags = VK_FENCE_CREATE_SIGNALED_BIT; + f.flags = VK_FENCE_CREATE_SIGNALED_BIT; res = vkCreateFence(device_, &f, nullptr, &initFence_); assert(VK_SUCCESS == res); pendingInitFence_ = false; @@ -794,6 +799,7 @@ Thin3DVKContext::Thin3DVKContext(VulkanContext *vulkan) pc.flags = 0; res = vkCreatePipelineCache(device_, &pc, nullptr, &pipelineCache_); assert(VK_SUCCESS == res); + push_ = pushBuffer_[0]; cmd_ = cmdBuffer_[0]; } @@ -836,12 +842,14 @@ void Thin3DVKContext::BeginInitCommands() { begin.pNext = nullptr; begin.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT; begin.pInheritanceInfo = nullptr; - assert(VK_SUCCESS == vkBeginCommandBuffer(initCmd_, &begin)); + VkResult res = vkBeginCommandBuffer(initCmd_, &begin); + assert(VK_SUCCESS == res); hasInitCommands_ = true; } void Thin3DVKContext::EndInitCommands() { - assert(VK_SUCCESS == vkEndCommandBuffer(initCmd_)); + VkResult res = vkEndCommandBuffer(initCmd_); + assert(VK_SUCCESS == res); } void Thin3DVKContext::End() { @@ -861,7 +869,8 @@ void Thin3DVKContext::End() { submit.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit.pCommandBuffers = &initCmd_; submit.commandBufferCount = 1; - assert(VK_SUCCESS == vkQueueSubmit(queue_, 1, &submit, initFence_)); + VkResult res = vkQueueSubmit(queue_, 1, &submit, initFence_); + assert(VK_SUCCESS == res); hasInitCommands_ = false; } @@ -873,7 +882,8 @@ void Thin3DVKContext::End() { submit.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit.pCommandBuffers = &cmd_; submit.commandBufferCount = 1; - assert(VK_SUCCESS == vkQueueSubmit(queue_, 1, &submit, cmdFence_)); + VkResult res = vkQueueSubmit(queue_, 1, &submit, cmdFence_); + assert(VK_SUCCESS == res); } frameNum_++; @@ -905,6 +915,7 @@ VkDescriptorSet Thin3DVKContext::GetOrCreateDescriptorSet() { alloc.descriptorSetCount = 1; VkResult res = vkAllocateDescriptorSets(device_, &alloc, &descSet); assert(VK_SUCCESS == res); + // bindings[0].descriptorType = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT; // bindings[1].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC; // bindings[2].descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; @@ -1238,7 +1249,7 @@ void Thin3DVKContext::SetTextures(int start, int count, Thin3DTexture **textures } Thin3DShader *Thin3DVKContext::CreateVertexShader(const char *glsl_source, const char *hlsl_source, const char *vulkan_source) { - Thin3DVKShader *shader = new Thin3DVKShader(false); + Thin3DVKShader *shader = new Thin3DVKShader(vulkan_, false); if (shader->Compile(device_, vulkan_source)) { return shader; } else { @@ -1248,7 +1259,7 @@ Thin3DShader *Thin3DVKContext::CreateVertexShader(const char *glsl_source, const } Thin3DShader *Thin3DVKContext::CreateFragmentShader(const char *glsl_source, const char *hlsl_source, const char *vulkan_source) { - Thin3DVKShader *shader = new Thin3DVKShader(true); + Thin3DVKShader *shader = new Thin3DVKShader(vulkan_, true); if (shader->Compile(device_, vulkan_source)) { return shader; } else { diff --git a/ext/native/thin3d/vulkan_utils.cpp b/ext/native/thin3d/vulkan_utils.cpp index 264602a5b..9af64294b 100644 --- a/ext/native/thin3d/vulkan_utils.cpp +++ b/ext/native/thin3d/vulkan_utils.cpp @@ -156,7 +156,6 @@ void VulkanImage::ChangeLayout(VkCommandBuffer cmd, VkImageAspectFlags aspectMas vkCmdPipelineBarrier(cmd, src_stages, dest_stages, false, 0, nullptr, 0, nullptr, 1, &image_memory_barrier); } - bool CreateShaderModule(VkDevice device, const std::vector &spirv, VkShaderModule *shaderModule) { VkShaderModuleCreateInfo sm; sm.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO; diff --git a/ext/zlib/zlib.vcxproj b/ext/zlib/zlib.vcxproj index 9a194bdff..30bcd6ee0 100644 --- a/ext/zlib/zlib.vcxproj +++ b/ext/zlib/zlib.vcxproj @@ -76,7 +76,6 @@ StaticLibrary false - false Unicode v140_xp @@ -183,6 +182,7 @@ true false MultiThreaded + true Windows @@ -194,4 +194,4 @@ - \ No newline at end of file + diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index 2225af37c..d155cb76a 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -47,7 +47,6 @@ Application false - false Unicode v140_xp @@ -138,7 +137,7 @@ Console true - ..\Windows\x64\Debug\glslang.lib;..\ext\vulkan\vulkan-1.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;dxguid.lib;%(AdditionalDependencies) + ..\ext\vulkan\vulkan-1.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;dxguid.lib;%(AdditionalDependencies) 0x00400000 false true @@ -203,6 +202,7 @@ true false MultiThreaded + true Console diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index 212bd576f..cc55ecec4 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -48,7 +48,6 @@ Application false v140_xp - false Unicode @@ -88,8 +87,8 @@ Level3 - _CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib + _CRTDBG_MAP_ALLOC;USING_WIN_UI;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../ext;../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib true false false @@ -111,7 +110,7 @@ Level3 _CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib + ../ext;../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib true false false @@ -137,7 +136,7 @@ true true USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib + ../ext;../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib false Speed true @@ -163,11 +162,12 @@ true true USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib + ../ext;../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib false true false MultiThreaded + true Console