Skip to content

Commit

Permalink
Rename //third_party/vulkan to //third_party/vulkan_headers
Browse files Browse the repository at this point in the history
Rename //third_party/vulkan to //third_party/vulkan_headers to match
upstream project name, also update BUILD.gn for the change.

TBR=egdaniel@google.com

Change-Id: Ie7b0acc6798b640780e2772f6dc93b9fb0deb10e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2196931
Commit-Queue: Peng Huang <penghuang@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768008}
  • Loading branch information
phuang authored and Commit Bot committed May 12, 2020
1 parent de5d2b8 commit 4e068b2
Show file tree
Hide file tree
Showing 28 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion components/viz/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if (enable_vulkan) {
"gpu/vulkan_in_process_context_provider.h",
"viz_vulkan_context_provider_export.h",
]
configs = [ "//third_party/vulkan:vulkan_config" ]
configs = [ "//third_party/vulkan_headers:vulkan_headers_config" ]

public_deps = [ "//skia" ]

Expand Down
2 changes: 1 addition & 1 deletion components/viz/common/gpu/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include_rules = [
"+third_party/dawn/src/include",
"+third_party/khronos/GLES2/gl2.h",
"+third_party/skia/include/gpu",
"+third_party/vulkan/include",
"+third_party/vulkan_headers/include",
]

specific_include_rules = {
Expand Down
2 changes: 1 addition & 1 deletion components/viz/common/gpu/vulkan_context_provider.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "components/viz/common/viz_vulkan_context_provider_export.h"
#include "third_party/vulkan/include/vulkan/vulkan.h"
#include "third_party/vulkan_headers/include/vulkan/vulkan.h"

class GrContext;
class GrVkSecondaryCBDrawContext;
Expand Down
2 changes: 1 addition & 1 deletion components/viz/common/resources/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ include_rules = [
"+third_party/dawn/src/include",
"+third_party/khronos/GLES2",
"+third_party/skia",
"+third_party/vulkan",
"+third_party/vulkan_headers",
]
2 changes: 1 addition & 1 deletion components/viz/common/resources/resource_format_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "ui/gfx/buffer_types.h"

#if BUILDFLAG(ENABLE_VULKAN)
#include "third_party/vulkan/include/vulkan/vulkan.h"
#include "third_party/vulkan_headers/include/vulkan/vulkan.h"
#endif

namespace viz {
Expand Down
3 changes: 2 additions & 1 deletion gpu/config/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ if (enable_vulkan) {
deps = [ "//gpu/ipc/common:vulkan_interface" ]
public_deps = [ "//ui/gfx" ]

all_dependent_configs = [ "//third_party/vulkan:vulkan_config" ]
all_dependent_configs =
[ "//third_party/vulkan_headers:vulkan_headers_config" ]

# surpass linke error 4217. It is because vulkan_info depends on
# //gpu/ipc/common:vulkan_interface and //gpu/ipc/common:vulkan_interface"
Expand Down
2 changes: 1 addition & 1 deletion gpu/config/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ include_rules = [
"+components/crash/core/common/crash_key.h",
"+media/media_buildflags.h",
"+third_party/skia",
"+third_party/vulkan/include/vulkan/vulkan.h",
"+third_party/vulkan_headers/include/vulkan/vulkan.h",
]
2 changes: 1 addition & 1 deletion gpu/config/gpu_info_collector_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "base/win/windows_version.h"
#include "build/branding_buildflags.h"
#include "gpu/config/gpu_util.h"
#include "third_party/vulkan/include/vulkan/vulkan.h"
#include "third_party/vulkan_headers/include/vulkan/vulkan.h"
#include "ui/gl/direct_composition_surface_win.h"

namespace gpu {
Expand Down
2 changes: 1 addition & 1 deletion gpu/config/gpu_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "gpu/config/gpu_preferences.h"
#include "gpu/config/gpu_switches.h"
#include "gpu/vulkan/buildflags.h"
#include "third_party/vulkan/include/vulkan/vulkan.h"
#include "third_party/vulkan_headers/include/vulkan/vulkan.h"
#include "ui/gfx/extension_set.h"
#include "ui/gl/buildflags.h"
#include "ui/gl/gl_switches.h"
Expand Down
3 changes: 2 additions & 1 deletion gpu/ipc/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ component("vulkan_ycbcr_info") {
source_set("vulkan_types") {
sources = [ "vulkan_types.h" ]
public_deps = [ "//ui/gfx" ]
all_dependent_configs = [ "//third_party/vulkan:vulkan_config" ]
all_dependent_configs =
[ "//third_party/vulkan_headers:vulkan_headers_config" ]
configs += [ "//gpu:gpu_implementation" ]
}

Expand Down
2 changes: 1 addition & 1 deletion gpu/vulkan/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if (enable_vulkan) {

all_dependent_configs = [
":vulkan_config",
"//third_party/vulkan:vulkan_config",
"//third_party/vulkan_headers:vulkan_headers_config",
]

defines = [ "IS_VULKAN_IMPL" ]
Expand Down
2 changes: 1 addition & 1 deletion skia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ config("skia_config") {
}
if (enable_vulkan) {
include_dirs += [ "//third_party/vulkan/include" ]
configs = [ "//third_party/vulkan:vulkan_config" ]
configs = [ "//third_party/vulkan_headers:vulkan_headers_config" ]
}

defines = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

config("vulkan_config") {
config("vulkan_headers_config") {
defines = [ "VK_NO_PROTOTYPES" ]
include_dirs = [ "include" ]
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 4e068b2

Please sign in to comment.