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

anv: drop unused argument of anv_descriptor_set_address

Browse Source 
Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11577>
This commit is contained in:
Marcin Ślusarz
2021-06-28 17:14:08 +02:00
committed by Marge Bot
parent 904bd8f358
commit 7048a15485
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -946,7 +946,7 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer,
if (bind_point == VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR) { if (bind_point == VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR) {
struct anv_push_constants *push = &pipe_state->push_constants; struct anv_push_constants *push = &pipe_state->push_constants;
struct anv_address addr = anv_descriptor_set_address(cmd_buffer, set); struct anv_address addr = anv_descriptor_set_address(set);
push->desc_sets[set_index] = anv_address_physical(addr); push->desc_sets[set_index] = anv_address_physical(addr);
if (addr.bo) { if (addr.bo) {

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

@@ -2097,8 +2097,7 @@ struct anv_push_descriptor_set {
}; };
static inline struct anv_address static inline struct anv_address
anv_descriptor_set_address(struct anv_cmd_buffer *cmd_buffer, anv_descriptor_set_address(struct anv_descriptor_set *set)
struct anv_descriptor_set *set)
{ {
if (anv_descriptor_set_is_push(set)) { if (anv_descriptor_set_is_push(set)) {
/* We have to flag push descriptor set as used on the GPU /* We have to flag push descriptor set as used on the GPU

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

@@ -2673,7 +2673,7 @@ emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
assert(set->desc_surface_state.alloc_size); assert(set->desc_surface_state.alloc_size);
bt_map[s] = set->desc_surface_state.offset + state_offset; bt_map[s] = set->desc_surface_state.offset + state_offset;
add_surface_reloc(cmd_buffer, set->desc_surface_state, add_surface_reloc(cmd_buffer, set->desc_surface_state,
anv_descriptor_set_address(cmd_buffer, set)); anv_descriptor_set_address(set));
break; break;
} }
@@ -3036,7 +3036,7 @@ get_push_range_address(struct anv_cmd_buffer *cmd_buffer,
*/ */
struct anv_descriptor_set *set = struct anv_descriptor_set *set =
gfx_state->base.descriptors[range->index]; gfx_state->base.descriptors[range->index];
return anv_descriptor_set_address(cmd_buffer, set); return anv_descriptor_set_address(set);
} }
case ANV_DESCRIPTOR_SET_PUSH_CONSTANTS: { case ANV_DESCRIPTOR_SET_PUSH_CONSTANTS: {