aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJuan Ramos <[email protected]>2023-01-19 09:52:26 -0700
committerJuan Ramos <[email protected]>2023-01-19 10:02:09 -0700
commit6f62a95edbfee23f5d375cae1d4ad2fd678f92ba (patch)
treee678417ccabee25874a63a9757b656afbb8fc446
parent2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8 (diff)
downloadVulkan-Headers-6f62a95edbfee23f5d375cae1d4ad2fd678f92ba.tar.gz
Vulkan-Headers-6f62a95edbfee23f5d375cae1d4ad2fd678f92ba.zip
build: Remove vk_sdk_platform.h
Users have already been warned about this file being deprecated.
-rw-r--r--BUILD.gn2
-rw-r--r--CONTRIBUTING.md1
-rw-r--r--include/vulkan/vk_sdk_platform.h81
-rw-r--r--tests/CMakeLists.txt5
-rw-r--r--tests/vk_sdk_platform.c6
5 files changed, 0 insertions, 95 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 2261004..5aea8d6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -51,7 +51,6 @@ source_set("vulkan_headers") {
"include/vulkan/vk_icd.h",
"include/vulkan/vk_layer.h",
"include/vulkan/vk_platform.h",
- "include/vulkan/vk_sdk_platform.h",
"include/vulkan/vulkan.h",
"include/vulkan/vulkan.hpp",
"include/vulkan/vulkan_core.h",
@@ -66,4 +65,3 @@ source_set("vulkan_headers") {
]
public_configs = [ ":vulkan_headers_config" ]
}
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e4d96bc..fccaa9f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,6 @@ The majority for the Vulkan headers come from [Vulkan-Docs](https://github.com/K
* Non-API headers
* include/vulkan/vk_icd.h
* include/vulkan/vk_layer.h
- * include/vulkan/vk_sdk_platform.h (deprecated)
### Specification repository (https://github.com/KhronosGroup/Vulkan-Docs)
diff --git a/include/vulkan/vk_sdk_platform.h b/include/vulkan/vk_sdk_platform.h
deleted file mode 100644
index 3bdf505..0000000
--- a/include/vulkan/vk_sdk_platform.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// File: vk_sdk_platform.h
-//
-/*
- * Copyright (c) 2015-2023 LunarG, Inc.
- * Copyright (c) 2015-2023 The Khronos Group Inc.
- * Copyright (c) 2015-2023 Valve Corporation
- *
- * 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.
- */
-#pragma once
-
-// Allow users to suppress warnings generated by this header file by defining VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING
-#ifndef VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING
-
-#if defined(__GNUC__) && __GNUC__ >= 4
-#warning "vk_sdk_platform.h is deprecated and will be removed in future release! Use VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING to suppress warning!"
-#endif
-
-// MSVC doesn't support warning directive
-#if defined(_MSC_VER)
-#pragma message("vk_sdk_platform.h is deprecated and will be removed in future release! Use VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING to suppress warning!")
-#endif
-
-#endif
-
-#if defined(_WIN32)
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#ifndef __cplusplus
-#undef inline
-#define inline __inline
-#endif // __cplusplus
-
-#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/)
-// C99:
-// Microsoft didn't implement C99 in Visual Studio; but started adding it with
-// VS2013. However, VS2013 still didn't have snprintf(). The following is a
-// work-around (Note: The _CRT_SECURE_NO_WARNINGS macro must be set in the
-// "CMakeLists.txt" file).
-// NOTE: This is fixed in Visual Studio 2015.
-#define snprintf _snprintf
-#endif
-
-#define strdup _strdup
-
-#endif // _WIN32
-
-// Check for noexcept support using clang, with fallback to Windows or GCC version numbers
-#ifndef NOEXCEPT
-#if defined(__clang__)
-#if __has_feature(cxx_noexcept)
-#define HAS_NOEXCEPT
-#endif
-#else
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) && __GNUC__ * 10 + __GNUC_MINOR__ >= 46
-#define HAS_NOEXCEPT
-#else
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026 && defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS
-#define HAS_NOEXCEPT
-#endif
-#endif
-#endif
-
-#ifdef HAS_NOEXCEPT
-#define NOEXCEPT noexcept
-#else
-#define NOEXCEPT
-#endif
-#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2d2a3ce..eab59fa 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,8 +38,3 @@ target_link_libraries(vk_icd PRIVATE Vulkan::Headers)
# vk_layer.h
add_library(vk_layer MODULE vk_layer.c)
target_link_libraries(vk_layer PRIVATE Vulkan::Headers)
-
-# vk_sdk_platform.h
-add_executable(vk_sdk_platform vk_sdk_platform.c)
-target_link_libraries(vk_sdk_platform PRIVATE Vulkan::Headers)
-target_compile_definitions(vk_sdk_platform PRIVATE VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING)
diff --git a/tests/vk_sdk_platform.c b/tests/vk_sdk_platform.c
deleted file mode 100644
index 750e538..0000000
--- a/tests/vk_sdk_platform.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "vulkan/vk_sdk_platform.h"
-
-int main()
-{
- return 0;
-}