From f121623020b7283a8d59d7b42a124dd6c3bc230e Mon Sep 17 00:00:00 2001 From: Andrii Simiklit Date: Mon, 28 Dec 2020 15:58:24 +0200 Subject: [PATCH] st/mesa: don't affect original st_CompressedTexSubImage parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The fallback path is still possible here so let keep them as is. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3952 Fixes: 4b02f165 ("st/mesa: implement PBO upload for glCompressedTex(Sub)Image") Reviewed-by: Marek Olšák Signed-off-by: Andrii Simiklit Part-of: (cherry picked from commit 5ae7d40648ca643615fd551a3c6fcecb8301fc91) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_cb_texture.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3262eb0e5a8..41df743b8dd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1372,7 +1372,7 @@ "description": "st/mesa: don't affect original st_CompressedTexSubImage parameters", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "4b02f165375ccff65e117651a9a75920a1b4e502" }, diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 9f945663fe5..326cbf5f1d8 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1881,14 +1881,14 @@ st_CompressedTexSubImage(struct gl_context *ctx, GLuint dims, ? 0 : texImage->TexObject->MinLevel + texImage->Level; unsigned max_layer = util_max_layer(texture, level); - z += texImage->Face + texImage->TexObject->MinLayer; + GLint layer = z + texImage->Face + texImage->TexObject->MinLayer; struct pipe_surface templ; memset(&templ, 0, sizeof(templ)); templ.format = copy_format; templ.u.tex.level = level; - templ.u.tex.first_layer = MIN2(z, max_layer); - templ.u.tex.last_layer = MIN2(z + d - 1, max_layer); + templ.u.tex.first_layer = MIN2(layer, max_layer); + templ.u.tex.last_layer = MIN2(layer + d - 1, max_layer); surface = pipe->create_surface(pipe, texture, &templ); if (!surface)