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

anv: Make format_for_descriptor return an isl_format

Browse Source
This commit is contained in:
Jason Ekstrand
2016-05-13 12:38:12 -07:00
parent 263a8cb52d
commit 1bda8d06e5
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -688,17 +688,17 @@ add_surface_state_reloc(struct anv_cmd_buffer *cmd_buffer,
state.offset + dword * 4, bo, offset);
}
const struct anv_format *
anv_format_for_descriptor_type(VkDescriptorType type)
enum isl_format
anv_isl_format_for_descriptor_type(VkDescriptorType type)
{
switch (type) {
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
return anv_format_for_vk_format(VK_FORMAT_R32G32B32A32_SFLOAT);
return ISL_FORMAT_R32G32B32A32_FLOAT;
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
return anv_format_for_vk_format(VK_FORMAT_UNDEFINED);
return ISL_FORMAT_RAW;
default:
unreachable("Invalid descriptor type");
@@ -768,10 +768,10 @@ anv_cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
surface_state =
anv_cmd_buffer_alloc_surface_state(cmd_buffer);
const struct anv_format *format =
anv_format_for_descriptor_type(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER);
const enum isl_format format =
anv_isl_format_for_descriptor_type(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER);
anv_fill_buffer_surface_state(cmd_buffer->device, surface_state,
format->isl_format, bo_offset, 12, 1);
format, bo_offset, 12, 1);
bt_map[0] = surface_state.offset + state_offset;
add_surface_state_reloc(cmd_buffer, surface_state, bo, bo_offset);

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

@@ -599,10 +599,8 @@ void anv_UpdateDescriptorSets(
&set->buffer_views[bind_layout->buffer_index];
view += write->dstArrayElement + j;
const struct anv_format *format =
anv_format_for_descriptor_type(write->descriptorType);
view->format = format->isl_format;
view->format =
anv_isl_format_for_descriptor_type(write->descriptorType);
view->bo = buffer->bo;
view->offset = buffer->offset + write->pBufferInfo[j].offset;

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

@@ -1675,8 +1675,8 @@ void anv_buffer_view_init(struct anv_buffer_view *view,
const VkBufferViewCreateInfo* pCreateInfo,
struct anv_cmd_buffer *cmd_buffer);
const struct anv_format *
anv_format_for_descriptor_type(VkDescriptorType type);
enum isl_format
anv_isl_format_for_descriptor_type(VkDescriptorType type);
static inline struct VkExtent3D
anv_sanitize_image_extent(const VkImageType imageType,