From: Andrey Tuganov <andreyt@google.com>
Date: Mon, 11 Dec 2017 17:33:11 +0000 (-0500)
Subject: Reenable OpCopyObject validation rules
X-Git-Tag: upstream/2018.6~633
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbd8d0e7b8176d82310a3dbaef28f1fe8d8a0156;p=platform%2Fupstream%2FSPIRV-Tools.git

Reenable OpCopyObject validation rules

Vulkan CTS fix has been submitted.
---

diff --git a/source/validate_composites.cpp b/source/validate_composites.cpp
index f9093f6..26fb28e 100644
--- a/source/validate_composites.cpp
+++ b/source/validate_composites.cpp
@@ -253,9 +253,6 @@ spv_result_t CompositesPass(ValidationState_t& _,
       break;
     }
 
-#if 0
-    // TODO(atgoo@github.com) Reenable this after this check passes Vulkan CTS.
-    // A change to Vulkan CTS has been sent for review.
     case SpvOpCopyObject: {
       if (!spvOpcodeGeneratesType(_.GetIdOpcode(result_type))) {
         return _.diag(SPV_ERROR_INVALID_DATA)
@@ -272,7 +269,6 @@ spv_result_t CompositesPass(ValidationState_t& _,
 
       break;
     }
-#endif
 
     case SpvOpTranspose: {
       uint32_t result_num_rows = 0;
diff --git a/test/val/val_composites_test.cpp b/test/val/val_composites_test.cpp
index ee8908a..7376001 100644
--- a/test/val/val_composites_test.cpp
+++ b/test/val/val_composites_test.cpp
@@ -479,9 +479,7 @@ TEST_F(ValidateComposites, CopyObjectSuccess) {
   ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
 }
 
-// TODO(atgoo@github.com) Reenable this after this check passes Vulkan CTS.
-// A change to Vulkan CTS has been sent for review.
-TEST_F(ValidateComposites, DISABLED_CopyObjectResultTypeNotType) {
+TEST_F(ValidateComposites, CopyObjectResultTypeNotType) {
   const std::string body = R"(
 %val1 = OpCopyObject %f32_0 %f32_0
 )";
@@ -492,9 +490,7 @@ TEST_F(ValidateComposites, DISABLED_CopyObjectResultTypeNotType) {
               HasSubstr("CopyObject: expected Result Type to be a type"));
 }
 
-// TODO(atgoo@github.com) Reenable this after this check passes Vulkan CTS.
-// A change to Vulkan CTS has been sent for review.
-TEST_F(ValidateComposites, DISABLED_CopyObjectWrongOperandType) {
+TEST_F(ValidateComposites, CopyObjectWrongOperandType) {
   const std::string body = R"(
 %val1 = OpCopyObject %f32 %u32_0
 )";