vl: pipe-video branch merged with Königs pipe-video branch

[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 0303c5b2ea9f67444e53bd277860a8e0ed2a0230..75eeaeba1f71ce70f04c441494669b2f6f26843d 100644 (file)
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -92,21 +92,13 @@ struct pipe_screen {
     */
    int (*get_shader_param)( struct pipe_screen *, unsigned shader, enum pipe_shader_cap param );
 
-<<<<<<< HEAD
    struct pipe_context * (*context_create)( struct pipe_screen *, void *priv );
-=======
-   struct pipe_context * (*context_create)( struct pipe_screen *,
-                                            void *priv );
->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
 
    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 );
-<<<<<<< HEAD
 
-=======
->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
 
    /**
     * Check if the given pipe_format is supported as a texture or