Module: Mesa Branch: staging/21.0 Commit: 63dfc50c96252c1bf7497d55d5358d561c1c765d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=63dfc50c96252c1bf7497d55d5358d561c1c765d
Author: Ilia Mirkin <[email protected]> Date: Sun Mar 21 01:47:36 2021 -0400 nv50: initialize target for blit source surfaces This target is used to determine whether MS scaling factors are to be uploaded. Fixes: 1288ac7632b3 ("nv50: don't try to upload MSAA settings for BUFFER textures") Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-by: Karol Herbst <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9740> (cherry picked from commit 38371ff6286df9108dfbfdb4e1d9cbcf12eff918) --- .pick_status.json | 2 +- src/gallium/drivers/nouveau/nv50/nv50_surface.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 9c88fcfc650..6a05ce2a548 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -652,7 +652,7 @@ "description": "nv50: initialize target for blit source surfaces", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "1288ac7632b31a20497a0e75f374f66ce3d5bc3c" }, diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c index b133997641a..00da9eaf662 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c @@ -1137,6 +1137,7 @@ nv50_blit_set_src(struct nv50_blitctx *blit, target = nv50_blit_reinterpret_pipe_texture_target(res->target); + templ.target = target; templ.format = format; templ.u.tex.first_level = templ.u.tex.last_level = level; templ.u.tex.first_layer = templ.u.tex.last_layer = layer; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
