diff options
| author | Eric Anholt <eric@anholt.net> | 2017-05-17 11:36:07 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2017-06-02 17:46:46 -0700 |
| commit | 72ddad7a97fa062bf9967d221c9a5520ebe33352 (patch) | |
| tree | a4542c7813a5ff227e450169658ceb4c02316f98 /hw | |
| parent | 49b12cb7360608b14caef5facb12f146d0bd15e6 (diff) | |
glamor: Drop glamor_set_screen_pixmap().
All that was left here was updating the FBO's size. However, the FBO
size was always set correctly already through
glamor_set_pixmap_texture() from whoever had attached a new BO to the
pixmap.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/drivers/modesetting/drmmode_display.c | 5 | ||||
| -rw-r--r-- | hw/xwayland/xwayland-glamor.c | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index 850888c94..aa6baae09 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -1919,11 +1919,6 @@ drmmode_glamor_handle_new_screen_pixmap(drmmode_ptr drmmode) if (!drmmode_set_pixmap_bo(drmmode, screen_pixmap, &drmmode->front_bo)) return FALSE; -#ifdef GLAMOR_HAS_GBM - if (drmmode->glamor) - glamor_set_screen_pixmap(screen_pixmap, NULL); -#endif - return TRUE; } diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c index 63f230369..87622839e 100644 --- a/hw/xwayland/xwayland-glamor.c +++ b/hw/xwayland/xwayland-glamor.c @@ -243,8 +243,6 @@ xwl_glamor_create_screen_resources(ScreenPtr screen) xwl_glamor_create_pixmap(screen, screen->width, screen->height, screen->rootDepth, CREATE_PIXMAP_USAGE_BACKING_PIXMAP); - if (screen->devPrivate) - glamor_set_screen_pixmap(screen->devPrivate, NULL); } SetRootClip(screen, xwl_screen->root_clip_mode); |