[PATCH 2/7] glamor: Remove dead gl_tex flag in the fbo struct.
Eric Anholt
eric at anholt.net
Tue Mar 24 13:25:51 PDT 2015
This used to be used in the old copy_area path.
---
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 ea0e801..aedc804 100644
--- a/glamor/glamor_fbo.c
+++ b/glamor/glamor_fbo.c
@@ -476,12 +476,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 03529c7..db0300c 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -371,7 +371,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.
@@ -449,7 +448,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;
--
2.1.4
More information about the xorg-devel
mailing list