commit 7fa7d06b4c0f0281efe498bd14218d088f15d63d
author 林昆毅 Kunyi(Locke) Lin <kunyilockelin@gmail.com> Mon Jun 10 20:36:29 2019 -0600
committer Locke Lin <47329816+locke-lunarg@users.noreply.github.com> Tue Jun 11 02:01:40 2019 -0600
tree 64fa177d925c3b159aa131e130c7f7ae922e4ca2
parent e1c22889afe9bd7703ba7455f311f9457442a49c

tests: Fix ValidateStride in PixelC

Change-Id: I6cc0824be3827d79dc2eae5c8917103dc4f98213

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 5765292..336fb40 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1871,6 +1871,12 @@
     context_->Reset();
 };
 
+void print_android(const char *c) {
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+    __android_log_print(ANDROID_LOG_INFO, "VulkanLayerValidationTests", "%s", c);
+#endif  // VK_USE_PLATFORM_ANDROID_KHR
+}
+
 #if defined(ANDROID) && defined(VALIDATION_APK)
 const char *appTag = "VulkanLayerValidationTests";
 static bool initialized = false;

tests/layer_validation_tests.h

diff --git a/tests/layer_validation_tests.h b/tests/layer_validation_tests.h
index ee5a92e..e660d6a 100644
--- a/tests/layer_validation_tests.h
+++ b/tests/layer_validation_tests.h
@@ -761,4 +761,5 @@
 
 void CreateImageViewTest(VkLayerTest &test, const VkImageViewCreateInfo *pCreateInfo, std::string code = "");
 
+void print_android(const char *c);
 #endif  // VKLAYERTEST_H

tests/vklayertests_others.cpp

diff --git a/tests/vklayertests_others.cpp b/tests/vklayertests_others.cpp
index 9ffab12..3666209 100644
--- a/tests/vklayertests_others.cpp
+++ b/tests/vklayertests_others.cpp
@@ -4257,19 +4257,19 @@
 
     char data_space;
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "VUID-vkGetQueryPoolResults-flags-00814");
-    vkGetQueryPoolResults(m_device->handle(), query_pool, 0, 1, sizeof(data_space), &data_space, 1, VK_QUERY_RESULT_WAIT_BIT);
+    vkGetQueryPoolResults(m_device->handle(), query_pool, 0, 1, sizeof(data_space), &data_space, 1, 0);
     m_errorMonitor->VerifyFound();
 
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "VUID-vkGetQueryPoolResults-flags-00815");
     vkGetQueryPoolResults(m_device->handle(), query_pool, 0, 1, sizeof(data_space), &data_space, 1, VK_QUERY_RESULT_64_BIT);
     m_errorMonitor->VerifyFound();
 
-    char data_space4[4];
+    char data_space4[4] = "";
     m_errorMonitor->ExpectSuccess();
-    vkGetQueryPoolResults(m_device->handle(), query_pool, 0, 1, sizeof(data_space4), &data_space4, 4, VK_QUERY_RESULT_WAIT_BIT);
+    vkGetQueryPoolResults(m_device->handle(), query_pool, 0, 1, sizeof(data_space4), &data_space4, 4, 0);
     m_errorMonitor->VerifyNotFound();
 
-    char data_space8[8];
+    char data_space8[8] = "";
     m_errorMonitor->ExpectSuccess();
     vkGetQueryPoolResults(m_device->handle(), query_pool, 0, 1, sizeof(data_space8), &data_space8, 8, VK_QUERY_RESULT_64_BIT);
     m_errorMonitor->VerifyNotFound();
@@ -4287,7 +4287,7 @@
 
     m_commandBuffer->begin();
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "VUID-vkCmdCopyQueryPoolResults-flags-00822");
-    vkCmdCopyQueryPoolResults(m_commandBuffer->handle(), query_pool, 0, 1, buffer.handle(), 1, 1, VK_QUERY_RESULT_WAIT_BIT);
+    vkCmdCopyQueryPoolResults(m_commandBuffer->handle(), query_pool, 0, 1, buffer.handle(), 1, 1, 0);
     m_errorMonitor->VerifyFound();
 
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "VUID-vkCmdCopyQueryPoolResults-flags-00823");
@@ -4295,7 +4295,7 @@
     m_errorMonitor->VerifyFound();
 
     m_errorMonitor->ExpectSuccess();
-    vkCmdCopyQueryPoolResults(m_commandBuffer->handle(), query_pool, 0, 1, buffer.handle(), 4, 4, VK_QUERY_RESULT_WAIT_BIT);
+    vkCmdCopyQueryPoolResults(m_commandBuffer->handle(), query_pool, 0, 1, buffer.handle(), 4, 4, 0);
     m_errorMonitor->VerifyNotFound();
 
     m_errorMonitor->ExpectSuccess();
@@ -4331,6 +4331,7 @@
 
         vkCmdEndRenderPass(m_commandBuffer->handle());
         m_commandBuffer->end();
+
     } else {
         printf("%s Test requires unsupported multiDrawIndirect feature. Skipped.\n", kSkipPrefix);
     }

tests/vktestframeworkandroid.cpp

diff --git a/tests/vktestframeworkandroid.cpp b/tests/vktestframeworkandroid.cpp
index 8edc757..a069b23 100644
--- a/tests/vktestframeworkandroid.cpp
+++ b/tests/vktestframeworkandroid.cpp
@@ -91,7 +91,7 @@
     shaderc::SpvCompilationResult result =
         compiler.CompileGlslToSpv(pshader, strlen(pshader), MapShadercType(shader_type), "shader", options);
     if (result.GetCompilationStatus() != shaderc_compilation_status_success) {
-        __android_log_print(ANDROID_LOG_ERROR, "VkLayerValidationTest", "GLSLtoSPV compilation failed: %s",
+        __android_log_print(ANDROID_LOG_ERROR, "VkLayerValidationTests", "GLSLtoSPV compilation failed: %s",
                             result.GetErrorMessage().c_str());
         return false;
     }