Skip to content

A
angle
Commit 23ff18f9 by angle-autoroll Committed by Commit Bot
Options

Roll vulkan-deps from 42d8716d0294 to c5559fe406e3 (24 revisions)

https://chromium.googlesource.com/vulkan-deps.git/+log/42d8716d0294..c5559fe406e3 Changed dependencies: * glslang: https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang.git/+log/18eef33bd7..56b17b2f2d * spirv-cross: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross.git/+log/c624d5387c..72a2ec4c1b * spirv-tools: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+log/22b82872b4..8ec9f456e6 * vulkan-headers: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers.git/+log/074fa3055c..3f437c4a94 * vulkan-loader: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader.git/+log/d0f1abe22e..5dcea8a449 * vulkan-tools: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools.git/+log/eb3d67bd17..4ee5f2a8be * vulkan-validation-layers: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers.git/+log/f6b4a3dea4..7ab4afe505 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/vulkan-deps-angle-autoroll Please CC jonahr@google.com,ynovikov@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md Bug: angleproject:5905 Tbr: jonahr@google.com,ynovikov@google.com Change-Id: I462413910900b8dc38b3e88b78d9ff2e10b103b0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2863562Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent a4588e33
Showing with 16 additions and 11 deletions
DEPS
...@@ -489,7 +489,7 @@ deps = { ...@@ -489,7 +489,7 @@ deps = {
}, },
'third_party/vulkan-deps': { 'third_party/vulkan-deps': {
'url': '{chromium_git}/vulkan-deps@42d8716d02941f47870776a9c273de1effc51b1a', 'url': '{chromium_git}/vulkan-deps@c5559fe406e3d83fc46c0ed2246460b680cd9f55',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
......
scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
...@@ -10,5 +10,5 @@ ...@@ -10,5 +10,5 @@
"src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp": "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp":
"4d9b8f552adb1bf953e77540f021ea0c", "4d9b8f552adb1bf953e77540f021ea0c",
"third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml": "third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml":
"c19528e246351b6be49048e1eb0b8dcb" "9028baf120fc7cad62d79f781575c1ff"
} }
\ No newline at end of file
src/common/vulkan/vk_ext_provoking_vertex.h
...@@ -18,10 +18,7 @@ ...@@ -18,10 +18,7 @@
#include "vk_headers.h" #include "vk_headers.h"
// THIS FILE SHOULD BE DELETED IF VK_EXT_provoking_vertex IS EVER ADDED TO THE VULKAN HEADERS // THIS FILE SHOULD BE DELETED IF VK_EXT_provoking_vertex IS EVER ADDED TO THE VULKAN HEADERS
#ifdef VK_EXT_provoking_vertex #ifndef VK_EXT_provoking_vertex
# error \
"VK_EXT_provoking_vertex is already defined in the Vulkan headers, you can delete this file"
#endif
static constexpr VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT = static constexpr VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT =
static_cast<VkStructureType>(1000254000); static_cast<VkStructureType>(1000254000);
...@@ -31,9 +28,9 @@ static constexpr VkStructureType ...@@ -31,9 +28,9 @@ static constexpr VkStructureType
static constexpr VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT = static constexpr VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT =
static_cast<VkStructureType>(1000254002); static_cast<VkStructureType>(1000254002);
#define VK_EXT_provoking_vertex 1 # define VK_EXT_provoking_vertex 1
#define VK_EXT_PROVOKING_VERTEX_SPEC_VERSION 1 # define VK_EXT_PROVOKING_VERTEX_SPEC_VERSION 1
#define VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME "VK_EXT_provoking_vertex" # define VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME "VK_EXT_provoking_vertex"
typedef enum VkProvokingVertexModeEXT typedef enum VkProvokingVertexModeEXT
{ {
...@@ -66,5 +63,6 @@ typedef struct VkPipelineRasterizationProvokingVertexStateCreateInfoEXT ...@@ -66,5 +63,6 @@ typedef struct VkPipelineRasterizationProvokingVertexStateCreateInfoEXT
const void *pNext; const void *pNext;
VkProvokingVertexModeEXT provokingVertexMode; VkProvokingVertexModeEXT provokingVertexMode;
} VkPipelineRasterizationProvokingVertexStateCreateInfoEXT; } VkPipelineRasterizationProvokingVertexStateCreateInfoEXT;
#endif // VK_EXT_provoking_vertex
#endif // CUSTOM_VK_EXT_PROVOKING_VERTEX_H_ #endif // CUSTOM_VK_EXT_PROVOKING_VERTEX_H_
src/libANGLE/renderer/vulkan/RendererVk.cpp
...@@ -36,6 +36,12 @@ ...@@ -36,6 +36,12 @@
#include "libANGLE/trace.h" #include "libANGLE/trace.h"
#include "platform/PlatformMethods.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 // Consts
namespace namespace
{ {
...@@ -1597,7 +1603,7 @@ angle::Result RendererVk::initializeDevice(DisplayVk *displayVk, uint32_t queueF ...@@ -1597,7 +1603,7 @@ angle::Result RendererVk::initializeDevice(DisplayVk *displayVk, uint32_t queueF
if (getFeatures().supportsRenderPassStoreOpNoneQCOM.enabled) if (getFeatures().supportsRenderPassStoreOpNoneQCOM.enabled)
{ {
enabledDeviceExtensions.push_back(VK_QCOM_render_pass_store_ops_EXTENSION_NAME); enabledDeviceExtensions.push_back(VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME);
} }
if (getFeatures().supportsImageFormatList.enabled) if (getFeatures().supportsImageFormatList.enabled)
...@@ -2274,7 +2280,7 @@ void RendererVk::initFeatures(DisplayVk *displayVk, ...@@ -2274,7 +2280,7 @@ void RendererVk::initFeatures(DisplayVk *displayVk,
ANGLE_FEATURE_CONDITION( ANGLE_FEATURE_CONDITION(
&mFeatures, supportsRenderPassStoreOpNoneQCOM, &mFeatures, supportsRenderPassStoreOpNoneQCOM,
ExtensionFound(VK_QCOM_render_pass_store_ops_EXTENSION_NAME, deviceExtensionNames)); ExtensionFound(VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME, deviceExtensionNames));
ANGLE_FEATURE_CONDITION(&mFeatures, supportsTransformFeedbackExtension, ANGLE_FEATURE_CONDITION(&mFeatures, supportsTransformFeedbackExtension,
mTransformFeedbackFeatures.transformFeedback == VK_TRUE); mTransformFeedbackFeatures.transformFeedback == VK_TRUE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment