diff --git a/DEPS b/DEPS index b9e9b378de..e033425b9a 100644 --- a/DEPS +++ b/DEPS @@ -103,13 +103,13 @@ deps = { # Khronos Vulkan-Headers 'third_party/vulkan-headers': { - 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@d287523f48dba1b669866c5d6625b29931948e39', + 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@e01f13e1f777cf592ebd1a5f4836d4cd10ed85f6', 'condition': 'dawn_standalone', }, # Khronos Vulkan-ValidationLayers 'third_party/vulkan-validation-layers': { - 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@237d818e81fbffa073d29d94f53a2cbac4f25b9f', + 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@1533266eac486fae0c34bffe4868c4bc91dbe078', 'condition': 'dawn_standalone', }, diff --git a/build_overrides/vulkan_headers.gni b/build_overrides/vulkan_headers.gni new file mode 100644 index 0000000000..4c0047a0d9 --- /dev/null +++ b/build_overrides/vulkan_headers.gni @@ -0,0 +1,17 @@ +# Copyright 2020 The Dawn Authors +# +# 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. + +# Fake the vulkan_use_x11 when inside Dawn's repository +import("../scripts/dawn_features.gni") +vulkan_use_x11 = dawn_use_x11 diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni index d430597405..491afbcdfa 100644 --- a/build_overrides/vulkan_validation_layers.gni +++ b/build_overrides/vulkan_validation_layers.gni @@ -22,3 +22,7 @@ vvl_glslang_dir = "//third_party/glslang" # Subdirectories for generated files vulkan_data_subdir = "vulkandata" vulkan_gen_subdir = "" + +# Fake the use_x11 when inside Dawn's repository +import("../scripts/dawn_features.gni") +use_x11 = dawn_use_x11