Follow up on Vulkan headers update to 1.2.177

src/common/vulkan/BUILD.gn

@@ -15,7 +15,6 @@ config("angle_vulkan_headers_config") {
 
 angle_source_set("angle_vulkan_headers") {
   sources = [
-    "vk_ext_provoking_vertex.h",
     "vk_google_filtering_precision.h",
     "vk_headers.h",
   ]

src/common/vulkan/vk_ext_provoking_vertex.h

-// Copyright 2019 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.
-
-#ifndef CUSTOM_VK_EXT_PROVOKING_VERTEX_H_
-#define CUSTOM_VK_EXT_PROVOKING_VERTEX_H_
-
-#include "vk_headers.h"
-
-// THIS FILE SHOULD BE DELETED IF VK_EXT_provoking_vertex IS EVER ADDED TO THE VULKAN HEADERS
-#ifndef VK_EXT_provoking_vertex
-
-static constexpr VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT =
-    static_cast<VkStructureType>(1000254000);
-static constexpr VkStructureType
-    VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT =
-        static_cast<VkStructureType>(1000254001);
-static constexpr VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT =
-    static_cast<VkStructureType>(1000254002);
-
-#    define VK_EXT_provoking_vertex 1
-#    define VK_EXT_PROVOKING_VERTEX_SPEC_VERSION 1
-#    define VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME "VK_EXT_provoking_vertex"
-
-typedef enum VkProvokingVertexModeEXT
-{
-    VK_PROVOKING_VERTEX_MODE_FIRST_VERTEX_EXT = 0,
-    VK_PROVOKING_VERTEX_MODE_LAST_VERTEX_EXT  = 1,
-    VK_PROVOKING_VERTEX_MODE_BEGIN_RANGE_EXT  = VK_PROVOKING_VERTEX_MODE_FIRST_VERTEX_EXT,
-    VK_PROVOKING_VERTEX_MODE_END_RANGE_EXT    = VK_PROVOKING_VERTEX_MODE_LAST_VERTEX_EXT,
-    VK_PROVOKING_VERTEX_MODE_RANGE_SIZE_EXT =
-        (VK_PROVOKING_VERTEX_MODE_LAST_VERTEX_EXT - VK_PROVOKING_VERTEX_MODE_FIRST_VERTEX_EXT + 1),
-    VK_PROVOKING_VERTEX_MODE_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkProvokingVertexModeEXT;
-
-typedef struct VkPhysicalDeviceProvokingVertexFeaturesEXT
-{
-    VkStructureType sType;
-    void *pNext;
-    VkBool32 provokingVertexLast;
-} VkPhysicalDeviceProvokingVertexFeaturesEXT;
-
-typedef struct VkPhysicalDeviceProvokingVertexPropertiesEXT
-{
-    VkStructureType sType;
-    void *pNext;
-    VkBool32 provokingVertexModePerPipeline;
-} VkPhysicalDeviceProvokingVertexPropertiesEXT;
-
-typedef struct VkPipelineRasterizationProvokingVertexStateCreateInfoEXT
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkProvokingVertexModeEXT provokingVertexMode;
-} VkPipelineRasterizationProvokingVertexStateCreateInfoEXT;
-#endif  // VK_EXT_provoking_vertex
-
-#endif  // CUSTOM_VK_EXT_PROVOKING_VERTEX_H_

src/common/vulkan/vulkan_icd.cpp

@@ -15,7 +15,6 @@
 #include "common/debug.h"
 #include "common/system_utils.h"
 
-#include "common/vulkan/vk_ext_provoking_vertex.h"
 #include "common/vulkan/vk_google_filtering_precision.h"
 
 namespace

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -36,12 +36,6 @@
 #include "libANGLE/trace.h"
 #include "platform/PlatformMethods.h"
 
-// TODO(ynovikov): http://anglebug.com/5905 remove once vulkan headers 1.2.177 roll into Chrome
-#ifndef VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME
-#    define VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME \
-        VK_QCOM_render_pass_store_ops_EXTENSION_NAME
-#endif  // VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME
-
 // Consts
 namespace
 {

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -17,8 +17,6 @@
 #include <queue>
 #include <thread>
 
-#include "common/vulkan/vk_ext_provoking_vertex.h"
-
 #include "common/PackedEnums.h"
 #include "common/PoolAlloc.h"
 #include "common/angleutils.h"