fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 09:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meta: Avoid _swrast_BlitFramebuffer in the meta CopyTexSubImage code.

Browse source 
This is a replacement for bd44ac8b5c
that should actually work.

Fixes Piglit's copyteximage-border on swrast, as well as one of
es3conform's packed_pixels_pixelstore test.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78546
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77705
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Kenneth Graunke 2014-05-18 22:26:59 -07:00
parent 54540ea691
commit 2ecc7268ba
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/drivers/common/meta.c
View file

@ -2860,13 +2860,13 @@ copytexsubimage_using_blit_framebuffer(struct gl_context *ctx, GLuint dims,
* are too strict for CopyTexImage. We know meta will be fine with format
* changes.
*/
_mesa_meta_and_swrast_BlitFramebuffer(ctx, x, y,
x + width, y + height,
xoffset, yoffset,
xoffset + width, yoffset + height,
mask, GL_NEAREST);
mask = _mesa_meta_BlitFramebuffer(ctx, x, y,
x + width, y + height,
xoffset, yoffset,
xoffset + width, yoffset + height,
mask, GL_NEAREST);
ctx->Meta->Blit.no_ctsi_fallback = false;
success = true;
success = mask == 0x0;
out:
_mesa_lock_texture(ctx, texObj);