fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

svga: Fix incorrect format conversion blit destination

Browse source 
The blit.dst.resource member that was used as destination was
modified earlier in the function, effectively making us try to blit
the content onto itself. Fix this and also add a debug printout when the
format conversion blits fail.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Neha Bhende <bhenden@vmware.com>
This commit is contained in:
Thomas Hellstrom 2017-06-14 15:39:42 +02:00
parent 5732ac3ecc
commit a37eede540
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/svga/svga_pipe_blit.c
View file

@ -547,6 +547,7 @@ try_blit(struct svga_context *svga, const struct pipe_blit_info *blit_info)
blit.src.level, &blit.src.box,
&copy_region_blit);
if (!try_copy_region(svga, &copy_region_blit)) {
debug_printf("svga: Source blit format conversion failed.\n");
ret = false;
goto done;
}
@ -593,13 +594,14 @@ try_blit(struct svga_context *svga, const struct pipe_blit_info *blit_info)
* A temporary resource was created for the blit, we need to
* copy from the temporary resource back to the original destination.
*/
build_blit_info(blit.dst.resource,
build_blit_info(dst,
blit.dst.level, blit.dst.box.x,
blit.dst.box.y, blit.dst.box.z,
newDst,
blit.dst.level, &blit.dst.box,
&copy_region_blit);
if (!try_copy_region(svga, &copy_region_blit)) {
debug_printf("svga: Destination blit format conversion failed.\n");
ret = false;
goto done;
}