From 2f9fe2d80a35b8857682771fddbee628213da7b3 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sun, 28 Jul 2013 13:08:27 -0700 Subject: [PATCH] mesa: Generate a renderbuffer wrapper even if the texture has no image This prevents a segfault in check_begin_texture_render when an FBO is rebound while in this state. This fixes the piglit test fbo-incomplete-invalid-texture. Signed-off-by: Ian Romanick Acked-by: Kenneth Graunke Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org --- src/mesa/main/fbobject.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 76aa0bf3b4d..74f294c1d36 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -385,8 +385,6 @@ _mesa_update_texture_renderbuffer(struct gl_context *ctx, struct gl_renderbuffer *rb; texImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel]; - if (!texImage) - return; rb = att->Renderbuffer; if (!rb) { @@ -405,6 +403,9 @@ _mesa_update_texture_renderbuffer(struct gl_context *ctx, rb->NeedsFinishRenderTexture = ctx->Driver.FinishRenderTexture != NULL; } + if (!texImage) + return; + rb->_BaseFormat = texImage->_BaseFormat; rb->Format = texImage->TexFormat; rb->InternalFormat = texImage->InternalFormat; -- 2.30.2