Merge remote branch 'vdpau/pipe-video' into pipe-video

Conflicts:
	src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
	src/gallium/drivers/softpipe/sp_video_context.c
	src/gallium/include/pipe/p_format.h
	src/gallium/state_trackers/xorg/xvmc/context.c
	src/gallium/tests/unit/SConscript

4 files changed, 16 insertions, 10 deletions

diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 7aaf6110456..f60b131f941 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -506,6 +506,7 @@ enum pipe_video_codec
 
 enum pipe_video_profile
 {
+   PIPE_VIDEO_PROFILE_UNKNOWN,
    PIPE_VIDEO_PROFILE_MPEG1,
    PIPE_VIDEO_PROFILE_MPEG2_SIMPLE,
    PIPE_VIDEO_PROFILE_MPEG2_MAIN,
@@ -519,6 +520,7 @@ enum pipe_video_profile
    PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH
 };
 
+
 /**
  * Composite query types
  */
@@ -533,6 +535,7 @@ struct pipe_query_data_timestamp_disjoint
    boolean  disjoint;
 };
 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index ef03ed74a20..2a6acecb726 100644
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -92,14 +92,14 @@ 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
     * drawing surface.
diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_context.h
index 2dfdba413ac..7869f70058d 100644
--- a/src/gallium/include/pipe/p_video_context.h
+++ b/src/gallium/include/pipe/p_video_context.h
@@ -105,17 +105,19 @@ struct pipe_video_context
                           struct pipe_video_rect        *dst_area,
                           struct pipe_fence_handle      **fence);
 
-   void (*surface_fill)(struct pipe_video_context *vpipe,
+   void (*clear_render_target)(struct pipe_video_context *vpipe,
                         struct pipe_surface *dst,
                         unsigned dstx, unsigned dsty,
-                        unsigned width, unsigned height,
-                        unsigned value);
+						const float *rgba,
+                        unsigned width, unsigned height);
 
-   void (*surface_copy)(struct pipe_video_context *vpipe,
-                        struct pipe_surface *dst,
-                        unsigned dstx, unsigned dsty,
-                        struct pipe_surface *src,
-                        unsigned srcx, unsigned srcy,
+   void (*resource_copy_region)(struct pipe_video_context *vpipe,
+                        struct pipe_resource *dst,
+						struct pipe_subresource subdst,
+                        unsigned dstx, unsigned dsty, unsigned dstz,
+                        struct pipe_resource *src,
+						struct pipe_subresource subsrc,
+                        unsigned srcx, unsigned srcy, unsigned srcz,
                         unsigned width, unsigned height);
 
    struct pipe_transfer *(*get_transfer)(struct pipe_video_context *vpipe,
diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h
index e5e85e3deb3..1cb555b5381 100644
--- a/src/gallium/include/pipe/p_video_state.h
+++ b/src/gallium/include/pipe/p_video_state.h
@@ -74,6 +74,7 @@ enum pipe_mpeg12_dct_type
    PIPE_MPEG12_DCT_TYPE_FRAME
 };
 
+
 struct pipe_macroblock
 {
    enum pipe_video_codec codec;