summaryrefslogtreecommitdiff
path: root/glamor
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2017-07-11 15:37:07 -0400
committerAdam Jackson <ajax@redhat.com>2017-11-07 15:57:57 -0500
commit9bd5a198dc5383d0d2a1e28f7aa4270132eca5db (patch)
tree6d97cc1164c7ec02545b5b8d487e226dc1dcf280 /glamor
parent081675f7ffda0cce20b395874d6e5755fb6600a0 (diff)
glamor: Remove unused glamor_create_screen_resources
Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'glamor')
-rw-r--r--glamor/glamor.c25
-rw-r--r--glamor/glamor_priv.h1
2 files changed, 0 insertions, 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 ea4ea7151..ce50abd04 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -163,7 +163,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;