[PATCH 3/5] glamor: Drop dead glamor_restore_pixmap_to_texture().

[Eric Anholt]

Unused since the glamor_prepare.c replacement of glamor_finish_access().

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor_pixmap.c |  7 -------
 glamor/glamor_priv.h   | 10 ----------
 2 files changed, 17 deletions(-)

diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index 2275ede..725fa5e 100644
--- a/glamor/glamor_pixmap.c
+++ b/glamor/glamor_pixmap.c
@@ -1064,13 +1064,6 @@ glamor_upload_pixmap_to_texture(PixmapPtr pixmap)
     return ret;
 }
 
-void
-glamor_restore_pixmap_to_texture(PixmapPtr pixmap)
-{
-    if (glamor_upload_pixmap_to_texture(pixmap) != GLAMOR_UPLOAD_DONE)
-        LogMessage(X_WARNING, "Failed to restore pixmap to texture.\n");
-}
-
 /*
  * as gles2 only support a very small set of color format and
  * type when do glReadPixel,
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 17406ab..61f393d 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -789,16 +789,6 @@ void
 glamor_put_vbo_space(ScreenPtr screen);
 
 /**
- * Restore a pixmap's data which is downloaded by
- * glamor_download_pixmap_to_cpu to its original
- * gl texture. Used by glamor_finish_access.
- *
- * The pixmap must originally be a texture -- gl_fbo must be
- * GLAMOR_FBO_NORMAL.
- **/
-void glamor_restore_pixmap_to_texture(PixmapPtr pixmap);
-
-/**
  * According to the flag,
  * if the flag is GLAMOR_CREATE_FBO_NO_FBO then just ensure
  * the fbo has a valid texture. Otherwise, it will ensure
-- 
2.0.0