aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gallium/include/pipe/p_screen.h12
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/surface.c3
2 files changed, 1 insertions, 14 deletions
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index e4a92228093..b8e007ec8ac 100644
--- 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;
@@ -261,17 +260,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
*/
void (*update_buffer)( struct pipe_screen *ws,
diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c
index d2c4e5f19ca..354c257a806 100644
--- 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)