diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-12 16:45:42 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-12 16:45:42 +0100 |
| commit | cc6db22a772cc52ead6a5c11d7d02e7364f6326c (patch) | |
| tree | d80b42172d703ec20ccd99c68a067505e2706899 /xorg-server/glamor/glamor_pixmap.c | |
| parent | 2112b7dec49833ba872bd3ebcd7288930fec0796 (diff) | |
| parent | cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914 (diff) | |
| download | vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.tar.gz vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.tar.bz2 vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver xkbcomp git update 12 Mar 2014
Diffstat (limited to 'xorg-server/glamor/glamor_pixmap.c')
| -rw-r--r-- | xorg-server/glamor/glamor_pixmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/glamor/glamor_pixmap.c b/xorg-server/glamor/glamor_pixmap.c index 77197b5d1..119e4d9d1 100644 --- a/xorg-server/glamor/glamor_pixmap.c +++ b/xorg-server/glamor/glamor_pixmap.c @@ -697,7 +697,6 @@ glamor_color_convert_to_bits(void *src_bits, void *dst_bits, int w, int h, * Upload pixmap to a specified texture. * This texture may not be the one attached to it. **/ -int in_restore = 0; static void __glamor_upload_pixmap_to_texture(PixmapPtr pixmap, unsigned int *tex, GLenum format, @@ -1529,7 +1528,7 @@ glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv) drawable = &pixmap_priv->base.pixmap->drawable; - if (!GLAMOR_PIXMAP_FBO_NOT_EAXCT_SIZE(pixmap_priv)) + if (!GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE(pixmap_priv)) return TRUE; old_fbo = pixmap_priv->base.fbo; |