Skip to content

A
angle
Commit 03b333b4 by Jamie Madill Committed by Commit Bot
Options

Vulkan: Fix Clang warning and fix build.

The data_deps section for angle_vulkan was referencing a variable that didn't exist (no warning for this). Fix the deps which also then exposes the build problem with the layers with Clang in 32-bit. Also fix not propagating the Win32 defines to the layer utils. BUG=chromium:708835 Change-Id: I4a457bfabf1ca735d3f3f3d8b0f0823cfa834b84 Reviewed-on: https://chromium-review.googlesource.com/470087 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent bf67aa80
Showing with 38 additions and 22 deletions
gni/angle.gni
...@@ -15,8 +15,7 @@ if (is_win) { ...@@ -15,8 +15,7 @@ if (is_win) {
angle_enable_d3d9 = true angle_enable_d3d9 = true
angle_enable_d3d11 = true angle_enable_d3d11 = true
angle_enable_gl = true angle_enable_gl = true
# TODO(jmadill): Re-enable Vulkan after roll. angle_enable_vulkan = true
angle_enable_vulkan = false
import("//build/config/win/visual_studio_version.gni") import("//build/config/win/visual_studio_version.gni")
} else if (is_linux && use_x11 && !is_chromeos) { } else if (is_linux && use_x11 && !is_chromeos) {
......
src/vulkan_support/BUILD.gn
...@@ -155,6 +155,26 @@ group("vulkan_generate_helper_files") { ...@@ -155,6 +155,26 @@ group("vulkan_generate_helper_files") {
} }
} }
config("vulkan_config") {
if (is_win) {
defines = [
"VK_USE_PLATFORM_WIN32_KHR",
"VK_USE_PLATFORM_WIN32_KHX",
]
}
}
config("vulkan_internal_config") {
defines = [ "VULKAN_NON_CMAKE_BUILD" ]
if (is_clang || !is_win) {
cflags = [ "-Wno-unused-function" ]
# See https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1649
# TODO(jmadill): Lift this once github issue is fixed.
cflags += [ "-Wno-ignored-attributes" ]
}
}
# Vulkan loader # Vulkan loader
# ------------- # -------------
...@@ -166,25 +186,12 @@ config("vulkan_loader_config") { ...@@ -166,25 +186,12 @@ config("vulkan_loader_config") {
"DEFAULT_VK_LAYERS_PATH=\".\"", "DEFAULT_VK_LAYERS_PATH=\".\"",
"API_NAME=\"Vulkan\"", "API_NAME=\"Vulkan\"",
] ]
if (is_win) { if (is_win) {
defines += [
"VK_USE_PLATFORM_WIN32_KHR",
"VK_USE_PLATFORM_WIN32_KHX",
]
cflags = [ "/wd4201" ] cflags = [ "/wd4201" ]
} }
} }
config("vulkan_loader_internal_config") {
defines = [ "VULKAN_NON_CMAKE_BUILD" ]
if (is_clang || !is_win) {
cflags = [
"-Wno-unused-function",
"-Wno-ignored-attributes",
]
}
}
static_library("vulkan_loader") { static_library("vulkan_loader") {
sources = rebase_path(vulkan_gypi.vulkan_loader_sources, ".", "src") sources = rebase_path(vulkan_gypi.vulkan_loader_sources, ".", "src")
if (is_win) { if (is_win) {
...@@ -196,8 +203,11 @@ static_library("vulkan_loader") { ...@@ -196,8 +203,11 @@ static_library("vulkan_loader") {
deps = [ deps = [
":vulkan_generate_helper_files", ":vulkan_generate_helper_files",
] ]
configs += [ ":vulkan_loader_internal_config" ] configs += [ ":vulkan_internal_config" ]
public_configs = [ ":vulkan_loader_config" ] public_configs = [
":vulkan_config",
":vulkan_loader_config",
]
configs -= vulkan_undefine_configs configs -= vulkan_undefine_configs
} }
...@@ -343,7 +353,11 @@ source_set("vulkan_layer_table") { ...@@ -343,7 +353,11 @@ source_set("vulkan_layer_table") {
public_deps = [ public_deps = [
":vulkan_generate_helper_files", ":vulkan_generate_helper_files",
] ]
public_configs = [ ":vulkan_layer_config" ] public_configs = [
":vulkan_config",
":vulkan_layer_config",
":vulkan_internal_config",
]
sources = [ sources = [
"$target_gen_dir/angle/vulkan/vk_dispatch_table_helper.h", "$target_gen_dir/angle/vulkan/vk_dispatch_table_helper.h",
"$target_gen_dir/angle/vulkan/vk_enum_string_helper.h", "$target_gen_dir/angle/vulkan/vk_enum_string_helper.h",
...@@ -402,8 +416,9 @@ action("vulkan_gen_json_files") { ...@@ -402,8 +416,9 @@ action("vulkan_gen_json_files") {
source_set("vulkan_layer_utils") { source_set("vulkan_layer_utils") {
sources = rebase_path(vulkan_gypi.vulkan_layer_utils_sources, ".", "src") sources = rebase_path(vulkan_gypi.vulkan_layer_utils_sources, ".", "src")
public_configs = [ public_configs = [
":vulkan_config",
":vulkan_loader_config", ":vulkan_loader_config",
":vulkan_loader_internal_config", ":vulkan_internal_config",
] ]
public_deps = [ public_deps = [
":vulkan_generate_helper_files", ":vulkan_generate_helper_files",
...@@ -449,10 +464,12 @@ group("angle_vulkan") { ...@@ -449,10 +464,12 @@ group("angle_vulkan") {
data_deps = [ data_deps = [
":vulkan_gen_json_files", ":vulkan_gen_json_files",
] ]
foreach(layer, layer_names) { foreach(layer_info, layers) {
data_deps += [ ":VkLayer_$layer" ] name = layer_info[0]
data_deps += [ ":VkLayer_$name" ]
} }
public_configs = [ public_configs = [
":vulkan_config",
":vulkan_loader_config", ":vulkan_loader_config",
":glslang_config", ":glslang_config",
] ]
......
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