Module: Mesa Branch: master Commit: 9afca9198471e77a65f3ab70f2a9b4a67396b1a0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9afca9198471e77a65f3ab70f2a9b4a67396b1a0
Author: Kenneth Graunke <[email protected]> Date: Wed Mar 5 19:21:00 2014 -0800 meta: Drop redundant FBO creation code in GenerateMipmaps. fallback_required() already creates the FBO in order to check whether we can render to the format. So it's guaranteed to exist. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Anuj Phogat <[email protected]> Reviewed-by: Ian Romanick <[email protected]> --- src/mesa/drivers/common/meta_generate_mipmap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c b/src/mesa/drivers/common/meta_generate_mipmap.c index 6db3f8f..6a0ccbd 100644 --- a/src/mesa/drivers/common/meta_generate_mipmap.c +++ b/src/mesa/drivers/common/meta_generate_mipmap.c @@ -208,10 +208,6 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, if (currentTexUnitSave != 0) _mesa_BindTexture(target, texObj->Name); - if (!mipmap->FBO) { - _mesa_GenFramebuffers(1, &mipmap->FBO); - } - if (!mipmap->Sampler) { _mesa_GenSamplers(1, &mipmap->Sampler); _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler); @@ -236,6 +232,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler); } + assert(mipmap->FBO != 0); _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO); _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
