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

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>
This commit is contained in:
Eric Anholt 2015-02-04 18:02:34 -08:00
parent 0e3f1252da
commit 82d23fc729
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glamor/glamor_pixmap.c
View File

@ -1047,27 +1047,13 @@ glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w,
enum glamor_pixmap_status enum glamor_pixmap_status
glamor_upload_pixmap_to_texture(PixmapPtr pixmap) glamor_upload_pixmap_to_texture(PixmapPtr pixmap)
{ {
glamor_pixmap_private *pixmap_priv;
void *data;
int pbo;
int ret; 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, if (glamor_upload_sub_pixmap_to_texture(pixmap, 0, 0,
pixmap->drawable.width, pixmap->drawable.width,
pixmap->drawable.height, pixmap->drawable.height,
pixmap->devKind, data, pbo)) pixmap->devKind,
pixmap->devPrivate.ptr, 0))
ret = GLAMOR_UPLOAD_DONE; ret = GLAMOR_UPLOAD_DONE;
else else
ret = GLAMOR_UPLOAD_FAILED; ret = GLAMOR_UPLOAD_FAILED;

2
glamor/glamor_priv.h
View File

@ -326,7 +326,6 @@ enum glamor_fbo_state {
* @expire: when push to cache pool list, set a expire count. * @expire: when push to cache pool list, set a expire count.
* will be freed when glamor_priv->tick is equal or * will be freed when glamor_priv->tick is equal or
* larger than this expire count in block handler. * larger than this expire count in block handler.
* @pbo_valid: The pbo has a valid copy of the pixmap's data.
* @tex: attached texture. * @tex: attached texture.
* @fb: attached fbo. * @fb: attached fbo.
* @pbo: attached pbo. * @pbo: attached pbo.
@ -340,7 +339,6 @@ enum glamor_fbo_state {
typedef struct glamor_pixmap_fbo { typedef struct glamor_pixmap_fbo {
struct xorg_list list; struct xorg_list list;
unsigned int expire; unsigned int expire;
unsigned char pbo_valid;
GLuint tex; GLuint tex;
GLuint fb; GLuint fb;
GLuint pbo; GLuint pbo;