glamor: Stop tracking the screen_fbo.
This means we no longer get "s" for on-screen drawing in glamor_debug, and there's only "m" (CPU memory) or "f" (Any GPU memory, aka FBOs). That seems fine to me. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
fd0d2523a3
commit
49b12cb736
|
@ -122,7 +122,6 @@ glamor_set_screen_pixmap(PixmapPtr screen_pixmap, PixmapPtr *back_pixmap)
|
||||||
|
|
||||||
glamor_priv = glamor_get_screen_private(screen_pixmap->drawable.pScreen);
|
glamor_priv = glamor_get_screen_private(screen_pixmap->drawable.pScreen);
|
||||||
pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
|
pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
|
||||||
glamor_priv->screen_fbo = pixmap_priv->fbo->fb;
|
|
||||||
|
|
||||||
pixmap_priv->fbo->width = screen_pixmap->drawable.width;
|
pixmap_priv->fbo->width = screen_pixmap->drawable.width;
|
||||||
pixmap_priv->fbo->height = screen_pixmap->drawable.height;
|
pixmap_priv->fbo->height = screen_pixmap->drawable.height;
|
||||||
|
|
|
@ -40,12 +40,9 @@ glamor_get_drawable_location(const DrawablePtr drawable)
|
||||||
{
|
{
|
||||||
PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
|
PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
|
||||||
glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
|
glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
|
||||||
glamor_screen_private *glamor_priv =
|
|
||||||
glamor_get_screen_private(drawable->pScreen);
|
|
||||||
if (pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
|
if (pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
|
||||||
return 'm';
|
return 'm';
|
||||||
if (pixmap_priv->fbo->fb == glamor_priv->screen_fbo)
|
|
||||||
return 's';
|
|
||||||
else
|
else
|
||||||
return 'f';
|
return 'f';
|
||||||
}
|
}
|
||||||
|
|
|
@ -281,7 +281,6 @@ typedef struct glamor_screen_private {
|
||||||
int linear_max_nstops;
|
int linear_max_nstops;
|
||||||
int radial_max_nstops;
|
int radial_max_nstops;
|
||||||
|
|
||||||
int screen_fbo;
|
|
||||||
struct glamor_saved_procs saved_procs;
|
struct glamor_saved_procs saved_procs;
|
||||||
char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
|
char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
|
||||||
int delayed_fallback_pending;
|
int delayed_fallback_pending;
|
||||||
|
|
Loading…
Reference in New Issue