diff options
| author | Samuel Pitoiset <[email protected]> | 2017-09-06 17:25:27 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-09-08 16:04:51 +0200 |
| commit | 67ee31a086e584ec163ad2232d82d2d701068475 (patch) | |
| tree | a0f8836521464b97561b74b76013d4c0c7946290 | |
| parent | fefbcb090d2cd0048d961a355e313601ff8d68c3 (diff) | |
radv: do not update vertex descriptors if the allocation failed
A return code error is stored in the command buffer and should
be returned to the user via EndCommandBuffer().
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index b5da9f6785e..406399fb357 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1578,7 +1578,7 @@ static void radv_emit_primitive_reset_state(struct radv_cmd_buffer *cmd_buffer, } } -static void +static bool radv_cmd_buffer_update_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer) { struct radv_device *device = cmd_buffer->device; @@ -1594,8 +1594,9 @@ radv_cmd_buffer_update_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer) uint64_t va; /* allocate some descriptor state for vertex buffers */ - radv_cmd_buffer_upload_alloc(cmd_buffer, count * 16, 256, - &vb_offset, &vb_ptr); + if (!radv_cmd_buffer_upload_alloc(cmd_buffer, count * 16, 256, + &vb_offset, &vb_ptr)) + return false; for (i = 0; i < count; i++) { uint32_t *desc = &((uint32_t *)vb_ptr)[i * 4]; @@ -1625,6 +1626,8 @@ radv_cmd_buffer_update_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer) AC_UD_VS_VERTEX_BUFFERS, va); } cmd_buffer->state.vb_dirty = false; + + return true; } static void @@ -1639,7 +1642,8 @@ radv_cmd_buffer_flush_state(struct radv_cmd_buffer *cmd_buffer, MAYBE_UNUSED unsigned cdw_max = radeon_check_space(cmd_buffer->device->ws, cmd_buffer->cs, 4096); - radv_cmd_buffer_update_vertex_descriptors(cmd_buffer); + if (!radv_cmd_buffer_update_vertex_descriptors(cmd_buffer)) + return; if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_PIPELINE) radv_emit_graphics_pipeline(cmd_buffer, pipeline); |