Above, we've already checked for ->fbo && ->fbo->fb and returned.
Signed-off-by: Eric Anholt <[email protected]> --- 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 f2bf223..0e51550 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) -- 2.1.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
