KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lavapipe: tolerate NULL image-buffer view descriptors 

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16137>
This commit is contained in:
Erik Faye-Lund 2021-04-26 17:11:01 +02:00 committed by Marge Bot
parent aabf614f9b
commit 427cc8d55e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/frontends/lavapipe/lvp_execute.c
View File

@ -1242,10 +1242,17 @@ static void fill_image_buffer_view_stage(struct rendering_state *state,
return;
idx += array_idx;
idx += dyn_info->stage[stage].image_count;
state->iv[p_stage][idx].resource = bv->buffer->bo;
state->iv[p_stage][idx].format = bv->pformat;
state->iv[p_stage][idx].u.buf.offset = bv->offset + bv->buffer->offset;
state->iv[p_stage][idx].u.buf.size = bv->range == VK_WHOLE_SIZE ? (bv->buffer->size - bv->offset): bv->range;
if (bv) {
state->iv[p_stage][idx].resource = bv->buffer->bo;
state->iv[p_stage][idx].format = bv->pformat;
state->iv[p_stage][idx].u.buf.offset = bv->offset + bv->buffer->offset;
state->iv[p_stage][idx].u.buf.size = bv->range == VK_WHOLE_SIZE ? (bv->buffer->size - bv->offset): bv->range;
} else {
state->iv[p_stage][idx].resource = NULL;
state->iv[p_stage][idx].format = PIPE_FORMAT_NONE;
state->iv[p_stage][idx].u.buf.offset = 0;
state->iv[p_stage][idx].u.buf.size = 0;
}
if (state->num_shader_images[p_stage] <= idx)
state->num_shader_images[p_stage] = idx + 1;
state->iv_dirty[p_stage] = true;