From 835067a4095e5e48703aa6561fea3ee95923e832 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 30 Jun 2015 14:14:50 -0700 Subject: [PATCH] glamor: Drop a redundant check. Above, we've already checked for ->fbo && ->fbo->fb and returned. Signed-off-by: Eric Anholt Reviewed-by: Alex Deucher --- glamor/glamor_pixmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index f2bf2237c..0e5155091 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -897,8 +897,7 @@ glamor_pixmap_upload_prepare(PixmapPtr pixmap, GLenum format, int no_alpha, } if ((flag == GLAMOR_CREATE_FBO_NO_FBO - && pixmap_priv->fbo && pixmap_priv->fbo->tex) - || (flag == 0 && pixmap_priv->fbo && pixmap_priv->fbo->fb)) + && pixmap_priv->fbo && pixmap_priv->fbo->tex)) return 0; if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)