diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-07-28 13:08:27 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-10-03 09:53:44 -0700 |
| commit | 64d3c2b7d5c6d81d0c83340bc53f9b17bd2170ac (patch) | |
| tree | 70d319399002540796c2b8f687961da8eafbbee5 | |
| parent | b10122ac03917f0e6edcecc8486d4de406e8849c (diff) | |
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 <ian.d.romanick@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org
(cherry picked from commit 2f9fe2d80a35b8857682771fddbee628213da7b3)
Conflicts:
src/mesa/main/fbobject.c
| -rw-r--r-- | src/mesa/main/fbobject.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 07bebe1abdb..434e47aaa4b 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 = _mesa_get_attachment_teximage(att); - 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; + if (driver_RenderTexture_is_safe(att)) ctx->Driver.RenderTexture(ctx, fb, att); } |