From d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 13 Apr 2014 14:24:56 +0200 Subject: fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014 xserver commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2 libxcb commit 29e419c5840a1eeda3336a0802686ee723dcaab3 libxcb/xcb-proto commit 70fea02b7d90d86e9d3b0dc5b61406bf4c910999 pixman commit 4b76bbfda670f9ede67d0449f3640605e1fc4df0 fontconfig commit f44157c809d280e2a0ce87fb078fc4b278d24a67 mesa commit 936dda08ee6d7b2be2b016bc06780e401088ec13 --- xorg-server/glamor/glamor_xv.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'xorg-server/glamor/glamor_xv.c') diff --git a/xorg-server/glamor/glamor_xv.c b/xorg-server/glamor/glamor_xv.c index 17745a4e8..4e60fa3a4 100644 --- a/xorg-server/glamor/glamor_xv.c +++ b/xorg-server/glamor/glamor_xv.c @@ -114,18 +114,6 @@ glamor_init_xv_shader(ScreenPtr screen) glamor_put_context(glamor_priv); } -void -glamor_fini_xv_shader(ScreenPtr screen) -{ - glamor_screen_private *glamor_priv; - - glamor_priv = glamor_get_screen_private(screen); - glamor_get_context(glamor_priv); - - glDeleteProgram(glamor_priv->xv_prog); - glamor_put_context(glamor_priv); -} - #define ClipValue(v,min,max) ((v) < (min) ? (min) : (v) > (max) ? (max) : (v)) #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) @@ -559,6 +547,8 @@ glamor_xv_init(ScreenPtr screen, int num_texture_ports) XF86VideoAdaptorPtr adapt; int i; + glamor_init_xv_shader(screen); + adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + num_texture_ports * (sizeof(glamor_port_private) + sizeof(DevUnion))); if (adapt == NULL) -- cgit v1.2.3