diff options
| author | Eric Anholt <[email protected]> | 2018-03-27 15:39:49 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-03-28 17:48:41 -0700 |
| commit | 0349c79bdc2c04b3d64d144159f3268ad74e2b7c (patch) | |
| tree | b415216c8d8ed928a822fa0383f8be11dc7b5a3e /src/mesa | |
| parent | e159d46fc7c579b40f76ffb400ef1aebd3a59560 (diff) | |
st: Don't try to finalize the texture in st_render_texture().
We can't necessarily finalize the texture at this point if we're rendering
to a texture image whose format is different from the baselevel's format.
This was introduced as a fix for fbo-incomplete-texture-03 in
de414f491526610bb260c73805c81ba413388e20, but the later fix for vmware on
that testcase in 95d5c48f68b598cfa6db25f44aac52b3e11403cc made it
unnecessary.
Fixes assertion failures in util_resource_copy_region() in
KHR-GLES3.copy_tex_image_conversions.forbidden.* when trying to finalize
an R8 texture image to the RG8 texture object's pt.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_fbo.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c index 02ae8e1380e..f859133e399 100644 --- a/src/mesa/state_tracker/st_cb_fbo.c +++ b/src/mesa/state_tracker/st_cb_fbo.c @@ -509,14 +509,10 @@ st_render_texture(struct gl_context *ctx, struct gl_renderbuffer_attachment *att) { struct st_context *st = st_context(ctx); - struct pipe_context *pipe = st->pipe; struct gl_renderbuffer *rb = att->Renderbuffer; struct st_renderbuffer *strb = st_renderbuffer(rb); struct pipe_resource *pt; - if (!st_finalize_texture(ctx, pipe, att->Texture, att->CubeMapFace)) - return; - pt = get_teximage_resource(att->Texture, att->CubeMapFace, att->TextureLevel); |