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

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

diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index a7845dd24d9fd772d6251bebeae9b04743eed5d1..0d1b10945501973f0895089914328c562dac78be 100644 (file)
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -92,8 +92,13 @@ struct pipe_screen {
     */
    int (*get_shader_param)( struct pipe_screen *, unsigned shader, enum pipe_shader_cap param );
 
-   struct pipe_context * (*context_create)( struct pipe_screen *,
-                                           void *priv );
+   struct pipe_context * (*context_create)( struct pipe_screen *, void *priv );
+
+   struct pipe_video_context * (*video_context_create)( struct pipe_screen *screen,
+                                                        enum pipe_video_profile profile,
+                                                        enum pipe_video_chroma_format chroma_format,
+                                                        unsigned width, unsigned height, void *priv );
+
 
    /**
     * Check if the given pipe_format is supported as a texture or