frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2015-02-04 18:07:06 -08:00
parent 82d23fc729
commit 1734aa2856
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glamor/glamor_fbo.c
View File

@ -479,12 +479,6 @@ glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo)
case GLAMOR_TEXTURE_ONLY: case GLAMOR_TEXTURE_ONLY:
case GLAMOR_TEXTURE_DRM: case GLAMOR_TEXTURE_DRM:
pixmap_priv->gl_fbo = GLAMOR_FBO_NORMAL; 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; pixmap->devPrivate.ptr = NULL;
default: default:
break; break;

2
glamor/glamor_priv.h
View File

@ -351,7 +351,6 @@ typedef struct glamor_pixmap_fbo {
/* /*
* glamor_pixmap_private - glamor pixmap's private structure. * 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. * @is_picture: The drawable is attached to a picture.
* @pict_format: the corresponding picture's format. * @pict_format: the corresponding picture's format.
* @pixmap: The corresponding pixmap's pointer. * @pixmap: The corresponding pixmap's pointer.
@ -429,7 +428,6 @@ typedef struct glamor_pixmap_private {
*/ */
glamor_access_t map_access; glamor_access_t map_access;
unsigned char is_picture:1; unsigned char is_picture:1;
unsigned char gl_tex:1;
glamor_pixmap_fbo *fbo; glamor_pixmap_fbo *fbo;
BoxRec box; BoxRec box;
int drm_stride; int drm_stride;