OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: only minify depth for 3d targets

Browse Source 
We make sure that that image depth matches the level's depth before
copying it into place. However we should only be minifying the first
level's depth for 3d textures - array textures have the same depth for
all levels.

This fixes tests such as
dEQP-GLES3.functional.texture.specification.texsubimage3d_depth.* and I
suspect account for a number of other odd situations I've run into where
level > 0 of array textures was messed up.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Ilia Mirkin
2016-03-19 21:25:36 -04:00
parent 6eeb284e4f
commit adb40a7399
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/state_tracker/st_cb_texture.c
View File

@@ -2886,10 +2886,13 @@ st_finalize_texture(struct gl_context *ctx,
/* Need to import images in main memory or held in other textures. /* Need to import images in main memory or held in other textures.
*/ */
if (stImage && stObj->pt != stImage->pt) { if (stImage && stObj->pt != stImage->pt) {
GLuint depth = stObj->depth0;
if (stObj->base.Target == GL_TEXTURE_3D)
depth = u_minify(depth, level);
if (level == 0 || if (level == 0 ||
(stImage->base.Width == u_minify(stObj->width0, level) && (stImage->base.Width == u_minify(stObj->width0, level) &&
stImage->base.Height == u_minify(stObj->height0, level) && stImage->base.Height == u_minify(stObj->height0, level) &&
stImage->base.Depth == u_minify(stObj->depth0, level))) { stImage->base.Depth == depth)) {
/* src image fits expected dest mipmap level size */ /* src image fits expected dest mipmap level size */
copy_image_data_to_texture(st, stObj, level, stImage); copy_image_data_to_texture(st, stObj, level, stImage);
} }