Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / include / pipe / p_video_context.h

diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_context.h
index 294dc464c36a3f8b9c341d3981d8fa3d5641caa0..2dfdba413ac6d52173fd24d7300a854566f9e127 100644 (file)
--- a/src/gallium/include/pipe/p_video_context.h
+++ b/src/gallium/include/pipe/p_video_context.h
@@ -74,6 +74,10 @@ struct pipe_video_context
 
    void (*destroy)(struct pipe_video_context *vpipe);
 
+   struct pipe_surface *(*create_surface)(struct pipe_video_context *vpipe,
+                                          struct pipe_resource *resource,
+                                          const struct pipe_surface *templat);
+
    /**
     * Picture decoding and displaying
     */
@@ -116,7 +120,7 @@ struct pipe_video_context
 
    struct pipe_transfer *(*get_transfer)(struct pipe_video_context *vpipe,
                                          struct pipe_resource *resource,
-                                         struct pipe_subresource subresource,
+                                         unsigned level,
                                          unsigned usage,  /* a combination of PIPE_TRANSFER_x */
                                          const struct pipe_box *box);
 
@@ -135,7 +139,7 @@ struct pipe_video_context
 
    void (*transfer_inline_write)(struct pipe_video_context *vpipe,
                                  struct pipe_resource *resource,
-                                 struct pipe_subresource subresource,
+                                 unsigned level,
                                  unsigned usage, /* a combination of PIPE_TRANSFER_x */
                                  const struct pipe_box *box,
                                  const void *data,