Merge vk-gl-cts/opengl-es-cts-3.2.8 into vk-gl-cts/main

Change-Id: I9f1a96c9da4a259684498d383f33c98b5000fde4

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index e85bf81,b8e2e81..f29f63b
--- 1/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
--- 2/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@@ -20582,43 -20561,6 +20582,45 @@@ tcu::TestCaseGroup* createOpExecutionMo
                                                                                                                                                        case_.name + ".amber");
                testGroup->addChild(testCase);
        }
 +#endif // CTS_USES_VULKANSC
 +
 +      return testGroup.release();
 +}
 +
 +tcu::TestCaseGroup* createOpMulExtendedGroup (tcu::TestContext& testCtx)
 +{
 +      de::MovePtr<tcu::TestCaseGroup> testGroup       (new tcu::TestCaseGroup(testCtx, "mul_extended", "Op[S/U]MulExtended tests"));
 +
++#ifndef CTS_USES_VULKANSC
 +      static const char       dataDir[]       = "spirv_assembly/instruction/compute/mul_extended";
 +
 +      static const struct Case
 +      {
 +              const string name;
 +              const vector<string> features;
 +      } cases[] =
 +      {
 +              {       "signed_16bit",         {"Features.shaderInt16", "Storage16BitFeatures.storageBuffer16BitAccess"}                       },
 +              {       "signed_32bit",         {}                                                                                                                                                                      },
 +              {       "signed_64bit",         {"Features.shaderInt64"}                                                                                                                        },
 +              {       "signed_8bit",          {"Float16Int8Features.shaderInt8", "Storage8BitFeatures.storageBuffer8BitAccess"}       },
 +              {       "unsigned_16bit",       {"Features.shaderInt16", "Storage16BitFeatures.storageBuffer16BitAccess"}                       },
 +              {       "unsigned_32bit",       {}                                                                                                                                                                      },
 +              {       "unsigned_64bit",       {"Features.shaderInt64"}                                                                                                                        },
 +              {       "unsigned_8bit",        {"Float16Int8Features.shaderInt8", "Storage8BitFeatures.storageBuffer8BitAccess"}       }
 +      };
 +
 +      for (const auto& test : cases)
 +      {
 +              cts_amber::AmberTestCase *testCase = cts_amber::createAmberTestCase(testCtx,
 +                                                                                                                                                      test.name.c_str(),
 +                                                                                                                                                      "",
 +                                                                                                                                                      dataDir,
 +                                                                                                                                                      test.name + ".amber",
 +                                                                                                                                                      test.features);
 +              testGroup->addChild(testCase);
 +      }
++#endif // CTS_USES_VULKANSC
  
        return testGroup.release();
  }