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

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>
This commit is contained in:
Eric Anholt 2017-05-17 11:36:07 -07:00
parent 49b12cb736
commit 72ddad7a97
5 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glamor/glamor.c
View File

@ -114,19 +114,6 @@ glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex)
glamor_pixmap_attach_fbo(pixmap, fbo); glamor_pixmap_attach_fbo(pixmap, fbo);
} }
void
glamor_set_screen_pixmap(PixmapPtr screen_pixmap, PixmapPtr *back_pixmap)
{
glamor_pixmap_private *pixmap_priv;
glamor_screen_private *glamor_priv;
glamor_priv = glamor_get_screen_private(screen_pixmap->drawable.pScreen);
pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
pixmap_priv->fbo->width = screen_pixmap->drawable.width;
pixmap_priv->fbo->height = screen_pixmap->drawable.height;
}
uint32_t uint32_t
glamor_get_pixmap_texture(PixmapPtr pixmap) glamor_get_pixmap_texture(PixmapPtr pixmap)
{ {

6
glamor/glamor.h
View File

@ -103,12 +103,6 @@ extern _X_EXPORT void glamor_fini(ScreenPtr screen);
* Otherwise, the glamor internal structure will not be freed.*/ * Otherwise, the glamor internal structure will not be freed.*/
extern _X_EXPORT Bool glamor_close_screen(ScreenPtr screen); extern _X_EXPORT Bool glamor_close_screen(ScreenPtr screen);
/* Let glamor to know the screen's fbo. The low level
* driver should already assign a tex
* to this pixmap through the set_pixmap_texture. */
extern _X_EXPORT void glamor_set_screen_pixmap(PixmapPtr screen_pixmap,
PixmapPtr *back_pixmap);
extern _X_EXPORT uint32_t glamor_get_pixmap_texture(PixmapPtr pixmap); extern _X_EXPORT uint32_t glamor_get_pixmap_texture(PixmapPtr pixmap);
extern _X_EXPORT void glamor_set_pixmap_texture(PixmapPtr pixmap, extern _X_EXPORT void glamor_set_pixmap_texture(PixmapPtr pixmap,

1
glamor/glamor_egl.c
View File

@ -144,7 +144,6 @@ glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
"Failed to create textured screen."); "Failed to create textured screen.");
return FALSE; return FALSE;
} }
glamor_set_screen_pixmap(screen_pixmap, NULL);
return TRUE; return TRUE;
} }

5
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -1919,11 +1919,6 @@ drmmode_glamor_handle_new_screen_pixmap(drmmode_ptr drmmode)
if (!drmmode_set_pixmap_bo(drmmode, screen_pixmap, &drmmode->front_bo)) if (!drmmode_set_pixmap_bo(drmmode, screen_pixmap, &drmmode->front_bo))
return FALSE; return FALSE;
#ifdef GLAMOR_HAS_GBM
if (drmmode->glamor)
glamor_set_screen_pixmap(screen_pixmap, NULL);
#endif
return TRUE; return TRUE;
} }

2
hw/xwayland/xwayland-glamor.c
View File

@ -243,8 +243,6 @@ xwl_glamor_create_screen_resources(ScreenPtr screen)
xwl_glamor_create_pixmap(screen, screen->width, screen->height, xwl_glamor_create_pixmap(screen, screen->width, screen->height,
screen->rootDepth, screen->rootDepth,
CREATE_PIXMAP_USAGE_BACKING_PIXMAP); CREATE_PIXMAP_USAGE_BACKING_PIXMAP);
if (screen->devPrivate)
glamor_set_screen_pixmap(screen->devPrivate, NULL);
} }
SetRootClip(screen, xwl_screen->root_clip_mode); SetRootClip(screen, xwl_screen->root_clip_mode);