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

vk: Do relocations in surface states when they are created

Browse Source 
Previously, we waited until later and did a pass through the used surfaces
and did the relocations then.  This lead to doing double-relocations which
was causing us to get bogus surface offsets.
This commit is contained in:
Jason Ekstrand
2015-05-21 15:55:27 -07:00
parent ccf2bf9b99
commit 519fe765e2
3 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/vulkan/device.c
View File

@@ -2466,9 +2466,13 @@ void anv_CmdBindDescriptorSets(
anv_cmd_buffer_alloc_surface_state(cmd_buffer, 64, 64); anv_cmd_buffer_alloc_surface_state(cmd_buffer, 64, 64);
memcpy(state.map, view->surface_state.map, 64); memcpy(state.map, view->surface_state.map, 64);
/* The address goes in dwords 8 and 9 of the SURFACE_STATE */
*(uint64_t *)(state.map + 8 * 4) =
anv_reloc_list_add(&cmd_buffer->surface_relocs,
state.offset + 8 * 4,
view->bo, view->offset);
bindings->descriptors[s].surfaces[start + b] = state.offset; bindings->descriptors[s].surfaces[start + b] = state.offset;
bindings->descriptors[s].relocs[start + b].bo = view->bo;
bindings->descriptors[s].relocs[start + b].offset = view->offset;
} }
start = layout->set[firstSet + i].sampler_start[s]; start = layout->set[firstSet + i].sampler_start[s];
@@ -2553,34 +2557,12 @@ flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer)
if (layers + surface_count > 0) { if (layers + surface_count > 0) {
struct anv_state state; struct anv_state state;
uint32_t offset;
uint32_t *address;
uint32_t size; uint32_t size;
size = (bias + surface_count) * sizeof(uint32_t); size = (bias + surface_count) * sizeof(uint32_t);
state = anv_cmd_buffer_alloc_surface_state(cmd_buffer, size, 32); state = anv_cmd_buffer_alloc_surface_state(cmd_buffer, size, 32);
memcpy(state.map, bindings->descriptors[s].surfaces, size); memcpy(state.map, bindings->descriptors[s].surfaces, size);
for (uint32_t i = 0; i < layers; i++) {
offset = bindings->descriptors[s].surfaces[i] + 8 * sizeof(int32_t);
address = cmd_buffer->surface_bo.map + offset;
*address =
anv_reloc_list_add(&cmd_buffer->surface_relocs, offset,
bindings->descriptors[s].relocs[i].bo,
bindings->descriptors[s].relocs[i].offset);
}
for (uint32_t i = 0; i < surface_count; i++) {
offset = bindings->descriptors[s].surfaces[i] + 8 * sizeof(int32_t);
address = cmd_buffer->surface_bo.map + offset;
*address =
anv_reloc_list_add(&cmd_buffer->surface_relocs, offset,
bindings->descriptors[s].relocs[bias + i].bo,
bindings->descriptors[s].relocs[bias + i].offset);
}
static const uint32_t binding_table_opcodes[] = { static const uint32_t binding_table_opcodes[] = {
[VK_SHADER_STAGE_VERTEX] = 38, [VK_SHADER_STAGE_VERTEX] = 38,
[VK_SHADER_STAGE_TESS_CONTROL] = 39, [VK_SHADER_STAGE_TESS_CONTROL] = 39,
@@ -3172,9 +3154,13 @@ anv_cmd_buffer_fill_render_targets(struct anv_cmd_buffer *cmd_buffer)
anv_cmd_buffer_alloc_surface_state(cmd_buffer, 64, 64); anv_cmd_buffer_alloc_surface_state(cmd_buffer, 64, 64);
memcpy(state.map, view->surface_state.map, 64); memcpy(state.map, view->surface_state.map, 64);
/* The address goes in dwords 8 and 9 of the SURFACE_STATE */
*(uint64_t *)(state.map + 8 * 4) =
anv_reloc_list_add(&cmd_buffer->surface_relocs,
state.offset + 8 * 4,
view->bo, view->offset);
bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].surfaces[i] = state.offset; bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].surfaces[i] = state.offset;
bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].relocs[i].bo = view->bo;
bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].relocs[i].offset = view->offset;
} }
cmd_buffer->dirty |= ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY; cmd_buffer->dirty |= ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY;
} }

5
src/vulkan/meta.c
View File

@@ -185,11 +185,6 @@ anv_cmd_buffer_copy_render_targets(struct anv_cmd_buffer *cmd_buffer,
for (uint32_t i = 0; i < fb->color_attachment_count; i++) { for (uint32_t i = 0; i < fb->color_attachment_count; i++) {
bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].surfaces[i] = bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].surfaces[i] =
old_bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].surfaces[i]; old_bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].surfaces[i];
bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].relocs[i].bo =
old_bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].relocs[i].bo;
bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].relocs[i].offset =
old_bindings->descriptors[VK_SHADER_STAGE_FRAGMENT].relocs[i].offset;
} }
cmd_buffer->dirty |= ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY; cmd_buffer->dirty |= ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY;

4
src/vulkan/private.h
View File

@@ -530,10 +530,6 @@ struct anv_bindings {
struct { struct {
uint32_t surfaces[256]; uint32_t surfaces[256];
struct {
struct anv_bo *bo;
uint32_t offset;
} relocs[256];
struct { uint32_t dwords[4]; } samplers[16]; struct { uint32_t dwords[4]; } samplers[16];
} descriptors[VK_NUM_SHADER_STAGE]; } descriptors[VK_NUM_SHADER_STAGE];
}; };