Merge "Merge vk-gl-cts/vulkan-cts-1.3.2 into vk-gl-cts/vulkan-cts-1.3.3" into vulkan-cts-1.3.3
diff --git a/external/vulkancts/framework/vulkan/CMakeLists.txt b/external/vulkancts/framework/vulkan/CMakeLists.txt
index 71259c1..4aab8e4 100644
--- a/external/vulkancts/framework/vulkan/CMakeLists.txt
+++ b/external/vulkancts/framework/vulkan/CMakeLists.txt
@@ -218,6 +218,8 @@
add_definitions(-DDEQP_HAVE_RENDERDOC_HEADER=1)
endif()
+add_definitions(-DDISABLE_SHADERCACHE_IPC)
+
PCH(VKUTILNOSHADER_SRCS ../../modules/vulkan/pch.cpp)
PCH(VKUTIL_SRCS ../../modules/vulkan/pch.cpp)
PCH(VKUTILNOSHADER_INLS ../../modules/vulkan/pch.cpp)
diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
index ebf0172..69ab384 100644
--- a/framework/platform/android/tcuAndroidPlatform.cpp
+++ b/framework/platform/android/tcuAndroidPlatform.cpp
@@ -324,7 +324,7 @@
vk::Library* Platform::createLibrary (const char* libraryPath) const
{
- return new VulkanLibrary(const char* libraryPath);
+ return new VulkanLibrary(libraryPath);
}
void Platform::describePlatform (std::ostream& dst) const
