diff options
| author | Eric Anholt <eric@anholt.net> | 2015-02-04 18:02:34 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-07-02 10:05:59 -0700 |
| commit | 82d23fc7290a2986efbc2982eeaa0de0ad5ad0d1 (patch) | |
| tree | ef0f7cf97948cbf38e3780fe74c3c88f8f77bf1a | |
| parent | 0e3f1252dacdc3194a99a2d090b5c13f070f8799 (diff) | |
glamor: Propagate the fact that pbo_valid is never set.
The code to set it was deleted in keithp's big rewrite.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | glamor/glamor_pixmap.c | 18 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 2 |
2 files changed, 2 insertions, 18 deletions
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 4e8737172..f2bf2237c 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -1047,27 +1047,13 @@ glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w, enum glamor_pixmap_status glamor_upload_pixmap_to_texture(PixmapPtr pixmap) { - glamor_pixmap_private *pixmap_priv; - void *data; - int pbo; int ret; - pixmap_priv = glamor_get_pixmap_private(pixmap); - - if ((pixmap_priv->fbo) - && (pixmap_priv->fbo->pbo_valid)) { - data = NULL; - pbo = pixmap_priv->fbo->pbo; - } - else { - data = pixmap->devPrivate.ptr; - pbo = 0; - } - if (glamor_upload_sub_pixmap_to_texture(pixmap, 0, 0, pixmap->drawable.width, pixmap->drawable.height, - pixmap->devKind, data, pbo)) + pixmap->devKind, + pixmap->devPrivate.ptr, 0)) ret = GLAMOR_UPLOAD_DONE; else ret = GLAMOR_UPLOAD_FAILED; diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 3e666b482..90489a205 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -326,7 +326,6 @@ enum glamor_fbo_state { * @expire: when push to cache pool list, set a expire count. * will be freed when glamor_priv->tick is equal or * larger than this expire count in block handler. - * @pbo_valid: The pbo has a valid copy of the pixmap's data. * @tex: attached texture. * @fb: attached fbo. * @pbo: attached pbo. @@ -340,7 +339,6 @@ enum glamor_fbo_state { typedef struct glamor_pixmap_fbo { struct xorg_list list; unsigned int expire; - unsigned char pbo_valid; GLuint tex; GLuint fb; GLuint pbo; |