diff options
-rw-r--r-- | glamor/glamor.c | 6 | ||||
-rw-r--r-- | glamor/glamor_xv.c | 14 |
2 files changed, 2 insertions, 18 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index 971dbf891..a7d981cd8 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -494,9 +494,6 @@ glamor_init(ScreenPtr screen, unsigned int flags) #ifdef GLAMOR_GRADIENT_SHADER glamor_init_gradient_shader(screen); #endif -#ifdef GLAMOR_XV - glamor_init_xv_shader(screen); -#endif glamor_pixmap_init(screen); glamor_glyphs_init(screen); @@ -516,9 +513,6 @@ glamor_release_screen_priv(ScreenPtr screen) glamor_screen_private *glamor_priv; glamor_priv = glamor_get_screen_private(screen); -#ifdef GLAMOR_XV - glamor_fini_xv_shader(screen); -#endif #ifdef RENDER glamor_fini_composite_shaders(screen); #endif diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index 17745a4e8..4e60fa3a4 100644 --- a/glamor/glamor_xv.c +++ b/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) |