OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Plumb the device into *bits_for_access_flags

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3932>
This commit is contained in:
Jason Ekstrand
2020-02-24 15:51:41 -06:00
parent 3a33560681
commit 89f3d116a8
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/intel/vulkan/anv_pass.c
View File

@@ -26,25 +26,26 @@
#include "vk_util.h"
static void
anv_render_pass_add_subpass_dep(struct anv_render_pass *pass,
anv_render_pass_add_subpass_dep(struct anv_device *device,
struct anv_render_pass *pass,
const VkSubpassDependency2KHR *dep)
{
if (dep->dstSubpass == VK_SUBPASS_EXTERNAL) {
pass->subpass_flushes[pass->subpass_count] |=
anv_pipe_invalidate_bits_for_access_flags(dep->dstAccessMask);
anv_pipe_invalidate_bits_for_access_flags(device, dep->dstAccessMask);
} else {
assert(dep->dstSubpass < pass->subpass_count);
pass->subpass_flushes[dep->dstSubpass] |=
anv_pipe_invalidate_bits_for_access_flags(dep->dstAccessMask);
anv_pipe_invalidate_bits_for_access_flags(device, dep->dstAccessMask);
}
if (dep->srcSubpass == VK_SUBPASS_EXTERNAL) {
pass->subpass_flushes[0] |=
anv_pipe_flush_bits_for_access_flags(dep->srcAccessMask);
anv_pipe_flush_bits_for_access_flags(device, dep->srcAccessMask);
} else {
assert(dep->srcSubpass < pass->subpass_count);
pass->subpass_flushes[dep->srcSubpass + 1] |=
anv_pipe_flush_bits_for_access_flags(dep->srcAccessMask);
anv_pipe_flush_bits_for_access_flags(device, dep->srcAccessMask);
}
}
@@ -361,7 +362,7 @@ VkResult anv_CreateRenderPass(
.dstAccessMask = pCreateInfo->pDependencies[i].dstAccessMask,
.dependencyFlags = pCreateInfo->pDependencies[i].dependencyFlags,
};
anv_render_pass_add_subpass_dep(pass, &dep2);
anv_render_pass_add_subpass_dep(device, pass, &dep2);
}
vk_foreach_struct(ext, pCreateInfo->pNext) {
@@ -568,8 +569,10 @@ VkResult anv_CreateRenderPass2(
}
}
for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++)
anv_render_pass_add_subpass_dep(pass, &pCreateInfo->pDependencies[i]);
for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++) {
anv_render_pass_add_subpass_dep(device, pass,
&pCreateInfo->pDependencies[i]);
}
vk_foreach_struct(ext, pCreateInfo->pNext) {
switch (ext->sType) {

6
src/intel/vulkan/anv_private.h
View File

@@ -2506,7 +2506,8 @@ enum anv_pipe_bits {
ANV_PIPE_AUX_TABLE_INVALIDATE_BIT)
static inline enum anv_pipe_bits
anv_pipe_flush_bits_for_access_flags(VkAccessFlags flags)
anv_pipe_flush_bits_for_access_flags(struct anv_device *device,
VkAccessFlags flags)
{
enum anv_pipe_bits pipe_bits = 0;
@@ -2566,7 +2567,8 @@ anv_pipe_flush_bits_for_access_flags(VkAccessFlags flags)
}
static inline enum anv_pipe_bits
anv_pipe_invalidate_bits_for_access_flags(VkAccessFlags flags)
anv_pipe_invalidate_bits_for_access_flags(struct anv_device *device,
VkAccessFlags flags)
{
enum anv_pipe_bits pipe_bits = 0;

4
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -2365,8 +2365,8 @@ void genX(CmdPipelineBarrier)(
}
cmd_buffer->state.pending_pipe_bits |=
anv_pipe_flush_bits_for_access_flags(src_flags) |
anv_pipe_invalidate_bits_for_access_flags(dst_flags);
anv_pipe_flush_bits_for_access_flags(cmd_buffer->device, src_flags) |
anv_pipe_invalidate_bits_for_access_flags(cmd_buffer->device, dst_flags);
}
static void