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

anv: Use format_for_descriptor_type for descriptor buffers

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-21 12:36:41 -06:00
parent d2185f0c3f
commit 3a33560681
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/intel/vulkan/anv_cmd_buffer.c
View File

@@ -1266,13 +1266,16 @@ anv_cmd_buffer_push_descriptor_set(struct anv_cmd_buffer *cmd_buffer,
.offset = set->desc_mem.offset, .offset = set->desc_mem.offset,
}; };
enum isl_format format =
anv_isl_format_for_descriptor_type(cmd_buffer->device,
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
const struct isl_device *isl_dev = &cmd_buffer->device->isl_dev; const struct isl_device *isl_dev = &cmd_buffer->device->isl_dev;
set->desc_surface_state = set->desc_surface_state =
anv_state_stream_alloc(&cmd_buffer->surface_state_stream, anv_state_stream_alloc(&cmd_buffer->surface_state_stream,
isl_dev->ss.size, isl_dev->ss.align); isl_dev->ss.size, isl_dev->ss.align);
anv_fill_buffer_surface_state(cmd_buffer->device, anv_fill_buffer_surface_state(cmd_buffer->device,
set->desc_surface_state, set->desc_surface_state, format,
ISL_FORMAT_R32G32B32A32_FLOAT,
addr, layout->descriptor_buffer_size, 1); addr, layout->descriptor_buffer_size, 1);
} }

7
src/intel/vulkan/anv_descriptor_set.c
View File

@@ -956,9 +956,12 @@ anv_descriptor_set_create(struct anv_device *device,
set->desc_mem.alloc_size = set_buffer_size; set->desc_mem.alloc_size = set_buffer_size;
set->desc_mem.map = pool->bo->map + set->desc_mem.offset; set->desc_mem.map = pool->bo->map + set->desc_mem.offset;
enum isl_format format =
anv_isl_format_for_descriptor_type(device,
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
set->desc_surface_state = anv_descriptor_pool_alloc_state(pool); set->desc_surface_state = anv_descriptor_pool_alloc_state(pool);
anv_fill_buffer_surface_state(device, set->desc_surface_state, anv_fill_buffer_surface_state(device, set->desc_surface_state, format,
ISL_FORMAT_R32G32B32A32_FLOAT,
(struct anv_address) { (struct anv_address) {
.bo = pool->bo, .bo = pool->bo,
.offset = set->desc_mem.offset, .offset = set->desc_mem.offset,