From 9bb5479831db58a6cedd5c599260f276a5700856 Mon Sep 17 00:00:00 2001
From: Pyry Haulos <phaulos@google.com>
Date: Thu, 4 May 2017 13:18:55 -0700
Subject: [PATCH] Remove vktWsiTests.cpp.orig

VK-GL-CTS issue: 402

Change-Id: Ib72fcd8b8ff39013f6cd3093ee9160be320be2b0
---
 .../modules/vulkan/wsi/vktWsiTests.cpp.orig        | 74 ----------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp.orig

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp.orig b/external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp.orig
deleted file mode 100644
index b79d23a..0000000
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp.orig
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-------------------------------------------------------------------------
- * Vulkan Conformance Tests
- * ------------------------
- *
- * Copyright (c) 2016 Google 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 WSI Tests
- *//*--------------------------------------------------------------------*/
-
-#include "vktWsiTests.hpp"
-#include "vktTestGroupUtil.hpp"
-#include "vkWsiUtil.hpp"
-
-#include "vktWsiSurfaceTests.hpp"
-#include "vktWsiSwapchainTests.hpp"
-<<<<<<< HEAD
-#include "vktWsiIncrementalPresentTests.hpp"
-=======
-#include "vktWsiDisplayTests.hpp"
->>>>>>> 6ca3153... VK_KHR_display and VK_KHR_display_swapchain extensions tests
-#include "vktWsiDisplayTimingTests.hpp"
-
-
-namespace vkt
-{
-namespace wsi
-{
-
-namespace
-{
-
-void createTypeSpecificTests (tcu::TestCaseGroup* testGroup, vk::wsi::Type wsiType)
-{
-	addTestGroup(testGroup, "surface",				"VkSurface Tests",				createSurfaceTests,				wsiType);
-	addTestGroup(testGroup, "swapchain",			"VkSwapchain Tests",			createSwapchainTests,			wsiType);
-	addTestGroup(testGroup, "incremental_present",	"Incremental present tests",	createIncrementalPresentTests,	wsiType);
-	addTestGroup(testGroup, "display_timing",		"Display Timing Tests",			createDisplayTimingTests,		wsiType);
-}
-
-void createWsiTests (tcu::TestCaseGroup* apiTests)
-{
-	for (int typeNdx = 0; typeNdx < vk::wsi::TYPE_LAST; ++typeNdx)
-	{
-		const vk::wsi::Type	wsiType	= (vk::wsi::Type)typeNdx;
-
-		addTestGroup(apiTests, getName(wsiType), "", createTypeSpecificTests, wsiType);
-	}
-
-	addTestGroup(apiTests, "display", "Display coverage tests", createDisplayCoverageTests);
-}
-
-} // anonymous
-
-tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx)
-{
-	return createTestGroup(testCtx, "wsi", "WSI Tests", createWsiTests);
-}
-
-} // wsi
-} // vkt
-- 
2.7.4