From: Alexander Galazin Date: Mon, 20 Jul 2020 14:44:01 +0000 (+0200) Subject: Remove Amber example test X-Git-Tag: upstream/1.3.5~1300 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67ab26729980a2d36ef2ab4896423a26d7ee316d;p=platform%2Fupstream%2FVK-GL-CTS.git Remove Amber example test Components: Vulkan Change-Id: Idd01986ee9436366a8152ed73a1e18d07609def9 --- diff --git a/AndroidGen.mk b/AndroidGen.mk index 163d195..310e342 100644 --- a/AndroidGen.mk +++ b/AndroidGen.mk @@ -58,7 +58,6 @@ LOCAL_SRC_FILES := \ external/vulkancts/framework/vulkan/vkWsiPlatform.cpp \ external/vulkancts/framework/vulkan/vkWsiUtil.cpp \ external/vulkancts/framework/vulkan/vkYCbCrImageWithMemory.cpp \ - external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.cpp \ external/vulkancts/modules/vulkan/amber/vktAmberGlslTests.cpp \ external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp \ external/vulkancts/modules/vulkan/amber/vktAmberHelper.cpp \ diff --git a/android/cts/master/src/vk-excluded-tests.txt b/android/cts/master/src/vk-excluded-tests.txt index 656c6a4..868d93b 100644 --- a/android/cts/master/src/vk-excluded-tests.txt +++ b/android/cts/master/src/vk-excluded-tests.txt @@ -48,9 +48,6 @@ dEQP-VK.wsi.android.shared_presentable_image.scale_down.* # Issue: b/67022169 dEQP-VK.wsi.android.incremental_present.scale_down.* -# Exclude Amber example tests -dEQP-VK.amber-example.* - # Exclude conformance version from android test, issue 1839 dEQP-VK.api.driver_properties.conformance_version diff --git a/external/vulkancts/data/vulkan/amber/example/clear.amber b/external/vulkancts/data/vulkan/amber/example/clear.amber deleted file mode 100644 index c9d25d3..0000000 --- a/external/vulkancts/data/vulkan/amber/example/clear.amber +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2019 Google LLC. -# Copyright 2019 The Khronos Group Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -[vertex shader passthrough] - -[fragment shader] -#version 430 - -layout(location = 0) in vec4 color_in; -layout(location = 0) out vec4 color_out; - -void main() { - color_out = color_in; -} - -[test] -clear -relative probe rect rgba (0.0, 0.0, 1.0, 1.0) (0, 0, 0, 0) diff --git a/external/vulkancts/modules/vulkan/amber/CMakeLists.txt b/external/vulkancts/modules/vulkan/amber/CMakeLists.txt index e8bf139..59e3ce0 100644 --- a/external/vulkancts/modules/vulkan/amber/CMakeLists.txt +++ b/external/vulkancts/modules/vulkan/amber/CMakeLists.txt @@ -8,8 +8,6 @@ set(DEQP_VK_AMBER_SRCS vktAmberTestCase.hpp vktAmberTestCase.cpp vktAmberTestCaseUtil.cpp - vktAmberExampleTests.hpp - vktAmberExampleTests.cpp vktAmberGraphicsFuzzTests.hpp vktAmberGraphicsFuzzTests.cpp vktAmberGlslTests.hpp diff --git a/external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.cpp b/external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.cpp deleted file mode 100644 index 579b122..0000000 --- a/external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/*------------------------------------------------------------------------ - * Vulkan Conformance Tests - * ------------------------ - * - * Copyright (c) 2019 Google LLC - * Copyright (c) 2019 The Khronos Group Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *//*! - * \file - * \brief Functional tests using amber - *//*--------------------------------------------------------------------*/ - -#include "vktTestGroupUtil.hpp" -#include "vktAmberExampleTests.hpp" -#include "vktAmberTestCase.hpp" - -namespace vkt -{ -namespace cts_amber -{ -namespace -{ - -void createAmberTests (tcu::TestCaseGroup* tests) -{ - tcu::TestContext& testCtx = tests->getTestContext(); - - tests->addChild(createAmberTestCase(testCtx, // tcu::TestContext testCtx - "clear", // const char* name - "Example clear test", // const char* description - "example", // const char* category - "clear.amber")); // const std::string& filename -} - -} // anonymous - -tcu::TestCaseGroup* createExampleTests (tcu::TestContext& testCtx) -{ - return createTestGroup(testCtx, "amber-example", "Amber Tests", createAmberTests); -} - -} // cts_amber -} // vkt diff --git a/external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.hpp b/external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.hpp deleted file mode 100644 index 1c7c8e4..0000000 --- a/external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.hpp +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _VKTAMBEREXAMPLETESTS_HPP -#define _VKTAMBEREXAMPLETESTS_HPP -/*------------------------------------------------------------------------ - * Vulkan Conformance Tests - * ------------------------ - * - * Copyright (c) 2019 Google LLC - * Copyright (c) 2019 The Khronos Group Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *//*! - * \file - * \brief Functional tests using Amber - *//*--------------------------------------------------------------------*/ - -#include "tcuDefs.hpp" -#include "tcuTestCase.hpp" - -namespace vkt -{ -namespace cts_amber -{ - -tcu::TestCaseGroup* createExampleTests (tcu::TestContext& testCtx); - -} // cts_amber -} // vkt - -#endif // _VKTAMBEREXAMPLETESTS_HPP diff --git a/external/vulkancts/modules/vulkan/vktTestPackage.cpp b/external/vulkancts/modules/vulkan/vktTestPackage.cpp index b9202c8..3564b72 100644 --- a/external/vulkancts/modules/vulkan/vktTestPackage.cpp +++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp @@ -90,7 +90,6 @@ #include "vktProtectedMemTests.hpp" #include "vktDeviceGroupTests.hpp" #include "vktMemoryModelTests.hpp" -#include "vktAmberExampleTests.hpp" #include "vktAmberGraphicsFuzzTests.hpp" #include "vktAmberGlslTests.hpp" #include "vktImagelessFramebufferTests.hpp" @@ -528,7 +527,6 @@ void TestPackage::init (void) addChild(DeviceGroup::createTests (m_testCtx)); addChild(MemoryModel::createTests (m_testCtx)); addChild(conditional::createTests (m_testCtx)); - addChild(cts_amber::createExampleTests (m_testCtx)); addChild(cts_amber::createGraphicsFuzzTests (m_testCtx)); addChild(imageless::createTests (m_testCtx)); addChild(TransformFeedback::createTests (m_testCtx)); diff --git a/external/vulkancts/mustpass/master/src/excluded-tests.txt b/external/vulkancts/mustpass/master/src/excluded-tests.txt index 1f893ac..511fbcb 100644 --- a/external/vulkancts/mustpass/master/src/excluded-tests.txt +++ b/external/vulkancts/mustpass/master/src/excluded-tests.txt @@ -2,9 +2,6 @@ dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercubeshadow_fragment dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercubeshadow_vertex -# Excluded Amber example tests -dEQP-VK.amber-example.* - #VK-GL-CTS 1274 dEQP-VK.rasterization.interpolation.basic.lines_wide dEQP-VK.rasterization.interpolation.projected.line_strip_wide