st: Add cubeMapFace parameter to st_finalize_texture.

st_finalize_texture always accesses image at face 0, but it may not be
set if we are working with cubemap that had other face set.

This fixes crash in piglit
same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Michal Srb 2017-03-28 23:39:28 +03:00 committed by Nicolai Hähnle
parent d6fccb4c09
commit 52f9ccefcb
7 changed files with 10 additions and 8 deletions

View File

@ -1808,7 +1808,7 @@ dri2_interop_export_object(__DRIcontext *_ctx,
return MESA_GLINTEROP_INVALID_MIP_LEVEL;
}
if (!st_finalize_texture(ctx, st->pipe, obj)) {
if (!st_finalize_texture(ctx, st->pipe, obj, 0)) {
mtx_unlock(&ctx->Shared->Mutex);
return MESA_GLINTEROP_OUT_OF_RESOURCES;
}

View File

@ -64,7 +64,7 @@ st_bind_images(struct st_context *st, struct gl_program *prog,
struct pipe_image_view *img = &images[i];
if (!_mesa_is_image_unit_valid(st->ctx, u) ||
!st_finalize_texture(st->ctx, st->pipe, u->TexObj) ||
!st_finalize_texture(st->ctx, st->pipe, u->TexObj, 0) ||
!stObj->pt) {
memset(img, 0, sizeof(*img));
continue;

View File

@ -73,7 +73,7 @@ update_single_texture(struct st_context *st,
}
stObj = st_texture_object(texObj);
retval = st_finalize_texture(ctx, st->pipe, texObj);
retval = st_finalize_texture(ctx, st->pipe, texObj, 0);
if (!retval) {
/* out of mem */
return GL_FALSE;

View File

@ -488,7 +488,7 @@ st_render_texture(struct gl_context *ctx,
struct st_renderbuffer *strb = st_renderbuffer(rb);
struct pipe_resource *pt;
if (!st_finalize_texture(ctx, pipe, att->Texture))
if (!st_finalize_texture(ctx, pipe, att->Texture, att->CubeMapFace))
return;
pt = st_get_texobj_resource(att->Texture);

View File

@ -2434,7 +2434,8 @@ copy_image_data_to_texture(struct st_context *st,
GLboolean
st_finalize_texture(struct gl_context *ctx,
struct pipe_context *pipe,
struct gl_texture_object *tObj)
struct gl_texture_object *tObj,
GLuint cubeMapFace)
{
struct st_context *st = st_context(ctx);
struct st_texture_object *stObj = st_texture_object(tObj);
@ -2478,7 +2479,7 @@ st_finalize_texture(struct gl_context *ctx,
}
firstImage = st_texture_image_const(_mesa_base_tex_image(&stObj->base));
firstImage = st_texture_image_const(stObj->base.Image[cubeMapFace][stObj->base.BaseLevel]);
assert(firstImage);
/* If both firstImage and stObj point to a texture which can contain

View File

@ -47,7 +47,8 @@ st_get_blit_mask(GLenum srcFormat, GLenum dstFormat);
extern GLboolean
st_finalize_texture(struct gl_context *ctx,
struct pipe_context *pipe,
struct gl_texture_object *tObj);
struct gl_texture_object *tObj,
GLuint cubeMapFace);
extern void

View File

@ -125,7 +125,7 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target,
*
* After this, we'll have all mipmap levels in one resource.
*/
st_finalize_texture(ctx, st->pipe, texObj);
st_finalize_texture(ctx, st->pipe, texObj, 0);
}
pt = stObj->pt;