KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Don't call driver RenderTexture for really broken textures 

This fixes the segfault in the '0x0 texture' subtest of piglit's
fbo-incomplete test.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org
This commit is contained in:
Ian Romanick 2013-07-27 12:04:20 -07:00
parent 0c3dbd689b
commit fb49713f8e
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mesa/main/fbobject.c
View File

@ -342,6 +342,22 @@ _mesa_remove_attachment(struct gl_context *ctx,
att->Complete = GL_TRUE;
}
/**
* Verify a couple error conditions that will lead to an incomplete FBO and
* may cause problems for the driver's RenderTexture path.
*/
static bool
driver_RenderTexture_is_safe(const struct gl_renderbuffer_attachment *att)
{
const struct gl_texture_image *const texImage =
att->Texture->Image[att->CubeMapFace][att->TextureLevel];
if (texImage->Width == 0 || texImage->Height == 0 || texImage->Depth == 0)
return false;
return true;
}
/**
* Create a renderbuffer which will be set up by the driver to wrap the
* texture image slice.
@ -391,7 +407,8 @@ _mesa_update_texture_renderbuffer(struct gl_context *ctx,
rb->NumSamples = texImage->NumSamples;
rb->TexImage = texImage;
ctx->Driver.RenderTexture(ctx, fb, att);
if (driver_RenderTexture_is_safe(att))
ctx->Driver.RenderTexture(ctx, fb, att);
}
/**
@ -1885,7 +1902,8 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
for (i = 0; i < BUFFER_COUNT; i++) {
struct gl_renderbuffer_attachment *att = fb->Attachment + i;
if (att->Texture && att->Renderbuffer->TexImage) {
if (att->Texture && att->Renderbuffer->TexImage
&& driver_RenderTexture_is_safe(att)) {
ctx->Driver.RenderTexture(ctx, fb, att);
}
}