[g3dvl] move video buffer creation out of video context

2 files changed, 12 insertions, 8 deletions

diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index d8de3bac0ec..c02b060e4bc 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -59,6 +59,9 @@ struct pipe_vertex_buffer;
 struct pipe_vertex_element;
 struct pipe_viewport_state;
 
+enum pipe_video_chroma_format;
+enum pipe_format;
+
 /**
  * Gallium rendering context.  Basically:
  *  - state setting functions
@@ -395,6 +398,14 @@ struct pipe_context {
     * Flush any pending framebuffer writes and invalidate texture caches.
     */
    void (*texture_barrier)(struct pipe_context *);
+   
+   /**
+    * Creates a video buffer as decoding target
+    */
+   struct pipe_video_buffer *(*create_video_buffer)( struct pipe_context *context,
+                                                     enum pipe_format buffer_format,
+                                                     enum pipe_video_chroma_format chroma_format,
+                                                     unsigned width, unsigned height );
 };
 
 
diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_context.h
index aa42e8e0884..0ac0c4bed0b 100644
--- a/src/gallium/include/pipe/p_video_context.h
+++ b/src/gallium/include/pipe/p_video_context.h
@@ -62,13 +62,6 @@ struct pipe_video_context
                                                 enum pipe_video_chroma_format chroma_format,
                                                 unsigned width, unsigned height);
 
-   /**
-    * Creates a buffer as decoding target
-    */
-   struct pipe_video_buffer *(*create_buffer)(struct pipe_video_context *context,
-                                              enum pipe_format buffer_format,
-                                              enum pipe_video_chroma_format chroma_format,
-                                              unsigned width, unsigned height);
 };
 
 /**
@@ -166,7 +159,7 @@ struct pipe_video_decode_buffer
  */
 struct pipe_video_buffer
 {
-   struct pipe_video_context *context;
+   struct pipe_context *context;
 
    enum pipe_format buffer_format;
    enum pipe_video_chroma_format chroma_format;