diff options
author | Shahbaz Youssefi <syoussefi@google.com> | 2023-11-27 15:41:41 -0500 |
---|---|---|
committer | swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-12-06 20:00:51 +0000 |
commit | 77be35e337bb80df52c5ea4dd4cf2d2072abad25 (patch) | |
tree | 5f8ed066b25c28b9cd01f81d25d0d210667667d7 | |
parent | 4befa3ada54ce2fbdadb2383712da70811efe85e (diff) | |
download | swiftshader-77be35e337bb80df52c5ea4dd4cf2d2072abad25.tar.gz |
Remove VK_GOOGLE_sampler_filtering_precision
Bug: chromium:726075
Change-Id: I4829838a180af9845692c8cb440049fc65e018f9
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/72728
Tested-by: Shahbaz Youssefi <syoussefi@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
-rw-r--r-- | include/vulkan/vk_google_filtering_precision.h | 41 | ||||
-rw-r--r-- | src/Vulkan/VkStringify.cpp | 5 | ||||
-rw-r--r-- | src/Vulkan/VulkanPlatform.hpp | 1 | ||||
-rw-r--r-- | src/Vulkan/libVulkan.cpp | 8 |
4 files changed, 0 insertions, 55 deletions
diff --git a/include/vulkan/vk_google_filtering_precision.h b/include/vulkan/vk_google_filtering_precision.h deleted file mode 100644 index 65e3bcf11..000000000 --- a/include/vulkan/vk_google_filtering_precision.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2020 The SwiftShader Authors. All Rights Reserved. -// -// 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. - -#include "vulkan_core.h" - -// THIS FILE SHOULD BE DELETED IF VK_GOOGLE_sampler_filtering_precision IS EVER ADDED TO THE VULKAN HEADERS -#ifdef VK_GOOGLE_sampler_filtering_precision -#error "VK_GOOGLE_sampler_filtering_precision is already defined in the Vulkan headers, you can delete this file" -#endif - -static constexpr VkStructureType VK_STRUCTURE_TYPE_SAMPLER_FILTERING_PRECISION_GOOGLE = static_cast<VkStructureType>(1000264000); - -#define VK_GOOGLE_sampler_filtering_precisions 1 -#define VK_GOOGLE_SAMPLER_FILTERING_PRECISION_SPEC_VERSION 1 -#define VK_GOOGLE_SAMPLER_FILTERING_PRECISION_EXTENSION_NAME "VK_GOOGLE_sampler_filtering_precision" - -typedef enum VkSamplerFilteringPrecisionModeGOOGLE { - VK_SAMPLER_FILTERING_PRECISION_MODE_LOW_GOOGLE = 0, - VK_SAMPLER_FILTERING_PRECISION_MODE_HIGH_GOOGLE = 1, - VK_SAMPLER_FILTERING_PRECISION_MODE_BEGIN_RANGE_GOOGLE = VK_SAMPLER_FILTERING_PRECISION_MODE_LOW_GOOGLE, - VK_SAMPLER_FILTERING_PRECISION_MODE_END_RANGE_GOOGLE = VK_SAMPLER_FILTERING_PRECISION_MODE_HIGH_GOOGLE, - VK_SAMPLER_FILTERING_PRECISION_MODE_RANGE_SIZE_GOOGLE = (VK_SAMPLER_FILTERING_PRECISION_MODE_HIGH_GOOGLE - VK_SAMPLER_FILTERING_PRECISION_MODE_LOW_GOOGLE + 1), - VK_SAMPLER_FILTERING_PRECISION_MODE_MAX_ENUM_GOOGLE = 0x7FFFFFFF -} VkSamplerFilteringPrecisionModeGOOGLE; - -typedef struct VkSamplerFilteringPrecisionGOOGLE { - VkStructureType sType; - const void* pNext; - VkSamplerFilteringPrecisionModeGOOGLE samplerFilteringPrecisionMode; -} VkSamplerFilteringPrecisionGOOGLE; diff --git a/src/Vulkan/VkStringify.cpp b/src/Vulkan/VkStringify.cpp index 87dbe1554..f78125a44 100644 --- a/src/Vulkan/VkStringify.cpp +++ b/src/Vulkan/VkStringify.cpp @@ -16,7 +16,6 @@ #include "System/Debug.hpp" -#include <vulkan/vk_google_filtering_precision.h> #define VULKAN_HPP_NO_EXCEPTIONS #define VULKAN_HPP_NAMESPACE vkhpp #include <vulkan/vulkan.hpp> @@ -30,10 +29,6 @@ std::string Stringify(VkStructureType value) { default: return vkhpp::to_string(static_cast<vkhpp::StructureType>(value)); - - // TODO(b/174746309): This structure's extension has not been upstreamed yet. - case VK_STRUCTURE_TYPE_SAMPLER_FILTERING_PRECISION_GOOGLE: - return "SamplerFilteringPrecisionGOOGLE"; } #else // In Release builds we avoid a dependency on vkhpp::to_string() to reduce binary size. diff --git a/src/Vulkan/VulkanPlatform.hpp b/src/Vulkan/VulkanPlatform.hpp index 8e736d41c..90e53131e 100644 --- a/src/Vulkan/VulkanPlatform.hpp +++ b/src/Vulkan/VulkanPlatform.hpp @@ -49,7 +49,6 @@ public: typedef VkNonDispatchableHandle<object##Ptr> object; \ template class VkNonDispatchableHandle<object##Ptr>; -#include <vulkan/vk_google_filtering_precision.h> #include <vulkan/vulkan_core.h> #endif // VULKAN_PLATFORM diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp index 4d9a94d9e..30b34b6bb 100644 --- a/src/Vulkan/libVulkan.cpp +++ b/src/Vulkan/libVulkan.cpp @@ -404,9 +404,6 @@ static const ExtensionProperties deviceExtensionProperties[] = { { { VK_FUCHSIA_EXTERNAL_MEMORY_EXTENSION_NAME, VK_FUCHSIA_EXTERNAL_MEMORY_SPEC_VERSION } }, #endif { { VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME, VK_EXT_PROVOKING_VERTEX_SPEC_VERSION } }, -#if !defined(__ANDROID__) - { { VK_GOOGLE_SAMPLER_FILTERING_PRECISION_EXTENSION_NAME, VK_GOOGLE_SAMPLER_FILTERING_PRECISION_SPEC_VERSION } }, -#endif { { VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME, VK_EXT_DEPTH_RANGE_UNRESTRICTED_SPEC_VERSION } }, #ifdef SWIFTSHADER_DEVICE_MEMORY_REPORT { { VK_EXT_DEVICE_MEMORY_REPORT_EXTENSION_NAME, VK_EXT_DEVICE_MEMORY_REPORT_SPEC_VERSION } }, @@ -2498,11 +2495,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSampler(VkDevice device, const VkSamplerC ycbcrConversion = vk::Cast(samplerYcbcrConversionInfo->conversion); } break; -#if !defined(__ANDROID__) - case VK_STRUCTURE_TYPE_SAMPLER_FILTERING_PRECISION_GOOGLE: - // Ignore. Deprecated. - break; -#endif case VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT: { const VkSamplerCustomBorderColorCreateInfoEXT *borderColorInfo = |