From 1734aa285663d83070e6313bb976f976aa2bea4c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 4 Feb 2015 18:07:06 -0800 Subject: [PATCH] glamor: Remove dead gl_tex flag in the fbo struct. This used to be used in the old copy_area path. Signed-off-by: Eric Anholt Reviewed-by: Kenneth Graunke --- glamor/glamor_fbo.c | 6 ------ glamor/glamor_priv.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c index 6017f5e32..abb7284c6 100644 --- a/glamor/glamor_fbo.c +++ b/glamor/glamor_fbo.c @@ -479,12 +479,6 @@ glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo) case GLAMOR_TEXTURE_ONLY: case GLAMOR_TEXTURE_DRM: pixmap_priv->gl_fbo = GLAMOR_FBO_NORMAL; - if (fbo->tex != 0) - pixmap_priv->gl_tex = 1; - else { - /* XXX For the Xephyr only, may be broken now. */ - pixmap_priv->gl_tex = 0; - } pixmap->devPrivate.ptr = NULL; default: break; diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 90489a205..d72c9bc1b 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -351,7 +351,6 @@ typedef struct glamor_pixmap_fbo { /* * glamor_pixmap_private - glamor pixmap's private structure. - * @gl_tex: The pixmap is in a gl texture originally. * @is_picture: The drawable is attached to a picture. * @pict_format: the corresponding picture's format. * @pixmap: The corresponding pixmap's pointer. @@ -429,7 +428,6 @@ typedef struct glamor_pixmap_private { */ glamor_access_t map_access; unsigned char is_picture:1; - unsigned char gl_tex:1; glamor_pixmap_fbo *fbo; BoxRec box; int drm_stride;