Hash :
8df0c53e
Author :
Date :
2022-07-11T16:56:26
Vulkan: Split suballocation out into it's own file Right now Suballocation and BufferBlock classes are in vk_utils.h, which is included by other header files. This made it difficult to have these two classes use variables defined in other headers. And vk_utils.h is really designed for utilities, it isn't the best place for bufferBlock/suballocation by definition. This CL split out suballocation code into its own file to make future CLs much easier. No functional change is expected other than move the code around. Bug: b/237686097 Change-Id: I36733468b4bed152a19d9c9bca8e7459c11c3b43 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3756761 Reviewed-by: Yuxin Hu <yuxinhu@google.com> Commit-Queue: Charlie Lao <cclao@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342
# 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("//build/config/dcheck_always_on.gni")
import("//build_overrides/swiftshader.gni")
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
}
declare_args() {
# Enable custom secondary command buffers for outside render pass commands only
angle_enable_custom_vulkan_outside_render_pass_cmd_buffers =
angle_enable_custom_vulkan_cmd_buffers
# Enable custom secondary command buffers for render pass commands only
angle_enable_custom_vulkan_render_pass_cmd_buffers =
angle_enable_custom_vulkan_cmd_buffers
}
_vulkan_backend_sources = [
"BufferVk.cpp",
"BufferVk.h",
"CommandProcessor.cpp",
"CommandProcessor.h",
"CompilerVk.cpp",
"CompilerVk.h",
"ContextVk.cpp",
"ContextVk.h",
"DebugAnnotatorVk.cpp",
"DebugAnnotatorVk.h",
"DeviceVk.cpp",
"DeviceVk.h",
"DisplayVk.cpp",
"DisplayVk.h",
"DisplayVk_api.h",
"FenceNVVk.cpp",
"FenceNVVk.h",
"FramebufferVk.cpp",
"FramebufferVk.h",
"GlslangWrapperVk.cpp",
"GlslangWrapperVk.h",
"ImageVk.cpp",
"ImageVk.h",
"MemoryObjectVk.cpp",
"MemoryObjectVk.h",
"OverlayVk.cpp",
"OverlayVk.h",
"PersistentCommandPool.cpp",
"PersistentCommandPool.h",
"ProgramExecutableVk.cpp",
"ProgramExecutableVk.h",
"ProgramPipelineVk.cpp",
"ProgramPipelineVk.h",
"ProgramVk.cpp",
"ProgramVk.h",
"QueryVk.cpp",
"QueryVk.h",
"RenderTargetVk.cpp",
"RenderTargetVk.h",
"RenderbufferVk.cpp",
"RenderbufferVk.h",
"RendererVk.cpp",
"RendererVk.h",
"ResourceVk.cpp",
"ResourceVk.h",
"SamplerVk.cpp",
"SamplerVk.h",
"SecondaryCommandBuffer.cpp",
"SecondaryCommandBuffer.h",
"SemaphoreVk.cpp",
"SemaphoreVk.h",
"ShaderVk.cpp",
"ShaderVk.h",
"Suballocation.cpp",
"Suballocation.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",
"VkImageImageSiblingVk.cpp",
"VkImageImageSiblingVk.h",
"VulkanSecondaryCommandBuffer.cpp",
"VulkanSecondaryCommandBuffer.h",
"android/vk_android_utils.cpp",
"android/vk_android_utils.h",
"vk_cache_utils.cpp",
"vk_cache_utils.h",
"vk_caps_utils.cpp",
"vk_caps_utils.h",
"vk_command_buffer_utils.h",
"vk_format_table_autogen.cpp",
"vk_format_utils.cpp",
"vk_format_utils.h",
"vk_helpers.cpp",
"vk_helpers.h",
"vk_internal_shaders_autogen.cpp",
"vk_internal_shaders_autogen.h",
"vk_mandatory_format_support_table_autogen.cpp",
"vk_utils.cpp",
"vk_utils.h",
"vk_wrapper.h",
]
if (angle_enable_cl) {
_vulkan_backend_sources += [
"CLCommandQueueVk.cpp",
"CLCommandQueueVk.h",
"CLContextVk.cpp",
"CLContextVk.h",
"CLDeviceVk.cpp",
"CLDeviceVk.h",
"CLEventVk.cpp",
"CLEventVk.h",
"CLKernelVk.cpp",
"CLKernelVk.h",
"CLMemoryVk.cpp",
"CLMemoryVk.h",
"CLPlatformVk.cpp",
"CLPlatformVk.h",
"CLProgramVk.cpp",
"CLProgramVk.h",
"CLSamplerVk.cpp",
"CLSamplerVk.h",
"cl_types.h",
]
}
if (angle_use_vulkan_null_display) {
_vulkan_backend_sources += [
"null/DisplayVkNull.cpp",
"null/DisplayVkNull.h",
]
}
if (is_linux || is_chromeos) {
_vulkan_backend_sources += [
"linux/DisplayVkLinux.cpp",
"linux/DisplayVkLinux.h",
"linux/DmaBufImageSiblingVkLinux.cpp",
"linux/DmaBufImageSiblingVkLinux.h",
"linux/display/DisplayVkSimple.cpp",
"linux/display/DisplayVkSimple.h",
"linux/display/WindowSurfaceVkSimple.cpp",
"linux/display/WindowSurfaceVkSimple.h",
"linux/headless/DisplayVkHeadless.cpp",
"linux/headless/DisplayVkHeadless.h",
"linux/headless/WindowSurfaceVkHeadless.cpp",
"linux/headless/WindowSurfaceVkHeadless.h",
]
}
if (is_android) {
_vulkan_backend_sources += [
"android/AHBFunctions.cpp",
"android/AHBFunctions.h",
"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 (angle_use_x11) {
_vulkan_backend_sources += [
"linux/xcb/DisplayVkXcb.cpp",
"linux/xcb/DisplayVkXcb.h",
"linux/xcb/WindowSurfaceVkXcb.cpp",
"linux/xcb/WindowSurfaceVkXcb.h",
]
}
if (angle_use_wayland) {
_vulkan_backend_sources += [
"linux/wayland/DisplayVkWayland.cpp",
"linux/wayland/DisplayVkWayland.h",
"linux/wayland/WindowSurfaceVkWayland.cpp",
"linux/wayland/WindowSurfaceVkWayland.h",
]
}
if (angle_use_gbm) {
_vulkan_backend_sources += [
"linux/gbm/DisplayVkGbm.cpp",
"linux/gbm/DisplayVkGbm.h",
]
}
if (is_fuchsia) {
_vulkan_backend_sources += [
"fuchsia/DisplayVkFuchsia.cpp",
"fuchsia/DisplayVkFuchsia.h",
"fuchsia/WindowSurfaceVkFuchsia.cpp",
"fuchsia/WindowSurfaceVkFuchsia.h",
]
}
if (is_ggp) {
_vulkan_backend_sources += [
"ggp/DisplayVkGGP.cpp",
"ggp/DisplayVkGGP.h",
"ggp/WindowSurfaceVkGGP.cpp",
"ggp/WindowSurfaceVkGGP.h",
]
}
if (is_mac) {
_vulkan_backend_sources += [
"mac/DisplayVkMac.h",
"mac/DisplayVkMac.mm",
"mac/IOSurfaceSurfaceVkMac.h",
"mac/IOSurfaceSurfaceVkMac.mm",
"mac/WindowSurfaceVkMac.h",
"mac/WindowSurfaceVkMac.mm",
]
}
config("angle_vulkan_backend_config") {
defines = [ "ANGLE_ENABLE_VULKAN" ]
if (angle_enable_swiftshader) {
defines += [ "ANGLE_ENABLE_SWIFTSHADER" ]
}
if (angle_enable_custom_vulkan_outside_render_pass_cmd_buffers) {
defines += [ "ANGLE_USE_CUSTOM_VULKAN_OUTSIDE_RENDER_PASS_CMD_BUFFERS=1" ]
}
if (angle_enable_custom_vulkan_render_pass_cmd_buffers) {
defines += [ "ANGLE_USE_CUSTOM_VULKAN_RENDER_PASS_CMD_BUFFERS=1" ]
}
if (angle_enable_vulkan_gpu_trace_events) {
defines += [ "ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS=1" ]
}
if (angle_enable_vulkan_validation_layers) {
defines += [ "ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS" ]
}
}
angle_source_set("angle_vk_mem_alloc_wrapper") {
deps = [
"$angle_root/src/common/vulkan:angle_vulkan_headers",
"$angle_vulkan_memory_allocator_dir",
]
include_dirs = [ "$angle_vulkan_memory_allocator_dir/include" ]
configs += [ "$angle_root:angle_no_cfi_unrelated_cast" ]
sources = [
"vk_mem_alloc_wrapper.cpp",
"vk_mem_alloc_wrapper.h",
]
if (is_clang) {
cflags_cc = [
"-Wno-extra-semi-stmt",
"-Wno-missing-field-initializers",
"-Wno-suggest-destructor-override",
"-Wno-suggest-override",
"-Wno-inconsistent-missing-destructor-override",
]
}
}
angle_source_set("angle_vulkan_backend") {
sources = _vulkan_backend_sources
libs = []
deps = [
":angle_vk_mem_alloc_wrapper",
"$angle_root:angle_abseil",
"$angle_root:angle_compression",
"$angle_root:angle_gpu_info_util",
"$angle_root:angle_image_util",
"$angle_root/src/common/spirv:angle_spirv_builder",
"$angle_spirv_headers_dir:spv_headers",
]
if (angle_enable_cl || is_android) {
deps += [ "$angle_root:angle_version_info" ]
}
public_deps = [
"$angle_root:angle_glslang_wrapper",
"$angle_root:libANGLE_headers",
"$angle_root/src/common/vulkan",
"$angle_root/src/common/vulkan:angle_libvulkan_loader",
"$angle_root/src/common/vulkan:angle_vulkan_entry_points",
"$angle_root/src/common/vulkan:angle_vulkan_headers",
]
public_configs = [ ":angle_vulkan_backend_config" ]
if (angle_use_wayland) {
public_configs += [ "$angle_root:angle_wayland_config" ]
}
data_deps = []
defines = []
if (angle_enable_vulkan_validation_layers) {
defines += [ "ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT" ]
data_deps += [ "$angle_root/src/common/vulkan:vulkan_validation_layers" ]
}
if (is_linux || is_chromeos) {
deps += [ "$angle_root/src/common/linux:angle_dma_buf" ]
if (angle_use_gbm) {
deps += [ "//third_party/minigbm" ]
}
}
if (is_fuchsia) {
public_deps += [ "$angle_root/src/common/fuchsia_egl:backend" ]
}
# Include generated shaders.
import("vk_internal_shaders_autogen.gni")
sources += angle_vulkan_internal_shaders
}