diff options
| author | Eric Anholt <eric@anholt.net> | 2014-06-16 07:06:30 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-07-17 17:35:44 -0700 |
| commit | b5f94df319469ad44b0e88374a0d389414803f7a (patch) | |
| tree | 0284f92e859cc172252b1507aff8b1454080b92b | |
| parent | 98155bd9d9b2a15a4dbcf80b2b57a7636efb14da (diff) | |
glamor: Drop dead glamor_restore_pixmap_to_texture().
Unused since the glamor_prepare.c replacement of glamor_finish_access().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | glamor/glamor_pixmap.c | 7 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 10 |
2 files changed, 0 insertions, 17 deletions
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 2275ede32..725fa5e7f 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 17406abdc..61f393d8f 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 |