<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Mon, May 9, 2016 at 12:26 PM, Nanley Chery <<a href="mailto:nanleychery@gmail.com" target="_blank">nanleychery@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>> This function previously assumed that the Buffer and Image had matching dimensions. However, it is possible to copy from a buffer with larger dimensions than the image. Modify the copy function to enable this. Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=95292" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=95292</a> Signed-off-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>> --- src/intel/vulkan/anv_meta_copy.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/intel/vulkan/anv_meta_copy.c b/src/intel/vulkan/anv_meta_copy.c index 982fa7e..1d131d3 100644 --- a/src/intel/vulkan/anv_meta_copy.c +++ b/src/intel/vulkan/anv_meta_copy.c @@ -128,18 +128,20 @@ meta_copy_buffer_to_image(struct anv_cmd_buffer *cmd_buffer, const VkOffset3D img_offset_el = meta_region_offset_el(image, &pRegions[r].imageOffset); const VkExtent3D bufferExtent = { - .width = pRegions[r].bufferRowLength, - .height = pRegions[r].bufferImageHeight, + .width = MAX(pRegions[r].bufferRowLength, + pRegions[r].imageExtent.width), </blockquote><div> </div><div>As I commented on IRC, I think this would be better as "pRegions[r].bufferRowLength ? pRegions[r].BufferRowLength : pRegions[r].imageExtent.width" </div><div>With that, </div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + .height = MAX(pRegions[r].bufferImageHeight, + pRegions[r].imageExtent.height), }; - - /* Start creating blit rect */ const VkExtent3D buf_extent_el = meta_region_extent_el(image, &bufferExtent); + + /* Start creating blit rect */ const VkExtent3D img_extent_el = meta_region_extent_el(image, &pRegions[r].imageExtent); struct anv_meta_blit2d_rect rect = { - .width = MAX2(buf_extent_el.width, img_extent_el.width), - .height = MAX2(buf_extent_el.height, img_extent_el.height), + .width = img_extent_el.width, + .height = img_extent_el.height, }; /* Create blit surfaces */ @@ -153,7 +155,7 @@ meta_copy_buffer_to_image(struct anv_cmd_buffer *cmd_buffer, .tiling = ISL_TILING_LINEAR, .base_offset = buffer->offset + pRegions[r].bufferOffset, .bs = forward ? image->format->isl_layout->bs : <a href="http://img_bsurf.bs" rel="noreferrer" target="_blank">img_bsurf.bs</a>, - .pitch = rect.width * <a href="http://buf_bsurf.bs" rel="noreferrer" target="_blank">buf_bsurf.bs</a>, + .pitch = buf_extent_el.width * <a href="http://buf_bsurf.bs" rel="noreferrer" target="_blank">buf_bsurf.bs</a>, }; /* Set direction-dependent variables */ @@ -188,7 +190,8 @@ meta_copy_buffer_to_image(struct anv_cmd_buffer *cmd_buffer, * increment the offset directly in the image effectively * re-binding it to different backing memory. */ - buf_bsurf.base_offset += rect.width * rect.height * <a href="http://buf_bsurf.bs" rel="noreferrer" target="_blank">buf_bsurf.bs</a>; + buf_bsurf.base_offset += buf_extent_el.width * + buf_extent_el.height * <a href="http://buf_bsurf.bs" rel="noreferrer" target="_blank">buf_bsurf.bs</a>; if (image->type == VK_IMAGE_TYPE_3D) slice_3d++; -- 2.8.2 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>