Add VK_NULL_HANDLE definition to vkDefs.hpp

VK_NULL_HANDLE was notably missing for usage in CTS tests, and in most
of them it was being replaced by DE_NULL, which in the past also doubled
as NULL and nullptr.

Since VK-GL-CTS was updated to support C++11, nullptr was available as a
more natural way of using null pointers, but DE_NULL still had to be
used as the VK_NULL_HANDLE replacement.

This commit defines VK_NULL_HANDLE to be DE_NULL, which is known to
work, and makes its definition available globally as expected.

No test results should be affected.

VK-GL-CTS issue: 1701
Components: Vulkan

Change-Id: I188ab0ae8764ba25be38048479d62831909fbe29

diff --git a/external/vulkancts/framework/vulkan/vkDefs.hpp b/external/vulkancts/framework/vulkan/vkDefs.hpp
index bfec365..88a61fd 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkDefs.hpp
+++ b/external/vulkancts/framework/vulkan/vkDefs.hpp
@@ -37,6 +37,7 @@
 #      define VKAPI_CALL
 #endif
 
+#define VK_NULL_HANDLE                                                                 DE_NULL
 #define VK_DEFINE_HANDLE(NAME, TYPE)                                   typedef struct NAME##_s* NAME
 #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(NAME, TYPE)  typedef Handle<TYPE> NAME
 

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationCacheControlTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationCacheControlTests.cpp
index 49b840f..e4e82ce 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationCacheControlTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationCacheControlTests.cpp
@@ -62,8 +62,6 @@ using ::std::vector;
  *//*--------------------------------------------------------------------*/
 namespace test_common
 {
-static constexpr auto VK_NULL_HANDLE = DE_NULL;
-
 using ::std::chrono::high_resolution_clock;
 using ::std::chrono::microseconds;
 

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktDynamicRenderingTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktDynamicRenderingTests.cpp
index cbe744a..502f784 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktDynamicRenderingTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktDynamicRenderingTests.cpp
@@ -64,7 +64,6 @@ using tcu::Vec4;
 using tcu::IVec4;
 using tcu::UVec4;
 
-constexpr auto         VK_NULL_HANDLE                          = DE_NULL;
  // maxColorAttachments is guaranteed to be at least 4.
 constexpr deUint32     COLOR_ATTACHMENTS_NUMBER        = 4;