Manual roll vulkan-deps from 4f7de8f463f8 to d34de7171c18 (1 revision)
Manual roll requested by ynovikov@google.com
Due to https://github.com/KhronosGroup/Vulkan-Headers/pull/534
including <vulkan/vulkan.h> now causes <X11/Xlib.h> to be included,
which breaks the build because of the macros it defines.
To workaround, undefine these macros after vulkan.h include.
https://chromium.googlesource.com/vulkan-deps.git/+log/4f7de8f463f8..d34de7171c18
Also rolling transitive DEPS:
952f776f65..0f0cfd88d7
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-chromium-autoroll
Please CC angle-team@google.com,cwallez@google.com,geofflang@google.com,radial-bots+chrome-roll@google.com,radial-bots@google.com,webgpu-developers@google.com,ynovikov@google.com on the revert to ensure that a human
is aware of the problem.
To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry
To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;luci.chromium.try:linux-swangle-try-x64;luci.chromium.try:win-swangle-try-x86;luci.chromium.try:dawn-linux-x64-deps-rel;luci.chromium.try:win-asan;luci.chromium.try:linux_chromium_cfi_rel_ng
Bug: 345261080
Change-Id: I8892ba56563f5d6cf21bd2d7b5882163d5dff356
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6359023
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Victor Miura <vmiura@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Peter McNeeley <petermcneeley@google.com>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1434234}
This commit is contained in:
chromium-autoroll
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
4bc6136ed9
commit
5cce79d8ba
DEPS
components/exo/wayland/clients
gpu
command_buffer
service
shared_image
vulkan
media/gpu/vaapi
third_party
ui/ozone/platform/x11
4
DEPS
4
DEPS
@ -2839,12 +2839,12 @@ deps = {
|
||||
'dep_type': 'cipd',
|
||||
},
|
||||
|
||||
'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@4f7de8f463f890bea8f20aba385db4a25678a0f2',
|
||||
'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@d34de7171c18502aa3e2eb3d348ff6f665a01d29',
|
||||
'src/third_party/glslang/src': '{chromium_git}/external/github.com/KhronosGroup/glslang@0e5ff759622e16fa55e515895ca049a9056d68be',
|
||||
'src/third_party/spirv-cross/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@b8fcf307f1f347089e3c46eb4451d27f32ebc8d3',
|
||||
'src/third_party/spirv-headers/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@54a521dd130ae1b2f38fef79b09515702d135bdd',
|
||||
'src/third_party/spirv-tools/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@d3fc6ed183bd375538d3ca6d45d160470b3b6cdc',
|
||||
'src/third_party/vulkan-headers/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@952f776f6573aafbb62ea717d871cd1d6816c387',
|
||||
'src/third_party/vulkan-headers/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@0f0cfd88d7e6ece3ca6456df692f0055bde94be7',
|
||||
'src/third_party/vulkan-loader/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@1bc9d032a89ef9b09e5b395d2f93fcd59fedf8ad',
|
||||
'src/third_party/vulkan-tools/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@dd0c2e4afdf11fcec55902c92865e57768af928a',
|
||||
'src/third_party/vulkan-utility-libraries/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@50563f48368d75281bc2fb1c3407dc531ce28910',
|
||||
|
||||
@ -53,6 +53,16 @@
|
||||
#include <gbm.h>
|
||||
#if defined(USE_VULKAN)
|
||||
#include <vulkan/vulkan.h>
|
||||
// vulkan.h includes <X11/Xlib.h> when VK_USE_PLATFORM_XLIB_KHR is defined
|
||||
// after https://github.com/KhronosGroup/Vulkan-Headers/pull/534.
|
||||
// This defines some macros which break build, so undefine them here.
|
||||
#undef Always
|
||||
#undef Bool
|
||||
#undef False
|
||||
#undef None
|
||||
#undef Status
|
||||
#undef Success
|
||||
#undef True
|
||||
#endif // defined(USE_GBM)
|
||||
#endif // defined(USE_VULKAN)
|
||||
|
||||
|
||||
@ -6,6 +6,17 @@
|
||||
#define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_SKIA_VK_OZONE_IMAGE_REPRESENTATION_H_
|
||||
|
||||
#include <vulkan/vulkan.h>
|
||||
// vulkan.h includes <X11/Xlib.h> when VK_USE_PLATFORM_XLIB_KHR is defined
|
||||
// after https://github.com/KhronosGroup/Vulkan-Headers/pull/534.
|
||||
// This defines some macros which break build, so undefine them here.
|
||||
#undef Always
|
||||
#undef Bool
|
||||
#undef False
|
||||
#undef None
|
||||
#undef Status
|
||||
#undef Success
|
||||
#undef True
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "base/memory/scoped_refptr.h"
|
||||
|
||||
@ -416,6 +416,75 @@ def GenerateHeaderFile(out_file):
|
||||
#define GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
|
||||
|
||||
#include <vulkan/vulkan.h>
|
||||
// vulkan.h includes <X11/Xlib.h> when VK_USE_PLATFORM_XLIB_KHR is defined
|
||||
// after https://github.com/KhronosGroup/Vulkan-Headers/pull/534.
|
||||
// This defines some macros which break build, so undefine them here.
|
||||
#undef Above
|
||||
#undef AllTemporary
|
||||
#undef AlreadyGrabbed
|
||||
#undef Always
|
||||
#undef AsyncBoth
|
||||
#undef AsyncKeyboard
|
||||
#undef AsyncPointer
|
||||
#undef Below
|
||||
#undef Bool
|
||||
#undef BottomIf
|
||||
#undef Button1
|
||||
#undef Button2
|
||||
#undef Button3
|
||||
#undef Button4
|
||||
#undef Button5
|
||||
#undef ButtonPress
|
||||
#undef ButtonRelease
|
||||
#undef ClipByChildren
|
||||
#undef Complex
|
||||
#undef Convex
|
||||
#undef CopyFromParent
|
||||
#undef CurrentTime
|
||||
#undef DestroyAll
|
||||
#undef DirectColor
|
||||
#undef DisplayString
|
||||
#undef EnterNotify
|
||||
#undef GrayScale
|
||||
#undef IncludeInferiors
|
||||
#undef InputFocus
|
||||
#undef InputOnly
|
||||
#undef InputOutput
|
||||
#undef KeyPress
|
||||
#undef KeyRelease
|
||||
#undef LSBFirst
|
||||
#undef LeaveNotify
|
||||
#undef LowerHighest
|
||||
#undef MSBFirst
|
||||
#undef Nonconvex
|
||||
#undef None
|
||||
#undef NotUseful
|
||||
#undef Opposite
|
||||
#undef ParentRelative
|
||||
#undef PointerRoot
|
||||
#undef PointerWindow
|
||||
#undef PseudoColor
|
||||
#undef RaiseLowest
|
||||
#undef ReplayKeyboard
|
||||
#undef ReplayPointer
|
||||
#undef RetainPermanent
|
||||
#undef RetainTemporary
|
||||
#undef StaticColor
|
||||
#undef StaticGray
|
||||
#undef Success
|
||||
#undef SyncBoth
|
||||
#undef SyncKeyboard
|
||||
#undef SyncPointer
|
||||
#undef TopIf
|
||||
#undef TrueColor
|
||||
#undef Unsorted
|
||||
#undef WhenMapped
|
||||
#undef XYBitmap
|
||||
#undef XYPixmap
|
||||
#undef YSorted
|
||||
#undef YXBanded
|
||||
#undef YXSorted
|
||||
#undef ZPixmap
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
||||
@ -12,6 +12,75 @@
|
||||
#define GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
|
||||
|
||||
#include <vulkan/vulkan.h>
|
||||
// vulkan.h includes <X11/Xlib.h> when VK_USE_PLATFORM_XLIB_KHR is defined
|
||||
// after https://github.com/KhronosGroup/Vulkan-Headers/pull/534.
|
||||
// This defines some macros which break build, so undefine them here.
|
||||
#undef Above
|
||||
#undef AllTemporary
|
||||
#undef AlreadyGrabbed
|
||||
#undef Always
|
||||
#undef AsyncBoth
|
||||
#undef AsyncKeyboard
|
||||
#undef AsyncPointer
|
||||
#undef Below
|
||||
#undef Bool
|
||||
#undef BottomIf
|
||||
#undef Button1
|
||||
#undef Button2
|
||||
#undef Button3
|
||||
#undef Button4
|
||||
#undef Button5
|
||||
#undef ButtonPress
|
||||
#undef ButtonRelease
|
||||
#undef ClipByChildren
|
||||
#undef Complex
|
||||
#undef Convex
|
||||
#undef CopyFromParent
|
||||
#undef CurrentTime
|
||||
#undef DestroyAll
|
||||
#undef DirectColor
|
||||
#undef DisplayString
|
||||
#undef EnterNotify
|
||||
#undef GrayScale
|
||||
#undef IncludeInferiors
|
||||
#undef InputFocus
|
||||
#undef InputOnly
|
||||
#undef InputOutput
|
||||
#undef KeyPress
|
||||
#undef KeyRelease
|
||||
#undef LSBFirst
|
||||
#undef LeaveNotify
|
||||
#undef LowerHighest
|
||||
#undef MSBFirst
|
||||
#undef Nonconvex
|
||||
#undef None
|
||||
#undef NotUseful
|
||||
#undef Opposite
|
||||
#undef ParentRelative
|
||||
#undef PointerRoot
|
||||
#undef PointerWindow
|
||||
#undef PseudoColor
|
||||
#undef RaiseLowest
|
||||
#undef ReplayKeyboard
|
||||
#undef ReplayPointer
|
||||
#undef RetainPermanent
|
||||
#undef RetainTemporary
|
||||
#undef StaticColor
|
||||
#undef StaticGray
|
||||
#undef Success
|
||||
#undef SyncBoth
|
||||
#undef SyncKeyboard
|
||||
#undef SyncPointer
|
||||
#undef TopIf
|
||||
#undef TrueColor
|
||||
#undef Unsorted
|
||||
#undef WhenMapped
|
||||
#undef XYBitmap
|
||||
#undef XYPixmap
|
||||
#undef YSorted
|
||||
#undef YXBanded
|
||||
#undef YXSorted
|
||||
#undef ZPixmap
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
||||
@ -5,6 +5,10 @@
|
||||
#include "media/gpu/vaapi/vaapi_video_decoder.h"
|
||||
|
||||
#include <vulkan/vulkan.h>
|
||||
// vulkan.h includes <X11/Xlib.h> when VK_USE_PLATFORM_XLIB_KHR is defined
|
||||
// after https://github.com/KhronosGroup/Vulkan-Headers/pull/534.
|
||||
// This defines some macros which break build, so undefine them here.
|
||||
#undef Status
|
||||
|
||||
#include <limits>
|
||||
#include <vector>
|
||||
|
||||
2
third_party/vulkan-deps
vendored
2
third_party/vulkan-deps
vendored
Submodule third_party/vulkan-deps updated: 4f7de8f463...d34de7171c
2
third_party/vulkan-headers/src
vendored
2
third_party/vulkan-headers/src
vendored
Submodule third_party/vulkan-headers/src updated: 952f776f65...0f0cfd88d7
@ -6,6 +6,74 @@
|
||||
#define UI_OZONE_PLATFORM_X11_VULKAN_SURFACE_X11_H_
|
||||
|
||||
#include <vulkan/vulkan.h>
|
||||
// vulkan.h includes <X11/Xlib.h> when VK_USE_PLATFORM_XLIB_KHR is defined
|
||||
// after https://github.com/KhronosGroup/Vulkan-Headers/pull/534.
|
||||
// This defines some macros which break build, so undefine them here.
|
||||
#undef Above
|
||||
#undef AllTemporary
|
||||
#undef AlreadyGrabbed
|
||||
#undef Always
|
||||
#undef AsyncBoth
|
||||
#undef AsyncKeyboard
|
||||
#undef AsyncPointer
|
||||
#undef Below
|
||||
#undef BottomIf
|
||||
#undef Button1
|
||||
#undef Button2
|
||||
#undef Button3
|
||||
#undef Button4
|
||||
#undef Button5
|
||||
#undef ButtonPress
|
||||
#undef ButtonRelease
|
||||
#undef ClipByChildren
|
||||
#undef Complex
|
||||
#undef Convex
|
||||
#undef CopyFromParent
|
||||
#undef CurrentTime
|
||||
#undef DestroyAll
|
||||
#undef DirectColor
|
||||
#undef DisplayString
|
||||
#undef EnterNotify
|
||||
#undef GrayScale
|
||||
#undef IncludeInferiors
|
||||
#undef InputFocus
|
||||
#undef InputOnly
|
||||
#undef InputOutput
|
||||
#undef KeyPress
|
||||
#undef KeyRelease
|
||||
#undef LSBFirst
|
||||
#undef LeaveNotify
|
||||
#undef LowerHighest
|
||||
#undef MSBFirst
|
||||
#undef Nonconvex
|
||||
#undef None
|
||||
#undef NotUseful
|
||||
#undef Opposite
|
||||
#undef ParentRelative
|
||||
#undef PointerRoot
|
||||
#undef PointerWindow
|
||||
#undef PseudoColor
|
||||
#undef RaiseLowest
|
||||
#undef ReplayKeyboard
|
||||
#undef ReplayPointer
|
||||
#undef RetainPermanent
|
||||
#undef RetainTemporary
|
||||
#undef StaticColor
|
||||
#undef StaticGray
|
||||
#undef Success
|
||||
#undef SyncBoth
|
||||
#undef SyncKeyboard
|
||||
#undef SyncPointer
|
||||
#undef TopIf
|
||||
#undef TrueColor
|
||||
#undef Unsorted
|
||||
#undef WhenMapped
|
||||
#undef XYBitmap
|
||||
#undef XYPixmap
|
||||
#undef YSorted
|
||||
#undef YXBanded
|
||||
#undef YXSorted
|
||||
#undef ZPixmap
|
||||
|
||||
#include "gpu/vulkan/vulkan_surface.h"
|
||||
#include "ui/gfx/x/connection.h"
|
||||
|
||||
Reference in New Issue
Block a user