thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the Vulkan validator workarounds to match the 1.0.8 validator... gah.

Browse source
This commit is contained in:
Henrik Rydgard 2016-04-07 23:45:23 +02:00
parent e1bf0d3f81
commit 37616a6f95
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Windows/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*.VC.VC.opendb
*.VC.db

19
Windows/GPU/WindowsVulkanContext.cpp
View file

@ -53,6 +53,7 @@
#include "Common/Vulkan/VulkanLoader.h" #include "Common/Vulkan/VulkanLoader.h"
#include "Common/Vulkan/VulkanContext.h" #include "Common/Vulkan/VulkanContext.h"
#include "base/stringutil.h"
#include "thin3d/thin3d.h" #include "thin3d/thin3d.h"
#include "util/text/parsers.h" #include "util/text/parsers.h"
#include "Windows/GPU/WindowsVulkanContext.h" #include "Windows/GPU/WindowsVulkanContext.h"
@ -124,12 +125,20 @@ static VkBool32 VKAPI_CALL Vulkan_Dbg(VkDebugReportFlagsEXT msgFlags, VkDebugRep
} }
message << "[" << pLayerPrefix << "] " << ObjTypeToString(objType) << " Code " << msgCode << " : " << pMsg << "\n"; message << "[" << pLayerPrefix << "] " << ObjTypeToString(objType) << " Code " << msgCode << " : " << pMsg << "\n";
// Getting some bizarre false positives for mapping image memory. // validator or glslang bug (validator #298)
// https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/121 if (msgCode == 15 && startsWith(pMsg, "Shader requires"))
if (msgCode == 6 && (!memcmp(pMsg, "Cannot map", 10) || !memcmp(pMsg, "Cannot sub", 10)))
return false; return false;
// And for dynamic offsets.
if (msgCode == 62 && (!memcmp(pMsg, "VkDesc", 6))) // layout barrier. TODO: This one I should fix.
if (msgCode == 7 && startsWith(pMsg, "Cannot submit cmd buffer"))
return false;
// memory free'd while still holding a ref. validator bug? or worrying...
if (msgCode == 6 && startsWith(pMsg, "Attempting to free memory"))
return false;
// another validator bug (validator #299)
if (msgCode == 63 && startsWith(pMsg, "VkDescriptorSet"))
return false; return false;
#ifdef _WIN32 #ifdef _WIN32