Mesa (master): st/mesa: don't affect original st_CompressedTexSubImage parameters

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 5ae7d40648ca643615fd551a3c6fcecb8301fc91
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ae7d40648ca643615fd551a3c6fcecb8301fc91

Author: Andrii Simiklit <andrii.simiklit at globallogic.com>
Date:   Mon Dec 28 15:58:24 2020 +0200

st/mesa: don't affect original st_CompressedTexSubImage parameters

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 <marek.olsak at amd.com>
Signed-off-by: Andrii Simiklit <andrii.simiklit at globallogic.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8258>

---

 src/mesa/state_tracker/st_cb_texture.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index f7a6660ff15..a5113bf0bdb 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)