Skip to content

A
angle
Commit 2328d65a by Jamie Madill Committed by Commit Bot
Options

Revert "GN: Componentize vulkan back-end build."

This reverts commit d46e2fb1. Reason for revert: Broke Vulkan angle_end2end_tests. Bug: angleproject:3954 Original change's description: > GN: Componentize vulkan back-end build. > > This moves the build configuration into the Vulkan back-end dir. > This should be a little easier to maintain as all Vulkan-related > config is in one place. > > Note that this should not interfere with Skia's build as they do > not import the Vulkan back-end sources. > > One additional possiblity that this enables is testing other > compile-time permutations of the Vulkan back-end more easily. For > example we could make a simple change to enable compile testing > of the Vulkan back-end with custom command buffers disabled. > > Also fixes a few errors affecting less tested configs. > > Bug: angleproject:3943 > Change-Id: Iaf819936896e4f5d3e6415ed16ab0c940e46cdb6 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1829662 > Commit-Queue: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Tobin Ehlis <tobine@google.com> TBR=tobine@google.com,jonahr@google.com,jmadill@chromium.org Change-Id: I7cf3db4f6b7d8b779625ea2491172bb429b498a9 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:3943 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1837233Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent fd092e85
Showing with 531 additions and 590 deletions
BUILD.gn
...@@ -29,6 +29,9 @@ declare_args() { ...@@ -29,6 +29,9 @@ declare_args() {
# Don't build extra (test, samples etc) for Windows UWP. We don't have # Don't build extra (test, samples etc) for Windows UWP. We don't have
# infrastructure (e.g. windowing helper functions) in place to run them. # infrastructure (e.g. windowing helper functions) in place to run them.
angle_build_all = !angle_is_winuwp angle_build_all = !angle_is_winuwp
# Currently SwiftShader's Vulkan front-end doesn't build on Android.
angle_swiftshader = !is_android
} }
if (!build_with_chromium && angle_build_all) { if (!build_with_chromium && angle_build_all) {
...@@ -100,6 +103,12 @@ config("internal_config") { ...@@ -100,6 +103,12 @@ config("internal_config") {
defines += [ "ANGLE_IS_32_BIT_CPU" ] defines += [ "ANGLE_IS_32_BIT_CPU" ]
} }
if (angle_enable_vulkan) {
if (angle_enable_vulkan_gpu_trace_events) {
defines += [ "ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS=1" ]
}
}
if (angle_enable_trace) { if (angle_enable_trace) {
defines += [ "ANGLE_ENABLE_DEBUG_TRACE=1" ] defines += [ "ANGLE_ENABLE_DEBUG_TRACE=1" ]
} }
...@@ -198,7 +207,6 @@ angle_static_library("preprocessor") { ...@@ -198,7 +207,6 @@ angle_static_library("preprocessor") {
public_deps = [ public_deps = [
":angle_common", ":angle_common",
":angle_translator_headers",
] ]
} }
...@@ -293,18 +301,11 @@ config("angle_image_util_config") { ...@@ -293,18 +301,11 @@ config("angle_image_util_config") {
] ]
} }
angle_source_set("angle_image_util_headers") {
sources = libangle_image_util_headers
public_deps = [
":angle_common",
]
}
angle_static_library("angle_image_util") { angle_static_library("angle_image_util") {
sources = libangle_image_util_sources sources = libangle_image_util_sources
public_configs += [ ":angle_image_util_config" ] public_configs += [ ":angle_image_util_config" ]
public_deps = [ public_deps = [
":angle_image_util_headers", ":angle_common",
] ]
} }
...@@ -386,13 +387,6 @@ angle_static_library("angle_gpu_info_util") { ...@@ -386,13 +387,6 @@ angle_static_library("angle_gpu_info_util") {
} }
} }
angle_source_set("angle_translator_headers") {
sources = angle_translator_exported_headers
public_deps = [
":includes",
]
}
angle_static_library("translator") { angle_static_library("translator") {
sources = angle_translator_sources sources = angle_translator_sources
defines = [] defines = []
...@@ -426,7 +420,6 @@ angle_static_library("translator") { ...@@ -426,7 +420,6 @@ angle_static_library("translator") {
public_deps = [ public_deps = [
":angle_common", ":angle_common",
":angle_translator_headers",
] ]
if (is_win) { if (is_win) {
...@@ -513,6 +506,12 @@ config("angle_backend_config") { ...@@ -513,6 +506,12 @@ config("angle_backend_config") {
defines += [ "ANGLE_ENABLE_OPENGL_NULL" ] defines += [ "ANGLE_ENABLE_OPENGL_NULL" ]
} }
} }
if (angle_enable_vulkan) {
defines += [ "ANGLE_ENABLE_VULKAN" ]
if (angle_enable_custom_vulkan_cmd_buffers) {
defines += [ "ANGLE_USE_CUSTOM_VULKAN_CMD_BUFFERS=1" ]
}
}
if (angle_enable_null) { if (angle_enable_null) {
defines += [ "ANGLE_ENABLE_NULL" ] defines += [ "ANGLE_ENABLE_NULL" ]
} }
...@@ -547,12 +546,111 @@ config("libANGLE_config") { ...@@ -547,12 +546,111 @@ config("libANGLE_config") {
} }
} }
angle_source_set("libANGLE_headers") { if (angle_enable_vulkan) {
sources = libangle_headers config("vulkan_config") {
public_deps = [ defines = [
":angle_common", "ANGLE_VK_LAYERS_DIR=\"$angle_data_dir\"",
":angle_translator_headers", "ANGLE_VK_MOCK_ICD_JSON=\"$angle_data_dir/VkICD_mock_icd.json\"",
] "ANGLE_VK_SWIFTSHADER_ICD_JSON=\"swiftshader/libvk_swiftshader_icd.json\"",
]
if (is_android) {
libs = [ "vulkan" ]
}
if (angle_enable_vulkan_validation_layers) {
defines += [ "ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT" ]
}
}
if (angle_swiftshader) {
copy("angle_swiftshader_icd_rename") {
sources = [
"$swiftshader_dir/src/Vulkan/vk_swiftshader_icd.json",
]
outputs = [
"$root_gen_dir/angle/libvk_swiftshader_icd.json",
]
}
action("angle_swiftshader_icd") {
deps = [
":angle_swiftshader_icd_rename",
]
script = "scripts/generate_vulkan_layers_json.py"
sources = [
"third_party/vulkan-headers/src/include/vulkan/vulkan_core.h",
]
# Must be listed after vulkan_core.h. git cl format sorts them if they
# are in one list. So split up the sources manually.
sources += [ "$root_gen_dir/angle/libvk_swiftshader_icd.json" ]
outputs = [
"$root_out_dir/swiftshader/libvk_swiftshader_icd.json",
]
data = outputs
_raw_sws_in = rebase_path("$root_gen_dir/angle", root_build_dir)
_raw_sws_out = rebase_path("$root_out_dir/swiftshader", root_build_dir)
_sws_output = ""
if (is_win) {
_sws_output += "vk_swiftshader.dll"
} else if (is_mac) {
_sws_output += "libvk_swiftshader.dylib"
} else {
_sws_output += "libvk_swiftshader.so"
}
args = [
"--icd",
"--replacement",
_sws_output,
_raw_sws_in,
_raw_sws_out,
] + rebase_path(sources, root_build_dir)
}
}
# Use this target to include everything ANGLE needs for Vulkan.
group("angle_vulkan") {
public_deps = [
"$angle_root/third_party/vulkan-headers/src:vulkan_headers",
]
public_configs = [ ":vulkan_config" ]
deps = []
data_deps = []
if (!is_android && !is_fuchsia) {
deps += [ "$angle_root/third_party/vulkan-loader/src:libvulkan" ]
data_deps += [ "$angle_root/third_party/vulkan-tools/src:VkICD_mock_icd" ]
public_configs +=
[ "$angle_root/third_party/vulkan-loader/src:vulkan_loader_config" ]
}
if (is_fuchsia) {
public_deps += [
"$angle_root/src/common/fuchsia_egl",
"//third_party/fuchsia-sdk:vulkan_base",
"//third_party/fuchsia-sdk/sdk:vulkan",
]
}
if (angle_enable_vulkan_validation_layers) {
if (is_fuchsia) {
deps += [ "//third_party/fuchsia-sdk:vulkan_validation" ]
} else {
data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_validation_layers" ]
if (!is_android) {
data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_gen_json_files" ]
}
}
}
if (angle_swiftshader) {
data_deps += [
":angle_swiftshader_icd",
"$swiftshader_dir/src/Vulkan:swiftshader_libvulkan",
]
}
}
} }
angle_source_set("libANGLE_base") { angle_source_set("libANGLE_base") {
...@@ -569,7 +667,6 @@ angle_source_set("libANGLE_base") { ...@@ -569,7 +667,6 @@ angle_source_set("libANGLE_base") {
":angle_common", ":angle_common",
":angle_gpu_info_util", ":angle_gpu_info_util",
":angle_version", ":angle_version",
":libANGLE_headers",
":translator", ":translator",
] ]
deps = [ deps = [
...@@ -577,10 +674,6 @@ angle_source_set("libANGLE_base") { ...@@ -577,10 +674,6 @@ angle_source_set("libANGLE_base") {
":includes", ":includes",
] ]
if (angle_enable_vulkan) {
public_deps += [ "src/libANGLE/renderer/vulkan:angle_vulkan_backend" ]
}
# Enable extra Chromium style warnings for libANGLE. # Enable extra Chromium style warnings for libANGLE.
if (is_clang) { if (is_clang) {
suppressed_configs -= [ "//build/config/clang:find_bad_constructs" ] suppressed_configs -= [ "//build/config/clang:find_bad_constructs" ]
...@@ -655,6 +748,39 @@ angle_source_set("libANGLE_base") { ...@@ -655,6 +748,39 @@ angle_source_set("libANGLE_base") {
} }
} }
if (angle_enable_vulkan) {
sources += libangle_vulkan_sources
if (is_win) {
sources += libangle_vulkan_win32_sources
}
if (is_linux) {
sources += libangle_vulkan_xcb_sources
}
if (is_fuchsia) {
sources += libangle_vulkan_fuchsia_sources
deps += [
"$angle_root/src/common/fuchsia_egl",
"$angle_root/src/common/fuchsia_egl:backend",
]
}
if (is_android) {
sources += libangle_vulkan_android_sources
libs += [ "vulkan" ]
}
deps += [
":angle_vulkan",
"${angle_glslang_dir}:glslang_default_resource_limits_sources",
"${angle_glslang_dir}:glslang_sources",
"${angle_spirv_tools_dir}:spvtools_val",
]
public_deps +=
[ "$angle_root/third_party/vulkan-headers/src:vulkan_headers" ]
# Include generated shaders.
import("src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.gni")
sources += angle_vulkan_internal_shaders
}
if (angle_enable_null) { if (angle_enable_null) {
sources += libangle_null_sources sources += libangle_null_sources
} }
...@@ -1063,8 +1189,8 @@ foreach(is_shared_library, ...@@ -1063,8 +1189,8 @@ foreach(is_shared_library,
if (is_fuchsia) { if (is_fuchsia) {
sources += util_fuchsia_sources sources += util_fuchsia_sources
public_deps += [ public_deps += [
":angle_vulkan",
"$angle_root/src/common/fuchsia_egl", "$angle_root/src/common/fuchsia_egl",
"src/libANGLE/renderer/vulkan:angle_vulkan",
"//third_party/fuchsia-sdk/sdk:async_loop_cpp", "//third_party/fuchsia-sdk/sdk:async_loop_cpp",
"//third_party/fuchsia-sdk/sdk:async_loop_default", "//third_party/fuchsia-sdk/sdk:async_loop_default",
"//third_party/fuchsia-sdk/sdk:fdio", "//third_party/fuchsia-sdk/sdk:fdio",
......
gni/angle.gni
...@@ -87,6 +87,14 @@ declare_args() { ...@@ -87,6 +87,14 @@ declare_args() {
angle_enable_vulkan && !is_ubsan && !is_tsan && !is_asan && angle_enable_vulkan && !is_ubsan && !is_tsan && !is_asan &&
(is_debug || dcheck_always_on) (is_debug || dcheck_always_on)
if (angle_enable_vulkan) {
# Enable Vulkan GPU trace event capability
angle_enable_vulkan_gpu_trace_events = false
# Enable custom (cpu-side) secondary command buffers
angle_enable_custom_vulkan_cmd_buffers = true
}
# Disable overlay by default # Disable overlay by default
angle_enable_overlay = false angle_enable_overlay = false
} }
......
scripts/code_generation_hashes/Vulkan_internal_shader_programs.json
{ {
"src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py": "src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
"8a13b2f4f77d51928db01eceb2c4ad44", "b05fa7c291a7c05d9bb1dd075990275b",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc": "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc":
"31832c377e532cd5ea05aab57154b8f8", "31832c377e532cd5ea05aab57154b8f8",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc": "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc":
......
src/compiler.gni
...@@ -2,13 +2,6 @@ ...@@ -2,13 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
angle_translator_exported_headers = [
"include/GLSLANG/ShaderLang.h",
"include/GLSLANG/ShaderVars.h",
"src/compiler/translator/blocklayout.h",
"src/compiler/translator/blocklayoutHLSL.h",
]
angle_translator_sources = [ angle_translator_sources = [
"include/EGL/egl.h", "include/EGL/egl.h",
"include/EGL/eglext.h", "include/EGL/eglext.h",
...@@ -20,6 +13,8 @@ angle_translator_sources = [ ...@@ -20,6 +13,8 @@ angle_translator_sources = [
"include/GLES3/gl3platform.h", "include/GLES3/gl3platform.h",
"include/GLES3/gl31.h", "include/GLES3/gl31.h",
"include/GLES3/gl32.h", "include/GLES3/gl32.h",
"include/GLSLANG/ShaderLang.h",
"include/GLSLANG/ShaderVars.h",
"include/KHR/khrplatform.h", "include/KHR/khrplatform.h",
"include/angle_gl.h", "include/angle_gl.h",
"src/compiler/translator/BaseTypes.h", "src/compiler/translator/BaseTypes.h",
...@@ -107,6 +102,7 @@ angle_translator_sources = [ ...@@ -107,6 +102,7 @@ angle_translator_sources = [
"src/compiler/translator/VariablePacker.cpp", "src/compiler/translator/VariablePacker.cpp",
"src/compiler/translator/VariablePacker.h", "src/compiler/translator/VariablePacker.h",
"src/compiler/translator/blocklayout.cpp", "src/compiler/translator/blocklayout.cpp",
"src/compiler/translator/blocklayout.h",
"src/compiler/translator/glslang.h", "src/compiler/translator/glslang.h",
"src/compiler/translator/glslang_lex.cpp", "src/compiler/translator/glslang_lex.cpp",
"src/compiler/translator/glslang_tab.cpp", "src/compiler/translator/glslang_tab.cpp",
...@@ -251,6 +247,7 @@ angle_translator_hlsl_sources = [ ...@@ -251,6 +247,7 @@ angle_translator_hlsl_sources = [
"src/compiler/translator/AtomicCounterFunctionHLSL.cpp", "src/compiler/translator/AtomicCounterFunctionHLSL.cpp",
"src/compiler/translator/AtomicCounterFunctionHLSL.h", "src/compiler/translator/AtomicCounterFunctionHLSL.h",
"src/compiler/translator/blocklayoutHLSL.cpp", "src/compiler/translator/blocklayoutHLSL.cpp",
"src/compiler/translator/blocklayoutHLSL.h",
"src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp", "src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp",
"src/compiler/translator/BuiltInFunctionEmulatorHLSL.h", "src/compiler/translator/BuiltInFunctionEmulatorHLSL.h",
"src/compiler/translator/OutputHLSL.cpp", "src/compiler/translator/OutputHLSL.cpp",
......
src/libANGLE/renderer/vulkan/BUILD.gn deleted 100644 → 0
# Copyright 2019 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# This file houses the build configuration for the ANGLE Vulkan back-end.
import("../../../../gni/angle.gni")
assert(angle_enable_vulkan)
declare_args() {
# Enable custom (cpu-side) secondary command buffers
angle_enable_custom_vulkan_cmd_buffers = true
# Enable Vulkan GPU trace event capability
angle_enable_vulkan_gpu_trace_events = false
# Currently SwiftShader's Vulkan front-end doesn't build on Android.
angle_swiftshader = !is_android
}
_vulkan_backend_sources = [
"BufferVk.cpp",
"BufferVk.h",
"CommandGraph.cpp",
"CommandGraph.h",
"CompilerVk.cpp",
"CompilerVk.h",
"ContextVk.cpp",
"ContextVk.h",
"DeviceVk.cpp",
"DeviceVk.h",
"DisplayVk.cpp",
"DisplayVk.h",
"FenceNVVk.cpp",
"FenceNVVk.h",
"FramebufferVk.cpp",
"FramebufferVk.h",
"GlslangWrapper.cpp",
"GlslangWrapper.h",
"ImageVk.cpp",
"ImageVk.h",
"MemoryObjectVk.cpp",
"MemoryObjectVk.h",
"OverlayVk.cpp",
"OverlayVk.h",
"PersistentCommandPool.cpp",
"PersistentCommandPool.h",
"ProgramVk.cpp",
"ProgramVk.h",
"ProgramPipelineVk.cpp",
"ProgramPipelineVk.h",
"QueryVk.cpp",
"QueryVk.h",
"RenderbufferVk.cpp",
"RenderbufferVk.h",
"RendererVk.cpp",
"RendererVk.h",
"RenderTargetVk.cpp",
"RenderTargetVk.h",
"SamplerVk.cpp",
"SamplerVk.h",
"SecondaryCommandBuffer.cpp",
"SecondaryCommandBuffer.h",
"SemaphoreVk.cpp",
"SemaphoreVk.h",
"ShaderVk.cpp",
"ShaderVk.h",
"SurfaceVk.cpp",
"SurfaceVk.h",
"SyncVk.cpp",
"SyncVk.h",
"TextureVk.cpp",
"TextureVk.h",
"TransformFeedbackVk.cpp",
"TransformFeedbackVk.h",
"UtilsVk.cpp",
"UtilsVk.h",
"VertexArrayVk.cpp",
"VertexArrayVk.h",
"vk_cache_utils.cpp",
"vk_cache_utils.h",
"vk_caps_utils.cpp",
"vk_caps_utils.h",
"vk_format_table_autogen.cpp",
"vk_format_utils.h",
"vk_format_utils.cpp",
"vk_helpers.cpp",
"vk_helpers.h",
"vk_internal_shaders_autogen.h",
"vk_internal_shaders_autogen.cpp",
"vk_mandatory_format_support_table_autogen.cpp",
"vk_utils.cpp",
"vk_utils.h",
"vk_wrapper.h",
]
if (is_android) {
_vulkan_backend_sources += [
"android/DisplayVkAndroid.cpp",
"android/DisplayVkAndroid.h",
"android/HardwareBufferImageSiblingVkAndroid.cpp",
"android/HardwareBufferImageSiblingVkAndroid.h",
"android/WindowSurfaceVkAndroid.cpp",
"android/WindowSurfaceVkAndroid.h",
]
}
if (is_win) {
_vulkan_backend_sources += [
"win32/DisplayVkWin32.cpp",
"win32/DisplayVkWin32.h",
"win32/WindowSurfaceVkWin32.cpp",
"win32/WindowSurfaceVkWin32.h",
]
}
if (is_linux) {
_vulkan_backend_sources += [
"xcb/DisplayVkXcb.cpp",
"xcb/DisplayVkXcb.h",
"xcb/WindowSurfaceVkXcb.cpp",
"xcb/WindowSurfaceVkXcb.h",
]
}
if (is_fuchsia) {
_vulkan_backend_sources += [
"fuchsia/DisplayVkFuchsia.cpp",
"fuchsia/DisplayVkFuchsia.h",
"fuchsia/WindowSurfaceVkFuchsia.cpp",
"fuchsia/WindowSurfaceVkFuchsia.h",
]
}
config("vulkan_config") {
defines = [
"ANGLE_VK_LAYERS_DIR=\"$angle_data_dir\"",
"ANGLE_VK_MOCK_ICD_JSON=\"$angle_data_dir/VkICD_mock_icd.json\"",
"ANGLE_VK_SWIFTSHADER_ICD_JSON=\"swiftshader/libvk_swiftshader_icd.json\"",
]
if (is_android) {
libs = [ "vulkan" ]
}
if (angle_enable_vulkan_validation_layers) {
defines += [ "ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT" ]
}
}
if (angle_swiftshader) {
copy("angle_swiftshader_icd_rename") {
sources = [
"$swiftshader_dir/src/Vulkan/vk_swiftshader_icd.json",
]
outputs = [
"$root_gen_dir/angle/libvk_swiftshader_icd.json",
]
}
action("angle_swiftshader_icd") {
deps = [
":angle_swiftshader_icd_rename",
]
script = "$angle_root/scripts/generate_vulkan_layers_json.py"
sources = [
"$angle_root/third_party/vulkan-headers/src/include/vulkan/vulkan_core.h",
]
# Must be listed after vulkan_core.h. git cl format sorts them if they
# are in one list. So split up the sources manually.
sources += [ "$root_gen_dir/angle/libvk_swiftshader_icd.json" ]
outputs = [
"$root_out_dir/swiftshader/libvk_swiftshader_icd.json",
]
data = outputs
_raw_sws_in = rebase_path("$root_gen_dir/angle", root_build_dir)
_raw_sws_out = rebase_path("$root_out_dir/swiftshader", root_build_dir)
_sws_output = ""
if (is_win) {
_sws_output += "vk_swiftshader.dll"
} else if (is_mac) {
_sws_output += "libvk_swiftshader.dylib"
} else {
_sws_output += "libvk_swiftshader.so"
}
args = [
"--icd",
"--replacement",
_sws_output,
_raw_sws_in,
_raw_sws_out,
] + rebase_path(sources, root_build_dir)
}
}
# Use this target to include everything ANGLE needs for Vulkan.
group("angle_vulkan") {
public_deps = [
"$angle_root/third_party/vulkan-headers/src:vulkan_headers",
]
public_configs = [ ":vulkan_config" ]
deps = []
data_deps = []
if (!is_android && !is_fuchsia) {
deps += [ "$angle_root/third_party/vulkan-loader/src:libvulkan" ]
data_deps += [ "$angle_root/third_party/vulkan-tools/src:VkICD_mock_icd" ]
public_configs +=
[ "$angle_root/third_party/vulkan-loader/src:vulkan_loader_config" ]
}
if (is_fuchsia) {
public_deps += [
"$angle_root/src/common/fuchsia_egl",
"//third_party/fuchsia-sdk:vulkan_base",
"//third_party/fuchsia-sdk/sdk:vulkan",
]
}
if (angle_enable_vulkan_validation_layers) {
if (is_fuchsia) {
deps += [ "//third_party/fuchsia-sdk:vulkan_validation" ]
} else {
data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_validation_layers" ]
if (!is_android) {
data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_gen_json_files" ]
}
}
}
if (angle_swiftshader) {
data_deps += [
":angle_swiftshader_icd",
"$swiftshader_dir/src/Vulkan:swiftshader_libvulkan",
]
}
}
config("angle_vulkan_backend_config") {
defines = [ "ANGLE_ENABLE_VULKAN" ]
if (angle_enable_custom_vulkan_cmd_buffers) {
defines += [ "ANGLE_USE_CUSTOM_VULKAN_CMD_BUFFERS=1" ]
}
if (angle_enable_vulkan_gpu_trace_events) {
defines += [ "ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS=1" ]
}
}
angle_source_set("angle_vulkan_backend") {
sources = _vulkan_backend_sources
libs = []
deps = [
":angle_vulkan",
"$angle_glslang_dir:glslang_default_resource_limits_sources",
"$angle_glslang_dir:glslang_sources",
"$angle_root:angle_image_util",
"$angle_spirv_tools_dir:spvtools_val",
]
public_deps = [
"$angle_root:libANGLE_headers",
"$angle_root/third_party/vulkan-headers/src:vulkan_headers",
]
public_configs = [ ":angle_vulkan_backend_config" ]
if (is_fuchsia) {
deps += [
"$angle_root/src/common/fuchsia_egl",
"$angle_root/src/common/fuchsia_egl:backend",
]
}
if (is_android) {
libs += [ "vulkan" ]
}
# Include generated shaders.
import("vk_internal_shaders_autogen.gni")
sources += angle_vulkan_internal_shaders
}
src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py
...@@ -596,7 +596,7 @@ def get_destroy_call(shader_and_variation): ...@@ -596,7 +596,7 @@ def get_destroy_call(shader_and_variation):
def shader_path(shader): def shader_path(shader):
return '"%s"' % slash(shader) return '"src/libANGLE/renderer/vulkan/%s"' % slash(shader)
def main(): def main():
......
src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.gni
...@@ -9,145 +9,145 @@ ...@@ -9,145 +9,145 @@
# List of generated shaders for inclusion in ANGLE's build process. # List of generated shaders for inclusion in ANGLE's build process.
angle_vulkan_internal_shaders = [ angle_vulkan_internal_shaders = [
"shaders/gen/BlitResolve.frag.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc",
"shaders/gen/BlitResolve.frag.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc",
"shaders/gen/BlitResolve.frag.00000002.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000002.inc",
"shaders/gen/BlitResolve.frag.00000003.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000003.inc",
"shaders/gen/BlitResolve.frag.00000004.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000004.inc",
"shaders/gen/BlitResolve.frag.00000005.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000005.inc",
"shaders/gen/BlitResolve.frag.00000006.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000006.inc",
"shaders/gen/BlitResolve.frag.00000007.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000007.inc",
"shaders/gen/BlitResolve.frag.00000008.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000008.inc",
"shaders/gen/BlitResolve.frag.00000009.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000009.inc",
"shaders/gen/BlitResolve.frag.0000000A.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000A.inc",
"shaders/gen/BlitResolve.frag.0000000B.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000B.inc",
"shaders/gen/BlitResolve.frag.0000000C.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000C.inc",
"shaders/gen/BlitResolve.frag.0000000D.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000D.inc",
"shaders/gen/BlitResolve.frag.0000000E.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000E.inc",
"shaders/gen/BlitResolve.frag.0000000F.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000F.inc",
"shaders/gen/BlitResolve.frag.00000010.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000010.inc",
"shaders/gen/BlitResolve.frag.00000011.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000011.inc",
"shaders/gen/BlitResolve.frag.00000012.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000012.inc",
"shaders/gen/BlitResolve.frag.00000013.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000013.inc",
"shaders/gen/BlitResolve.frag.00000014.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000014.inc",
"shaders/gen/BlitResolve.frag.00000015.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000015.inc",
"shaders/gen/BlitResolve.frag.00000016.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000016.inc",
"shaders/gen/BlitResolve.frag.00000017.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000017.inc",
"shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc",
"shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc",
"shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc",
"shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc",
"shaders/gen/BufferUtils.comp.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc",
"shaders/gen/BufferUtils.comp.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc",
"shaders/gen/BufferUtils.comp.00000002.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc",
"shaders/gen/BufferUtils.comp.00000003.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc",
"shaders/gen/BufferUtils.comp.00000004.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc",
"shaders/gen/BufferUtils.comp.00000005.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc",
"shaders/gen/BufferUtils.comp.00000006.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc",
"shaders/gen/BufferUtils.comp.00000007.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc",
"shaders/gen/BufferUtils.comp.00000008.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc",
"shaders/gen/BufferUtils.comp.00000009.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc",
"shaders/gen/BufferUtils.comp.0000000A.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc",
"shaders/gen/BufferUtils.comp.0000000B.inc", "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc",
"shaders/gen/ConvertIndex.comp.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000000.inc",
"shaders/gen/ConvertIndex.comp.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000001.inc",
"shaders/gen/ConvertIndex.comp.00000002.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000002.inc",
"shaders/gen/ConvertIndex.comp.00000003.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000003.inc",
"shaders/gen/ConvertIndexIndirectLineLoop.comp.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000000.inc",
"shaders/gen/ConvertIndexIndirectLineLoop.comp.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000001.inc",
"shaders/gen/ConvertVertex.comp.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc",
"shaders/gen/ConvertVertex.comp.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc",
"shaders/gen/ConvertVertex.comp.00000002.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc",
"shaders/gen/ConvertVertex.comp.00000003.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc",
"shaders/gen/ConvertVertex.comp.00000004.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc",
"shaders/gen/ConvertVertex.comp.00000005.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc",
"shaders/gen/ConvertVertex.comp.00000006.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc",
"shaders/gen/ConvertVertex.comp.00000007.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc",
"shaders/gen/ConvertVertex.comp.00000008.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc",
"shaders/gen/ConvertVertex.comp.00000009.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc",
"shaders/gen/ConvertVertex.comp.0000000A.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc",
"shaders/gen/ConvertVertex.comp.0000000B.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc",
"shaders/gen/ConvertVertex.comp.0000000C.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc",
"shaders/gen/ConvertVertex.comp.0000000D.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc",
"shaders/gen/ConvertVertex.comp.0000000E.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc",
"shaders/gen/ConvertVertex.comp.0000000F.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc",
"shaders/gen/ConvertVertex.comp.00000010.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000010.inc",
"shaders/gen/ConvertVertex.comp.00000011.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000011.inc",
"shaders/gen/ConvertVertex.comp.00000012.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000012.inc",
"shaders/gen/ConvertVertex.comp.00000013.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000013.inc",
"shaders/gen/ConvertVertex.comp.00000014.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000014.inc",
"shaders/gen/ConvertVertex.comp.00000015.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000015.inc",
"shaders/gen/ConvertVertex.comp.00000016.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000016.inc",
"shaders/gen/ConvertVertex.comp.00000017.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000017.inc",
"shaders/gen/ConvertVertex.comp.00000018.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000018.inc",
"shaders/gen/ConvertVertex.comp.00000019.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000019.inc",
"shaders/gen/ConvertVertex.comp.0000001A.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000001A.inc",
"shaders/gen/ConvertVertex.comp.0000001B.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000001B.inc",
"shaders/gen/ConvertVertex.comp.0000001C.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000001C.inc",
"shaders/gen/ConvertVertex.comp.0000001D.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000001D.inc",
"shaders/gen/ConvertVertex.comp.0000001E.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000001E.inc",
"shaders/gen/ConvertVertex.comp.0000001F.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000001F.inc",
"shaders/gen/ConvertVertex.comp.00000020.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000020.inc",
"shaders/gen/ConvertVertex.comp.00000021.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000021.inc",
"shaders/gen/ConvertVertex.comp.00000022.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000022.inc",
"shaders/gen/ConvertVertex.comp.00000023.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000023.inc",
"shaders/gen/ConvertVertex.comp.00000024.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000024.inc",
"shaders/gen/ConvertVertex.comp.00000025.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000025.inc",
"shaders/gen/ConvertVertex.comp.00000026.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000026.inc",
"shaders/gen/ConvertVertex.comp.00000027.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000027.inc",
"shaders/gen/ConvertVertex.comp.00000028.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000028.inc",
"shaders/gen/ConvertVertex.comp.00000029.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000029.inc",
"shaders/gen/ConvertVertex.comp.0000002A.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000002A.inc",
"shaders/gen/ConvertVertex.comp.0000002B.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000002B.inc",
"shaders/gen/FullScreenQuad.vert.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc",
"shaders/gen/ImageClear.frag.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc",
"shaders/gen/ImageClear.frag.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc",
"shaders/gen/ImageClear.frag.00000002.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc",
"shaders/gen/ImageClear.frag.00000003.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc",
"shaders/gen/ImageClear.frag.00000004.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc",
"shaders/gen/ImageClear.frag.00000005.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc",
"shaders/gen/ImageClear.frag.00000006.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc",
"shaders/gen/ImageClear.frag.00000007.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc",
"shaders/gen/ImageClear.frag.00000008.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc",
"shaders/gen/ImageClear.frag.00000009.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc",
"shaders/gen/ImageClear.frag.0000000A.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc",
"shaders/gen/ImageClear.frag.0000000B.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc",
"shaders/gen/ImageClear.frag.0000000C.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc",
"shaders/gen/ImageClear.frag.0000000D.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc",
"shaders/gen/ImageClear.frag.0000000E.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc",
"shaders/gen/ImageClear.frag.0000000F.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc",
"shaders/gen/ImageClear.frag.00000010.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc",
"shaders/gen/ImageClear.frag.00000011.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc",
"shaders/gen/ImageClear.frag.00000012.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc",
"shaders/gen/ImageClear.frag.00000013.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc",
"shaders/gen/ImageClear.frag.00000014.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc",
"shaders/gen/ImageClear.frag.00000015.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc",
"shaders/gen/ImageClear.frag.00000016.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc",
"shaders/gen/ImageClear.frag.00000017.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc",
"shaders/gen/ImageCopy.frag.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc",
"shaders/gen/ImageCopy.frag.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc",
"shaders/gen/ImageCopy.frag.00000002.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc",
"shaders/gen/ImageCopy.frag.00000003.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc",
"shaders/gen/ImageCopy.frag.00000004.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc",
"shaders/gen/ImageCopy.frag.00000005.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc",
"shaders/gen/ImageCopy.frag.00000008.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc",
"shaders/gen/ImageCopy.frag.00000009.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc",
"shaders/gen/ImageCopy.frag.0000000A.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc",
"shaders/gen/ImageCopy.frag.0000000B.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc",
"shaders/gen/ImageCopy.frag.0000000C.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc",
"shaders/gen/ImageCopy.frag.0000000D.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc",
"shaders/gen/ImageCopy.frag.00000010.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc",
"shaders/gen/ImageCopy.frag.00000011.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc",
"shaders/gen/ImageCopy.frag.00000012.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc",
"shaders/gen/ImageCopy.frag.00000013.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc",
"shaders/gen/ImageCopy.frag.00000014.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc",
"shaders/gen/ImageCopy.frag.00000015.inc", "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc",
"shaders/gen/OverlayCull.comp.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000000.inc",
"shaders/gen/OverlayCull.comp.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000001.inc",
"shaders/gen/OverlayCull.comp.00000002.inc", "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000002.inc",
"shaders/gen/OverlayCull.comp.00000003.inc", "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000003.inc",
"shaders/gen/OverlayCull.comp.00000004.inc", "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000004.inc",
"shaders/gen/OverlayCull.comp.00000005.inc", "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000005.inc",
"shaders/gen/OverlayDraw.comp.00000000.inc", "src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.comp.00000000.inc",
"shaders/gen/OverlayDraw.comp.00000001.inc", "src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.comp.00000001.inc",
] ]
src/libANGLE/renderer/vulkan/vk_wrapper.h
...@@ -281,17 +281,13 @@ class CommandBuffer : public WrappedObject<CommandBuffer, VkCommandBuffer> ...@@ -281,17 +281,13 @@ class CommandBuffer : public WrappedObject<CommandBuffer, VkCommandBuffer>
VkDeviceSize offset, VkDeviceSize offset,
uint32_t drawCount, uint32_t drawCount,
uint32_t stride); uint32_t stride);
void drawIndirect(const Buffer &buffer,
VkDeviceSize offset,
uint32_t drawCount,
uint32_t stride);
VkResult end(); VkResult end();
void endQuery(VkQueryPool queryPool, uint32_t query); void endQuery(VkQueryPool queryPool, uint32_t query);
void endRenderPass(); void endRenderPass();
void executeCommands(uint32_t commandBufferCount, const CommandBuffer *commandBuffers); void executeCommands(uint32_t commandBufferCount, const CommandBuffer *commandBuffers);
void getMemoryUsageStats(size_t *usedMemoryOut, size_t *allocatedMemoryOut) const; void getMemoryUsageStats(size_t *usedMemoryOut, size_t *allocatedMemoryOut);
void executionBarrier(VkPipelineStageFlags stageMask); void executionBarrier(VkPipelineStageFlags stageMask);
...@@ -812,7 +808,7 @@ ANGLE_INLINE void CommandBuffer::executeCommands(uint32_t commandBufferCount, ...@@ -812,7 +808,7 @@ ANGLE_INLINE void CommandBuffer::executeCommands(uint32_t commandBufferCount,
} }
ANGLE_INLINE void CommandBuffer::getMemoryUsageStats(size_t *usedMemoryOut, ANGLE_INLINE void CommandBuffer::getMemoryUsageStats(size_t *usedMemoryOut,
size_t *allocatedMemoryOut) const size_t *allocatedMemoryOut)
{ {
// No data available. // No data available.
*usedMemoryOut = 0; *usedMemoryOut = 0;
...@@ -983,15 +979,6 @@ ANGLE_INLINE void CommandBuffer::drawIndexedIndirect(const Buffer &buffer, ...@@ -983,15 +979,6 @@ ANGLE_INLINE void CommandBuffer::drawIndexedIndirect(const Buffer &buffer,
vkCmdDrawIndexedIndirect(mHandle, buffer.getHandle(), offset, drawCount, stride); vkCmdDrawIndexedIndirect(mHandle, buffer.getHandle(), offset, drawCount, stride);
} }
ANGLE_INLINE void CommandBuffer::drawIndirect(const Buffer &buffer,
VkDeviceSize offset,
uint32_t drawCount,
uint32_t stride)
{
ASSERT(valid());
vkCmdDrawIndirect(mHandle, buffer.getHandle(), offset, drawCount, stride);
}
ANGLE_INLINE void CommandBuffer::dispatch(uint32_t groupCountX, ANGLE_INLINE void CommandBuffer::dispatch(uint32_t groupCountX,
uint32_t groupCountY, uint32_t groupCountY,
uint32_t groupCountZ) uint32_t groupCountZ)
......
src/libGLESv2.gni
...@@ -95,20 +95,17 @@ if (is_win) { ...@@ -95,20 +95,17 @@ if (is_win) {
} }
} }
libangle_image_util_headers = [ libangle_image_util_sources = [
"src/image_util/copyimage.cpp",
"src/image_util/copyimage.h", "src/image_util/copyimage.h",
"src/image_util/copyimage.inc", "src/image_util/copyimage.inc",
"src/image_util/generatemip.h", "src/image_util/generatemip.h",
"src/image_util/generatemip.inc", "src/image_util/generatemip.inc",
"src/image_util/imageformats.cpp",
"src/image_util/imageformats.h", "src/image_util/imageformats.h",
"src/image_util/loadimage.cpp",
"src/image_util/loadimage.h", "src/image_util/loadimage.h",
"src/image_util/loadimage.inc", "src/image_util/loadimage.inc",
]
libangle_image_util_sources = [
"src/image_util/copyimage.cpp",
"src/image_util/imageformats.cpp",
"src/image_util/loadimage.cpp",
"src/image_util/loadimage_etc.cpp", "src/image_util/loadimage_etc.cpp",
] ]
...@@ -153,6 +150,8 @@ libangle_includes = [ ...@@ -153,6 +150,8 @@ libangle_includes = [
"include/GLES3/gl31.h", "include/GLES3/gl31.h",
"include/GLES3/gl31ext_explicit_context_autogen.inc", "include/GLES3/gl31ext_explicit_context_autogen.inc",
"include/GLES3/gl32.h", "include/GLES3/gl32.h",
"include/GLSLANG/ShaderLang.h",
"include/GLSLANG/ShaderVars.h",
"include/KHR/khrplatform.h", "include/KHR/khrplatform.h",
"include/WGL/wgl.h", "include/WGL/wgl.h",
"include/platform/Feature.h", "include/platform/Feature.h",
...@@ -163,17 +162,24 @@ libangle_includes = [ ...@@ -163,17 +162,24 @@ libangle_includes = [
"include/platform/Platform.h", "include/platform/Platform.h",
] ]
libangle_headers = [ libangle_sources = [
"src/libANGLE/AttributeMap.cpp",
"src/libANGLE/AttributeMap.h", "src/libANGLE/AttributeMap.h",
"src/libANGLE/BinaryStream.h", "src/libANGLE/BinaryStream.h",
"src/libANGLE/BlobCache.cpp",
"src/libANGLE/BlobCache.h", "src/libANGLE/BlobCache.h",
"src/libANGLE/Buffer.cpp",
"src/libANGLE/Buffer.h", "src/libANGLE/Buffer.h",
"src/libANGLE/Caps.cpp",
"src/libANGLE/Caps.h", "src/libANGLE/Caps.h",
"src/libANGLE/Compiler.cpp",
"src/libANGLE/Compiler.h", "src/libANGLE/Compiler.h",
"src/libANGLE/Config.cpp",
"src/libANGLE/Config.h", "src/libANGLE/Config.h",
"src/libANGLE/Constants.h", "src/libANGLE/Constants.h",
"src/libANGLE/Context.h", "src/libANGLE/Context.cpp",
"src/libANGLE/Context.inl.h", "src/libANGLE/Context_gl.cpp",
"src/libANGLE/Context_gles_1_0.cpp",
"src/libANGLE/Context_gl_1_0_autogen.h", "src/libANGLE/Context_gl_1_0_autogen.h",
"src/libANGLE/Context_gl_1_1_autogen.h", "src/libANGLE/Context_gl_1_1_autogen.h",
"src/libANGLE/Context_gl_1_2_autogen.h", "src/libANGLE/Context_gl_1_2_autogen.h",
...@@ -198,27 +204,48 @@ libangle_headers = [ ...@@ -198,27 +204,48 @@ libangle_headers = [
"src/libANGLE/Context_gles_3_0_autogen.h", "src/libANGLE/Context_gles_3_0_autogen.h",
"src/libANGLE/Context_gles_3_1_autogen.h", "src/libANGLE/Context_gles_3_1_autogen.h",
"src/libANGLE/Context_gles_ext_autogen.h", "src/libANGLE/Context_gles_ext_autogen.h",
"src/libANGLE/Context.h",
"src/libANGLE/Context.inl.h",
"src/libANGLE/Debug.cpp",
"src/libANGLE/Debug.h", "src/libANGLE/Debug.h",
"src/libANGLE/Device.cpp",
"src/libANGLE/Device.h", "src/libANGLE/Device.h",
"src/libANGLE/Display.cpp",
"src/libANGLE/Display.h", "src/libANGLE/Display.h",
"src/libANGLE/EGLSync.cpp",
"src/libANGLE/EGLSync.h", "src/libANGLE/EGLSync.h",
"src/libANGLE/Error.cpp",
"src/libANGLE/Error.h", "src/libANGLE/Error.h",
"src/libANGLE/Error.inc", "src/libANGLE/Error.inc",
"src/libANGLE/ErrorStrings.h", "src/libANGLE/ErrorStrings.h",
"src/libANGLE/Fence.cpp",
"src/libANGLE/Fence.h", "src/libANGLE/Fence.h",
"src/libANGLE/Framebuffer.cpp",
"src/libANGLE/Framebuffer.h", "src/libANGLE/Framebuffer.h",
"src/libANGLE/FramebufferAttachment.cpp",
"src/libANGLE/FramebufferAttachment.h", "src/libANGLE/FramebufferAttachment.h",
"src/libANGLE/GLES1Renderer.cpp",
"src/libANGLE/GLES1Renderer.h", "src/libANGLE/GLES1Renderer.h",
"src/libANGLE/GLES1Shaders.inc", "src/libANGLE/GLES1Shaders.inc",
"src/libANGLE/GLES1State.cpp",
"src/libANGLE/GLES1State.h", "src/libANGLE/GLES1State.h",
"src/libANGLE/HandleAllocator.cpp",
"src/libANGLE/HandleAllocator.h", "src/libANGLE/HandleAllocator.h",
"src/libANGLE/HandleRangeAllocator.h", "src/libANGLE/HandleRangeAllocator.h",
"src/libANGLE/HandleRangeAllocator.cpp",
"src/libANGLE/Image.h", "src/libANGLE/Image.h",
"src/libANGLE/Image.cpp",
"src/libANGLE/ImageIndex.h", "src/libANGLE/ImageIndex.h",
"src/libANGLE/ImageIndex.cpp",
"src/libANGLE/IndexRangeCache.cpp",
"src/libANGLE/IndexRangeCache.h", "src/libANGLE/IndexRangeCache.h",
"src/libANGLE/LoggingAnnotator.cpp",
"src/libANGLE/LoggingAnnotator.h", "src/libANGLE/LoggingAnnotator.h",
"src/libANGLE/MemoryObject.cpp",
"src/libANGLE/MemoryObject.h", "src/libANGLE/MemoryObject.h",
"src/libANGLE/MemoryProgramCache.cpp",
"src/libANGLE/MemoryProgramCache.h", "src/libANGLE/MemoryProgramCache.h",
"src/libANGLE/Observer.cpp",
"src/libANGLE/Observer.h", "src/libANGLE/Observer.h",
"src/libANGLE/Overlay.cpp", "src/libANGLE/Overlay.cpp",
"src/libANGLE/Overlay.h", "src/libANGLE/Overlay.h",
...@@ -228,52 +255,87 @@ libangle_headers = [ ...@@ -228,52 +255,87 @@ libangle_headers = [
"src/libANGLE/Overlay_font_autogen.cpp", "src/libANGLE/Overlay_font_autogen.cpp",
"src/libANGLE/Overlay_font_autogen.h", "src/libANGLE/Overlay_font_autogen.h",
"src/libANGLE/Path.h", "src/libANGLE/Path.h",
"src/libANGLE/Path.cpp",
"src/libANGLE/Platform.cpp",
"src/libANGLE/Program.cpp",
"src/libANGLE/Program.h", "src/libANGLE/Program.h",
"src/libANGLE/ProgramLinkedResources.cpp",
"src/libANGLE/ProgramLinkedResources.h", "src/libANGLE/ProgramLinkedResources.h",
"src/libANGLE/ProgramPipeline.cpp",
"src/libANGLE/ProgramPipeline.h", "src/libANGLE/ProgramPipeline.h",
"src/libANGLE/Query.cpp",
"src/libANGLE/Query.h", "src/libANGLE/Query.h",
"src/libANGLE/RefCountObject.h", "src/libANGLE/RefCountObject.h",
"src/libANGLE/Renderbuffer.cpp",
"src/libANGLE/Renderbuffer.h", "src/libANGLE/Renderbuffer.h",
"src/libANGLE/ResourceManager.cpp",
"src/libANGLE/ResourceManager.h", "src/libANGLE/ResourceManager.h",
"src/libANGLE/ResourceMap.h", "src/libANGLE/ResourceMap.h",
"src/libANGLE/Sampler.cpp",
"src/libANGLE/Sampler.h", "src/libANGLE/Sampler.h",
"src/libANGLE/Semaphore.cpp",
"src/libANGLE/Semaphore.h", "src/libANGLE/Semaphore.h",
"src/libANGLE/Shader.cpp",
"src/libANGLE/Shader.h", "src/libANGLE/Shader.h",
"src/libANGLE/SizedMRUCache.h", "src/libANGLE/SizedMRUCache.h",
"src/libANGLE/State.cpp",
"src/libANGLE/State.h", "src/libANGLE/State.h",
"src/libANGLE/Stream.cpp",
"src/libANGLE/Stream.h", "src/libANGLE/Stream.h",
"src/libANGLE/Surface.cpp",
"src/libANGLE/Surface.h", "src/libANGLE/Surface.h",
"src/libANGLE/Texture.cpp",
"src/libANGLE/Texture.h", "src/libANGLE/Texture.h",
"src/libANGLE/Thread.cpp",
"src/libANGLE/Thread.h", "src/libANGLE/Thread.h",
"src/libANGLE/TransformFeedback.cpp",
"src/libANGLE/TransformFeedback.h", "src/libANGLE/TransformFeedback.h",
"src/libANGLE/Uniform.cpp",
"src/libANGLE/Uniform.h", "src/libANGLE/Uniform.h",
"src/libANGLE/VaryingPacking.cpp",
"src/libANGLE/VaryingPacking.h", "src/libANGLE/VaryingPacking.h",
"src/libANGLE/Version.h", "src/libANGLE/Version.h",
"src/libANGLE/Version.inc", "src/libANGLE/Version.inc",
"src/libANGLE/VertexArray.cpp",
"src/libANGLE/VertexArray.h", "src/libANGLE/VertexArray.h",
"src/libANGLE/VertexAttribute.cpp",
"src/libANGLE/VertexAttribute.h", "src/libANGLE/VertexAttribute.h",
"src/libANGLE/VertexAttribute.inc", "src/libANGLE/VertexAttribute.inc",
"src/libANGLE/WorkerThread.cpp",
"src/libANGLE/WorkerThread.h", "src/libANGLE/WorkerThread.h",
"src/libANGLE/angletypes.cpp",
"src/libANGLE/angletypes.h", "src/libANGLE/angletypes.h",
"src/libANGLE/angletypes.inc", "src/libANGLE/angletypes.inc",
"src/libANGLE/entry_points_enum_autogen.cpp",
"src/libANGLE/entry_points_enum_autogen.h", "src/libANGLE/entry_points_enum_autogen.h",
"src/libANGLE/entry_points_utils.h", "src/libANGLE/entry_points_utils.h",
"src/libANGLE/es3_copy_conversion_table_autogen.cpp",
"src/libANGLE/features.h", "src/libANGLE/features.h",
"src/libANGLE/format_map_autogen.cpp",
"src/libANGLE/format_map_desktop.cpp",
"src/libANGLE/formatutils.cpp",
"src/libANGLE/formatutils.h", "src/libANGLE/formatutils.h",
"src/libANGLE/histogram_macros.h", "src/libANGLE/histogram_macros.h",
"src/libANGLE/queryconversions.cpp",
"src/libANGLE/queryconversions.h", "src/libANGLE/queryconversions.h",
"src/libANGLE/queryutils.cpp",
"src/libANGLE/queryutils.h", "src/libANGLE/queryutils.h",
"src/libANGLE/trace.h", "src/libANGLE/trace.h",
"src/libANGLE/renderer/BufferImpl.h", "src/libANGLE/renderer/BufferImpl.h",
"src/libANGLE/renderer/CompilerImpl.h", "src/libANGLE/renderer/CompilerImpl.h",
"src/libANGLE/renderer/ContextImpl.cpp",
"src/libANGLE/renderer/ContextImpl.h", "src/libANGLE/renderer/ContextImpl.h",
"src/libANGLE/renderer/driver_utils.cpp",
"src/libANGLE/renderer/driver_utils.h", "src/libANGLE/renderer/driver_utils.h",
"src/libANGLE/renderer/DeviceImpl.cpp",
"src/libANGLE/renderer/DeviceImpl.h", "src/libANGLE/renderer/DeviceImpl.h",
"src/libANGLE/renderer/DisplayImpl.cpp",
"src/libANGLE/renderer/DisplayImpl.h", "src/libANGLE/renderer/DisplayImpl.h",
"src/libANGLE/renderer/EGLImplFactory.h", "src/libANGLE/renderer/EGLImplFactory.h",
"src/libANGLE/renderer/EGLSyncImpl.h", "src/libANGLE/renderer/EGLSyncImpl.h",
"src/libANGLE/renderer/FenceNVImpl.h", "src/libANGLE/renderer/FenceNVImpl.h",
"src/libANGLE/renderer/FormatID_autogen.h", "src/libANGLE/renderer/FormatID_autogen.h",
"src/libANGLE/renderer/Format_table_autogen.cpp",
"src/libANGLE/renderer/Format.h", "src/libANGLE/renderer/Format.h",
"src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h", "src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h",
"src/libANGLE/renderer/FramebufferImpl.h", "src/libANGLE/renderer/FramebufferImpl.h",
...@@ -284,151 +346,85 @@ libangle_headers = [ ...@@ -284,151 +346,85 @@ libangle_headers = [
"src/libANGLE/renderer/PathImpl.h", "src/libANGLE/renderer/PathImpl.h",
"src/libANGLE/renderer/ProgramImpl.h", "src/libANGLE/renderer/ProgramImpl.h",
"src/libANGLE/renderer/ProgramPipelineImpl.h", "src/libANGLE/renderer/ProgramPipelineImpl.h",
"src/libANGLE/renderer/QueryImpl.cpp",
"src/libANGLE/renderer/QueryImpl.h", "src/libANGLE/renderer/QueryImpl.h",
"src/libANGLE/renderer/RenderbufferImpl.h", "src/libANGLE/renderer/RenderbufferImpl.h",
"src/libANGLE/renderer/RenderTargetCache.h", "src/libANGLE/renderer/RenderTargetCache.h",
"src/libANGLE/renderer/SamplerImpl.h", "src/libANGLE/renderer/SamplerImpl.h",
"src/libANGLE/renderer/SemaphoreImpl.h", "src/libANGLE/renderer/SemaphoreImpl.h",
"src/libANGLE/renderer/ShaderImpl.cpp",
"src/libANGLE/renderer/ShaderImpl.h", "src/libANGLE/renderer/ShaderImpl.h",
"src/libANGLE/renderer/StreamProducerImpl.h", "src/libANGLE/renderer/StreamProducerImpl.h",
"src/libANGLE/renderer/SurfaceImpl.cpp",
"src/libANGLE/renderer/SurfaceImpl.h", "src/libANGLE/renderer/SurfaceImpl.h",
"src/libANGLE/renderer/SyncImpl.h", "src/libANGLE/renderer/SyncImpl.h",
"src/libANGLE/renderer/TextureImpl.cpp",
"src/libANGLE/renderer/TextureImpl.h", "src/libANGLE/renderer/TextureImpl.h",
"src/libANGLE/renderer/TransformFeedbackImpl.h", "src/libANGLE/renderer/TransformFeedbackImpl.h",
"src/libANGLE/renderer/VertexArrayImpl.h", "src/libANGLE/renderer/VertexArrayImpl.h",
"src/libANGLE/renderer/copyvertex.h", "src/libANGLE/renderer/copyvertex.h",
"src/libANGLE/renderer/copyvertex.inc.h", "src/libANGLE/renderer/copyvertex.inc.h",
"src/libANGLE/renderer/load_functions_table.h", "src/libANGLE/renderer/load_functions_table.h",
"src/libANGLE/renderer/renderer_utils.h",
"src/libANGLE/validationEGL.h",
"src/libANGLE/validationES.h",
"src/libANGLE/validationES1.h",
"src/libANGLE/validationES1_autogen.h",
"src/libANGLE/validationES2.h",
"src/libANGLE/validationES2_autogen.h",
"src/libANGLE/validationES3.h",
"src/libANGLE/validationES31.h",
"src/libANGLE/validationES31_autogen.h",
"src/libANGLE/validationES3_autogen.h",
"src/libANGLE/validationESEXT.h",
"src/libANGLE/validationESEXT_autogen.h",
"src/libANGLE/validationGL11_autogen.h",
"src/libANGLE/validationGL12_autogen.h",
"src/libANGLE/validationGL13_autogen.h",
"src/libANGLE/validationGL14_autogen.h",
"src/libANGLE/validationGL15_autogen.h",
"src/libANGLE/validationGL1_autogen.h",
"src/libANGLE/validationGL21_autogen.h",
"src/libANGLE/validationGL2_autogen.h",
"src/libANGLE/validationGL31_autogen.h",
"src/libANGLE/validationGL32_autogen.h",
"src/libANGLE/validationGL33_autogen.h",
"src/libANGLE/validationGL3_autogen.h",
"src/libANGLE/validationGL41_autogen.h",
"src/libANGLE/validationGL42_autogen.h",
"src/libANGLE/validationGL43_autogen.h",
"src/libANGLE/validationGL44_autogen.h",
"src/libANGLE/validationGL45_autogen.h",
"src/libANGLE/validationGL46_autogen.h",
"src/libANGLE/validationGL4_autogen.h",
"src/third_party/trace_event/trace_event.h",
]
libangle_sources = [
"src/libANGLE/AttributeMap.cpp",
"src/libANGLE/BlobCache.cpp",
"src/libANGLE/Buffer.cpp",
"src/libANGLE/Caps.cpp",
"src/libANGLE/Compiler.cpp",
"src/libANGLE/Config.cpp",
"src/libANGLE/Context.cpp",
"src/libANGLE/Context_gl.cpp",
"src/libANGLE/Context_gles_1_0.cpp",
"src/libANGLE/Debug.cpp",
"src/libANGLE/Device.cpp",
"src/libANGLE/Display.cpp",
"src/libANGLE/EGLSync.cpp",
"src/libANGLE/Error.cpp",
"src/libANGLE/Fence.cpp",
"src/libANGLE/Framebuffer.cpp",
"src/libANGLE/FramebufferAttachment.cpp",
"src/libANGLE/GLES1Renderer.cpp",
"src/libANGLE/GLES1State.cpp",
"src/libANGLE/HandleAllocator.cpp",
"src/libANGLE/HandleRangeAllocator.cpp",
"src/libANGLE/Image.cpp",
"src/libANGLE/ImageIndex.cpp",
"src/libANGLE/IndexRangeCache.cpp",
"src/libANGLE/LoggingAnnotator.cpp",
"src/libANGLE/MemoryObject.cpp",
"src/libANGLE/MemoryProgramCache.cpp",
"src/libANGLE/Observer.cpp",
"src/libANGLE/Path.cpp",
"src/libANGLE/Platform.cpp",
"src/libANGLE/Program.cpp",
"src/libANGLE/ProgramLinkedResources.cpp",
"src/libANGLE/ProgramPipeline.cpp",
"src/libANGLE/Query.cpp",
"src/libANGLE/Renderbuffer.cpp",
"src/libANGLE/ResourceManager.cpp",
"src/libANGLE/Sampler.cpp",
"src/libANGLE/Semaphore.cpp",
"src/libANGLE/Shader.cpp",
"src/libANGLE/State.cpp",
"src/libANGLE/Stream.cpp",
"src/libANGLE/Surface.cpp",
"src/libANGLE/Texture.cpp",
"src/libANGLE/Thread.cpp",
"src/libANGLE/TransformFeedback.cpp",
"src/libANGLE/Uniform.cpp",
"src/libANGLE/VaryingPacking.cpp",
"src/libANGLE/VertexArray.cpp",
"src/libANGLE/VertexAttribute.cpp",
"src/libANGLE/WorkerThread.cpp",
"src/libANGLE/angletypes.cpp",
"src/libANGLE/entry_points_enum_autogen.cpp",
"src/libANGLE/es3_copy_conversion_table_autogen.cpp",
"src/libANGLE/format_map_autogen.cpp",
"src/libANGLE/format_map_desktop.cpp",
"src/libANGLE/formatutils.cpp",
"src/libANGLE/queryconversions.cpp",
"src/libANGLE/queryutils.cpp",
"src/libANGLE/renderer/ContextImpl.cpp",
"src/libANGLE/renderer/driver_utils.cpp",
"src/libANGLE/renderer/DeviceImpl.cpp",
"src/libANGLE/renderer/DisplayImpl.cpp",
"src/libANGLE/renderer/Format_table_autogen.cpp",
"src/libANGLE/renderer/QueryImpl.cpp",
"src/libANGLE/renderer/ShaderImpl.cpp",
"src/libANGLE/renderer/SurfaceImpl.cpp",
"src/libANGLE/renderer/TextureImpl.cpp",
"src/libANGLE/renderer/load_functions_table_autogen.cpp", "src/libANGLE/renderer/load_functions_table_autogen.cpp",
"src/libANGLE/renderer/renderer_utils.cpp", "src/libANGLE/renderer/renderer_utils.cpp",
"src/libANGLE/renderer/renderer_utils.h",
"src/libANGLE/validationEGL.cpp", "src/libANGLE/validationEGL.cpp",
"src/libANGLE/validationEGL.h",
"src/libANGLE/validationES.cpp", "src/libANGLE/validationES.cpp",
"src/libANGLE/validationES.h",
"src/libANGLE/validationES1.cpp", "src/libANGLE/validationES1.cpp",
"src/libANGLE/validationES1_autogen.h",
"src/libANGLE/validationES1.h",
"src/libANGLE/validationES2.cpp", "src/libANGLE/validationES2.cpp",
"src/libANGLE/validationES2_autogen.h",
"src/libANGLE/validationES2.h",
"src/libANGLE/validationES3.cpp", "src/libANGLE/validationES3.cpp",
"src/libANGLE/validationES31.cpp", "src/libANGLE/validationES31.cpp",
"src/libANGLE/validationES31_autogen.h",
"src/libANGLE/validationES31.h",
"src/libANGLE/validationES3_autogen.h",
"src/libANGLE/validationES3.h",
"src/libANGLE/validationESEXT_autogen.h",
"src/libANGLE/validationESEXT.h",
"src/libANGLE/validationGL1.cpp", "src/libANGLE/validationGL1.cpp",
"src/libANGLE/validationGL1_autogen.h",
"src/libANGLE/validationGL2.cpp", "src/libANGLE/validationGL2.cpp",
"src/libANGLE/validationGL2_autogen.h",
"src/libANGLE/validationGL3.cpp", "src/libANGLE/validationGL3.cpp",
"src/libANGLE/validationGL3_autogen.h",
"src/libANGLE/validationGL4.cpp", "src/libANGLE/validationGL4.cpp",
"src/libANGLE/validationGL4_autogen.h",
"src/libANGLE/validationGL11.cpp", "src/libANGLE/validationGL11.cpp",
"src/libANGLE/validationGL11_autogen.h",
"src/libANGLE/validationGL12.cpp", "src/libANGLE/validationGL12.cpp",
"src/libANGLE/validationGL12_autogen.h",
"src/libANGLE/validationGL13.cpp",
"src/libANGLE/validationGL13_autogen.h",
"src/libANGLE/validationGL14.cpp", "src/libANGLE/validationGL14.cpp",
"src/libANGLE/validationGL14_autogen.h",
"src/libANGLE/validationGL15.cpp", "src/libANGLE/validationGL15.cpp",
"src/libANGLE/validationGL13.cpp", "src/libANGLE/validationGL15_autogen.h",
"src/libANGLE/validationGL21.cpp", "src/libANGLE/validationGL21.cpp",
"src/libANGLE/validationGL21_autogen.h",
"src/libANGLE/validationGL31.cpp", "src/libANGLE/validationGL31.cpp",
"src/libANGLE/validationGL31_autogen.h",
"src/libANGLE/validationGL32.cpp", "src/libANGLE/validationGL32.cpp",
"src/libANGLE/validationGL32_autogen.h",
"src/libANGLE/validationGL33.cpp", "src/libANGLE/validationGL33.cpp",
"src/libANGLE/validationGL33_autogen.h",
"src/libANGLE/validationGL41.cpp", "src/libANGLE/validationGL41.cpp",
"src/libANGLE/validationGL41_autogen.h",
"src/libANGLE/validationGL42.cpp", "src/libANGLE/validationGL42.cpp",
"src/libANGLE/validationGL42_autogen.h",
"src/libANGLE/validationGL43.cpp", "src/libANGLE/validationGL43.cpp",
"src/libANGLE/validationGL43_autogen.h",
"src/libANGLE/validationGL44.cpp", "src/libANGLE/validationGL44.cpp",
"src/libANGLE/validationGL44_autogen.h",
"src/libANGLE/validationGL45.cpp", "src/libANGLE/validationGL45.cpp",
"src/libANGLE/validationGL45_autogen.h",
"src/libANGLE/validationGL46.cpp", "src/libANGLE/validationGL46.cpp",
"src/libANGLE/validationGL46_autogen.h",
"src/third_party/trace_event/trace_event.h",
] ]
libangle_d3d_shared_sources = [ libangle_d3d_shared_sources = [
...@@ -856,6 +852,82 @@ libangle_gl_cgl_sources = [ ...@@ -856,6 +852,82 @@ libangle_gl_cgl_sources = [
libangle_mac_sources = [ "src/libANGLE/renderer/driver_utils_mac.mm" ] libangle_mac_sources = [ "src/libANGLE/renderer/driver_utils_mac.mm" ]
libangle_vulkan_sources = [
"src/libANGLE/renderer/vulkan/BufferVk.cpp",
"src/libANGLE/renderer/vulkan/BufferVk.h",
"src/libANGLE/renderer/vulkan/CommandGraph.cpp",
"src/libANGLE/renderer/vulkan/CommandGraph.h",
"src/libANGLE/renderer/vulkan/CompilerVk.cpp",
"src/libANGLE/renderer/vulkan/CompilerVk.h",
"src/libANGLE/renderer/vulkan/ContextVk.cpp",
"src/libANGLE/renderer/vulkan/ContextVk.h",
"src/libANGLE/renderer/vulkan/DeviceVk.cpp",
"src/libANGLE/renderer/vulkan/DeviceVk.h",
"src/libANGLE/renderer/vulkan/DisplayVk.cpp",
"src/libANGLE/renderer/vulkan/DisplayVk.h",
"src/libANGLE/renderer/vulkan/FenceNVVk.cpp",
"src/libANGLE/renderer/vulkan/FenceNVVk.h",
"src/libANGLE/renderer/vulkan/FramebufferVk.cpp",
"src/libANGLE/renderer/vulkan/FramebufferVk.h",
"src/libANGLE/renderer/vulkan/GlslangWrapper.cpp",
"src/libANGLE/renderer/vulkan/GlslangWrapper.h",
"src/libANGLE/renderer/vulkan/ImageVk.cpp",
"src/libANGLE/renderer/vulkan/ImageVk.h",
"src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp",
"src/libANGLE/renderer/vulkan/MemoryObjectVk.h",
"src/libANGLE/renderer/vulkan/OverlayVk.cpp",
"src/libANGLE/renderer/vulkan/OverlayVk.h",
"src/libANGLE/renderer/vulkan/PersistentCommandPool.cpp",
"src/libANGLE/renderer/vulkan/PersistentCommandPool.h",
"src/libANGLE/renderer/vulkan/ProgramVk.cpp",
"src/libANGLE/renderer/vulkan/ProgramVk.h",
"src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp",
"src/libANGLE/renderer/vulkan/ProgramPipelineVk.h",
"src/libANGLE/renderer/vulkan/QueryVk.cpp",
"src/libANGLE/renderer/vulkan/QueryVk.h",
"src/libANGLE/renderer/vulkan/RenderbufferVk.cpp",
"src/libANGLE/renderer/vulkan/RenderbufferVk.h",
"src/libANGLE/renderer/vulkan/RendererVk.cpp",
"src/libANGLE/renderer/vulkan/RendererVk.h",
"src/libANGLE/renderer/vulkan/RenderTargetVk.cpp",
"src/libANGLE/renderer/vulkan/RenderTargetVk.h",
"src/libANGLE/renderer/vulkan/SamplerVk.cpp",
"src/libANGLE/renderer/vulkan/SamplerVk.h",
"src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp",
"src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h",
"src/libANGLE/renderer/vulkan/SemaphoreVk.cpp",
"src/libANGLE/renderer/vulkan/SemaphoreVk.h",
"src/libANGLE/renderer/vulkan/ShaderVk.cpp",
"src/libANGLE/renderer/vulkan/ShaderVk.h",
"src/libANGLE/renderer/vulkan/SurfaceVk.cpp",
"src/libANGLE/renderer/vulkan/SurfaceVk.h",
"src/libANGLE/renderer/vulkan/SyncVk.cpp",
"src/libANGLE/renderer/vulkan/SyncVk.h",
"src/libANGLE/renderer/vulkan/TextureVk.cpp",
"src/libANGLE/renderer/vulkan/TextureVk.h",
"src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp",
"src/libANGLE/renderer/vulkan/TransformFeedbackVk.h",
"src/libANGLE/renderer/vulkan/UtilsVk.cpp",
"src/libANGLE/renderer/vulkan/UtilsVk.h",
"src/libANGLE/renderer/vulkan/VertexArrayVk.cpp",
"src/libANGLE/renderer/vulkan/VertexArrayVk.h",
"src/libANGLE/renderer/vulkan/vk_cache_utils.cpp",
"src/libANGLE/renderer/vulkan/vk_cache_utils.h",
"src/libANGLE/renderer/vulkan/vk_caps_utils.cpp",
"src/libANGLE/renderer/vulkan/vk_caps_utils.h",
"src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp",
"src/libANGLE/renderer/vulkan/vk_format_utils.h",
"src/libANGLE/renderer/vulkan/vk_format_utils.cpp",
"src/libANGLE/renderer/vulkan/vk_helpers.cpp",
"src/libANGLE/renderer/vulkan/vk_helpers.h",
"src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h",
"src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp",
"src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp",
"src/libANGLE/renderer/vulkan/vk_utils.cpp",
"src/libANGLE/renderer/vulkan/vk_utils.h",
"src/libANGLE/renderer/vulkan/vk_wrapper.h",
]
# The frame capture headers are always visible to libANGLE. # The frame capture headers are always visible to libANGLE.
libangle_sources += [ libangle_sources += [
"src/libANGLE/FrameCapture.h", "src/libANGLE/FrameCapture.h",
...@@ -885,6 +957,36 @@ libangle_capture_sources = [ ...@@ -885,6 +957,36 @@ libangle_capture_sources = [
"src/libANGLE/gl_enum_utils_autogen.cpp", "src/libANGLE/gl_enum_utils_autogen.cpp",
] ]
libangle_vulkan_android_sources = [
"src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp",
"src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h",
"src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp",
"src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h",
"src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp",
"src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h",
]
libangle_vulkan_win32_sources = [
"src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp",
"src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h",
"src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp",
"src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h",
]
libangle_vulkan_xcb_sources = [
"src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp",
"src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h",
"src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp",
"src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h",
]
libangle_vulkan_fuchsia_sources = [
"src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp",
"src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h",
"src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp",
"src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h",
]
libangle_null_sources = [ libangle_null_sources = [
"src/libANGLE/renderer/null/BufferNULL.cpp", "src/libANGLE/renderer/null/BufferNULL.cpp",
"src/libANGLE/renderer/null/BufferNULL.h", "src/libANGLE/renderer/null/BufferNULL.h",
......
src/tests/BUILD.gn
...@@ -159,7 +159,7 @@ if (is_win || is_linux || is_mac || is_android || is_fuchsia) { ...@@ -159,7 +159,7 @@ if (is_win || is_linux || is_mac || is_android || is_fuchsia) {
use_native_activity = true use_native_activity = true
} }
if (angle_enable_vulkan) { if (angle_enable_vulkan) {
deps += [ "${angle_root}/src/libANGLE/renderer/vulkan:angle_vulkan" ] deps += [ "${angle_root}:angle_vulkan" ]
} }
} }
} }
......
src/tests/test_utils/angle_test_configs.h
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include "GLSLANG/ShaderLang.h"
#include "angle_test_instantiate.h" #include "angle_test_instantiate.h"
#include "util/EGLPlatformParameters.h" #include "util/EGLPlatformParameters.h"
......
third_party/vulkan-loader/BUILD.gn
...@@ -238,7 +238,7 @@ if (!is_android) { ...@@ -238,7 +238,7 @@ if (!is_android) {
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":vulkan_internal_config" ] configs += [ ":vulkan_internal_config" ]
public_configs = [ public_configs = [
"$angle_root/src/libANGLE/renderer/vulkan:vulkan_config", "$angle_root:vulkan_config",
":vulkan_loader_config", ":vulkan_loader_config",
] ]
configs -= vulkan_undefine_configs configs -= vulkan_undefine_configs
......
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