summaryrefslogtreecommitdiff
path: root/glamor/glamor_core.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-05-17 11:33:16 -0700
committerEric Anholt <eric@anholt.net>2017-06-02 17:46:45 -0700
commit49b12cb7360608b14caef5facb12f146d0bd15e6 (patch)
tree577ab33efd85f8e587b388271876d45ff83b0d7e /glamor/glamor_core.c
parentfd0d2523a33620b36cd478925ddac5cf70f9c409 (diff)
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>
Diffstat (limited to 'glamor/glamor_core.c')
-rw-r--r--glamor/glamor_core.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 610ae71f3..cb315e2d1 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -40,12 +40,9 @@ glamor_get_drawable_location(const DrawablePtr drawable)
{
PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
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)
return 'm';
- if (pixmap_priv->fbo->fb == glamor_priv->screen_fbo)
- return 's';
else
return 'f';
}