[PATCH xserver 6/8] glamor: Remove unused glamor_create_screen_resources
Adam Jackson
ajax at redhat.com
Wed Nov 1 20:31:34 UTC 2017
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
glamor/glamor.c | 25 -------------------------
glamor/glamor_priv.h | 1 -
2 files changed, 26 deletions(-)
diff --git a/glamor/glamor.c b/glamor/glamor.c
index cf4a76a7f..9fd110ed2 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -346,25 +346,6 @@ fallback:
}
-/**
- * Creates any pixmaps used internally by glamor, since those can't be
- * allocated at ScreenInit time.
- */
-static Bool
-glamor_create_screen_resources(ScreenPtr screen)
-{
- glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
- Bool ret = TRUE;
-
- screen->CreateScreenResources =
- glamor_priv->saved_procs.create_screen_resources;
- if (screen->CreateScreenResources)
- ret = screen->CreateScreenResources(screen);
- screen->CreateScreenResources = glamor_create_screen_resources;
-
- return ret;
-}
-
static Bool
glamor_check_instruction_count(int gl_version)
{
@@ -665,10 +646,6 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_set_debug_level(&glamor_debug_level);
- glamor_priv->saved_procs.create_screen_resources =
- screen->CreateScreenResources;
- screen->CreateScreenResources = glamor_create_screen_resources;
-
if (!glamor_font_init(screen))
goto fail;
@@ -764,8 +741,6 @@ glamor_close_screen(ScreenPtr screen)
glamor_sync_close(screen);
glamor_composite_glyphs_fini(screen);
screen->CloseScreen = glamor_priv->saved_procs.close_screen;
- screen->CreateScreenResources =
- glamor_priv->saved_procs.create_screen_resources;
screen->CreateGC = glamor_priv->saved_procs.create_gc;
screen->CreatePixmap = glamor_priv->saved_procs.create_pixmap;
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 315cd8e93..631f3d167 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -162,7 +162,6 @@ enum glamor_gl_flavor {
struct glamor_saved_procs {
CloseScreenProcPtr close_screen;
- CreateScreenResourcesProcPtr create_screen_resources;
CreateGCProcPtr create_gc;
CreatePixmapProcPtr create_pixmap;
DestroyPixmapProcPtr destroy_pixmap;
--
2.14.3
More information about the xorg-devel
mailing list