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

meta: Fix the y offset for 1D_ARRAY in _mesa_meta_pbo_TexSubImage

Browse Source 
The yoffset needs to be interpreted as a slice offset for 1D array
textures. This patch implements that by moving the yoffset into
zoffset similar to how it moves the height into depth.

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Cc: "10.5" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Neil Roberts
2015-02-25 15:33:08 +00:00
parent a08bff1e98
commit 7286a68991
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/drivers/common/meta_tex_subimage.c
View File

@@ -205,8 +205,12 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims,
if (tex_image->TexObject->Target == GL_TEXTURE_1D_ARRAY) { if (tex_image->TexObject->Target == GL_TEXTURE_1D_ARRAY) {
assert(depth == 1); assert(depth == 1);
assert(zoffset == 0);
depth = height; depth = height;
height = 1; height = 1;
image_height = 1;
zoffset = yoffset;
yoffset = 0;
} }
_mesa_meta_bind_fbo_image(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, _mesa_meta_bind_fbo_image(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
@@ -322,8 +326,12 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims,
if (tex_image && tex_image->TexObject->Target == GL_TEXTURE_1D_ARRAY) { if (tex_image && tex_image->TexObject->Target == GL_TEXTURE_1D_ARRAY) {
assert(depth == 1); assert(depth == 1);
assert(zoffset == 0);
depth = height; depth = height;
height = 1; height = 1;
image_height = 1;
zoffset = yoffset;
yoffset = 0;
} }
/* If we were given a texture, bind it to the read framebuffer. If not, /* If we were given a texture, bind it to the read framebuffer. If not,