vl: Remove pipe_video_surface hooks from pipe_screen as well.

diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index e4a92228093b84774d5fa0d25bb1a62e87951d1e..b8e007ec8acf77d4fef68656c5223b17adb45aed 100644 (file)
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -55,7 +55,6 @@ struct pipe_winsys;
 struct pipe_buffer;
 struct pipe_texture;
 struct pipe_surface;
-struct pipe_video_surface;
 struct pipe_transfer;
 
 
@@ -260,17 +259,6 @@ struct pipe_screen {
 
    void (*buffer_destroy)( struct pipe_buffer *buf );
 
-   /**
-    * Create a video surface suitable for use as a decoding target by the
-    * driver's pipe_video_context.
-    */
-   struct pipe_video_surface*
-   (*video_surface_create)( struct pipe_screen *screen,
-                            enum pipe_video_chroma_format chroma_format,
-                            unsigned width, unsigned height );
-
-   void (*video_surface_destroy)( struct pipe_video_surface *vsfc );
-
    /**
     * Do any special operations to ensure buffer size is correct
     */

diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c
index d2c4e5f19caca272d94c4595bb80c4506198ce96..354c257a806447a90dd9551c1cf0ccb714e34eed 100644 (file)
--- a/src/gallium/state_trackers/xorg/xvmc/surface.c
+++ b/src/gallium/state_trackers/xorg/xvmc/surface.c
@@ -127,8 +127,7 @@ CreateOrResizeBackBuffer(struct vl_context *vctx, unsigned int width, unsigned i
       return false;
 
    *backbuffer = vpipe->screen->get_tex_surface(vpipe->screen, tex, 0, 0, 0,
-                                                PIPE_BUFFER_USAGE_GPU_READ |
-                                                PIPE_BUFFER_USAGE_GPU_WRITE);
+                                                PIPE_BUFFER_USAGE_GPU_READ_WRITE);
    pipe_texture_reference(&tex, NULL);
 
    if (!*backbuffer)