[virglrenderer-devel] [PATCH 2/2] vrend: specify correct offset in resource copy fallback path

[Gurchetan Singh]

glGetTexImage returns the entire texture, and we always copy from
the beginning of the texture. Instead, we should start copying
from the offset specified by the bounding box.

Fixes:
    dEQP-GLES3.functional.texture.shadow.2d_array.*.*depth*

Example test cases:
    dEQP-GLES3.functional.texture.shadow.2d_array.linear.not_equal_depth_component32f
    dEQP-GLES3.functional.texture.shadow.2d_array.nearest_mipmap_nearest.less_or_equal_depth_component16
    dEQP-GLES3.functional.texture.shadow.2d_array.nearest_mipmap_nearest.greater_or_equal_depth_component16

v2: Cubemap textures seem to suffer from the same issue:

Fixes:
   dEQP-GLES3.functional.texture.shadow.cube.nearest.*

Example test cases:
    dEQP-GLES3.functional.texture.shadow.cube.nearest.less_or_equal_depth_component16
    dEQP-GLES3.functional.texture.shadow.cube.nearest.less_or_equal_depth24_stencil8

v3: Make sure we still make only 1 glTexSubImage3D call in the non-cubemap case
v4: Fix slice size and texture size calculations.

Fixes:
    dEQP-GLES3.functional.texture.filtering.3d.formats.rgb9_e5_nearest
    dEQP-GLES3.functional.texture.filtering.3d.formats.rgb9_e5_linear
---
 src/vrend_renderer.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index 9497a34..05f7447 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -5675,8 +5675,8 @@ static void vrend_resource_copy_fallback(struct vrend_context *ctx,
 
    /* this is ugly need to do a full GetTexImage */
    slice_size = util_format_get_nblocks(src_res->base.format, u_minify(src_res->base.width0, src_level), u_minify(src_res->base.height0, src_level)) *
-      u_minify(src_res->base.depth0, src_level) * util_format_get_blocksize(src_res->base.format);
-   transfer_size = slice_size * src_res->base.array_size;
+                util_format_get_blocksize(src_res->base.format);
+   transfer_size = slice_size * vrend_get_texture_depth(src_res, src_level);
 
    tptr = malloc(transfer_size);
    if (!tptr)
@@ -5744,8 +5744,10 @@ static void vrend_resource_copy_fallback(struct vrend_context *ctx,
    }
 
    glBindTexture(dst_res->target, dst_res->id);
-   slice_offset = 0;
-   for (i = 0; i < cube_slice; i++) {
+   slice_offset = src_box->z * slice_size;
+   cube_slice = (src_res->target == GL_TEXTURE_CUBE_MAP) ? src_box->z + src_box->depth : cube_slice;
+   i = (src_res->target == GL_TEXTURE_CUBE_MAP) ? src_box->z : 0;
+   for (; i < cube_slice; i++) {
       GLenum ctarget = dst_res->target == GL_TEXTURE_CUBE_MAP ? GL_TEXTURE_CUBE_MAP_POSITIVE_X + i : dst_res->target;
       if (compressed) {
          if (ctarget == GL_TEXTURE_1D) {
-- 
2.16.2.804.g6dcf76e118-goog