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

gallium/u_transfer_helper: Fix MSAA mappings with nonzero x/y.

Browse source 
We created a temporary with box->{width,height} and then tried to map
width,height from a nonzero offset when we meant to just map the whole
temporary.

Fixes segfaults in V3D in dEQP-GLES3.functional.prerequisite.read_pixels
with --deqp-egl-config-name=rgba8888d24s8ms4 and also piglit's read-front
clear-front-first -samples=4

Reviewed-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Eric Anholt 2018-07-09 14:09:07 -07:00
parent ccb8309516
commit 589bb5bd65
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/auxiliary/util/u_transfer_helper.c
View file

@ -207,7 +207,11 @@ transfer_map_msaa(struct pipe_context *pctx,
pctx->blit(pctx, &blit);
}
void *ss_map = pctx->transfer_map(pctx, trans->ss, 0, usage, box,
struct pipe_box map_box = *box;
map_box.x = 0;
map_box.y = 0;
void *ss_map = pctx->transfer_map(pctx, trans->ss, 0, usage, &map_box,
&trans->trans);
if (!ss_map) {
free(trans);