<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Jul 17, 2017 at 4:18 AM, James Legg <<a href="mailto:jlegg@feralinteractive.com" target="_blank">jlegg@feralinteractive.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Tue, 2017-07-11 at 17:04 -0700, Jason Ekstrand wrote: > We were early returning and never created the NULL surface state. > > Cc: <a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.org</a> This patch fixes a bug that affected me. Tested-by: James Legg <<a href="mailto:jlegg@feralinteractive.com">jlegg@feralinteractive.com</a>> </blockquote><div> </div><div>Thanks! Lionel already reviewed the patch so I went ahead and pushed this one. It's got a stable CC so it should end up back-ported to 17.1 as well. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> I submitted a similar patch before seeing this one (<a href="https://patchwork.freedesktop.org/patch/167047/" rel="noreferrer" target="_blank">https://patchwork.freedesktop.org/patch/167047/</a>). I'll drop that if this one is merged. James <div class="HOEnZb"><div class="h5"> > --- > src/intel/vulkan/genX_cmd_buffer.c | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c > index 53c58ca..9b3bb10 100644 > --- a/src/intel/vulkan/genX_cmd_buffer.c > +++ b/src/intel/vulkan/genX_cmd_buffer.c > @@ -429,19 +429,18 @@ genX(cmd_buffer_setup_attachments)(struct anv_cmd_buffer *cmd_buffer, > > vk_free(&cmd_buffer->pool->alloc, state->attachments); > > - if (pass->attachment_count == 0) { > + if (pass->attachment_count > 0) { > + state->attachments = vk_alloc(&cmd_buffer->pool->alloc, > + pass->attachment_count * > + sizeof(state->attachments[0]), > + 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); > + if (state->attachments == NULL) { > + /* Propagate VK_ERROR_OUT_OF_HOST_MEMORY to vkEndCommandBuffer */ > + return anv_batch_set_error(&cmd_buffer->batch, > + VK_ERROR_OUT_OF_HOST_MEMORY); > + } > + } else { > state->attachments = NULL; > - return VK_SUCCESS; > - } > - > - state->attachments = vk_alloc(&cmd_buffer->pool->alloc, > - pass->attachment_count * > - sizeof(state->attachments[0]), > - 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); > - if (state->attachments == NULL) { > - /* Propagate VK_ERROR_OUT_OF_HOST_MEMORY to vkEndCommandBuffer */ > - return anv_batch_set_error(&cmd_buffer->batch, > - VK_ERROR_OUT_OF_HOST_MEMORY); > } > > /* Reserve one for the NULL state. */ > -- > 2.5.0.400.gff86faf </div></div></blockquote></div> </div></div>