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

anv/batch: Assert that extend_cb is non-NULL if the batch is out of space

Browse Source 
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25672>
This commit is contained in:
Jordan Justen
2023-10-11 12:56:45 -07:00
committed by Marge Bot
parent ef8dcb0aa4
commit ee482ad660
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/intel/vulkan/anv_batch_chain.c
View File

@@ -151,16 +151,23 @@ anv_reloc_list_append(struct anv_reloc_list *list,
* Functions related to anv_batch
*-----------------------------------------------------------------------*/
static VkResult
anv_extend_batch(struct anv_batch *batch, uint32_t size)
{
assert(batch->extend_cb != NULL);
VkResult result = batch->extend_cb(batch, size, batch->user_data);
if (result != VK_SUCCESS)
return anv_batch_set_error(batch, result);
return result;
}
void *
anv_batch_emit_dwords(struct anv_batch *batch, int num_dwords)
{
uint32_t size = num_dwords * 4;
if (batch->next + size > batch->end) {
VkResult result = batch->extend_cb(batch, size, batch->user_data);
if (result != VK_SUCCESS) {
anv_batch_set_error(batch, result);
if (anv_extend_batch(batch, size) != VK_SUCCESS)
return NULL;
}
}
void *p = batch->next;
@@ -176,11 +183,9 @@ VkResult
anv_batch_emit_ensure_space(struct anv_batch *batch, uint32_t size)
{
if (batch->next + size > batch->end) {
VkResult result = batch->extend_cb(batch, size, batch->user_data);
if (result != VK_SUCCESS) {
anv_batch_set_error(batch, result);
VkResult result = anv_extend_batch(batch, size);
if (result != VK_SUCCESS)
return result;
}
}
assert(batch->next + size <= batch->end);
@@ -214,11 +219,8 @@ anv_batch_emit_batch(struct anv_batch *batch, struct anv_batch *other)
assert(size % 4 == 0);
if (batch->next + size > batch->end) {
VkResult result = batch->extend_cb(batch, size, batch->user_data);
if (result != VK_SUCCESS) {
anv_batch_set_error(batch, result);
if (anv_extend_batch(batch, size) != VK_SUCCESS)
return;
}
}
assert(batch->next + size <= batch->end);