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

1 files changed, 7 insertions, 30 deletions

diff --git a/src/gallium/drivers/softpipe/sp_video_context.c b/src/gallium/drivers/softpipe/sp_video_context.c
index f39c46e596c..9acf7171e5a 100644
--- a/src/gallium/drivers/softpipe/sp_video_context.c
+++ b/src/gallium/drivers/softpipe/sp_video_context.c
@@ -98,13 +98,9 @@ sp_mpeg12_is_format_supported(struct pipe_video_context *vpipe,
    if (geom & PIPE_TEXTURE_GEOM_NON_POWER_OF_TWO)
       return FALSE;
 
-<<<<<<< HEAD
-   return ctx->pipe->screen->is_format_supported(ctx->pipe->screen, format, PIPE_TEXTURE_2D, 1,
-                                                  usage, geom);
-=======
+
    return ctx->pipe->screen->is_format_supported(ctx->pipe->screen, format, PIPE_TEXTURE_2D,
                                                  0, usage, geom);
->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
 }
 
 static void
@@ -134,7 +130,6 @@ static void
 sp_mpeg12_clear_render_target(struct pipe_video_context *vpipe,
                        struct pipe_surface *dst,
                        unsigned dstx, unsigned dsty,
-					   const float *rgba,
                        unsigned width, unsigned height)
 {
    struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
@@ -151,12 +146,10 @@ sp_mpeg12_clear_render_target(struct pipe_video_context *vpipe,
 
 static void
 sp_mpeg12_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,
+                       struct pipe_surface *dst,
+                       unsigned dstx, unsigned dsty,
+                       struct pipe_surface *src,
+                       unsigned srcx, unsigned srcy,
                        unsigned width, unsigned height)
 {
    struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
@@ -164,13 +157,7 @@ sp_mpeg12_resource_copy_region(struct pipe_video_context *vpipe,
    assert(vpipe);
    assert(dst);
 
-<<<<<<< HEAD
-   if (ctx->pipe->resource_copy_region)
-      ctx->pipe->resource_copy_region(ctx->pipe, dst, subdst, dstx, dsty, dstz, src, subsrc, srcx, srcy, srcz, width, height);
-   else
-      util_resource_copy_region(ctx->pipe, dst, subdst, dstx, dsty, dstz, src, subsrc, srcx, srcy, srcz, width, height);
-=======
-   struct pipe_subresource subdst, subsrc;
+   struct pipe_subresource subdst,subsrc;
    subdst.face = dst->face;
    subdst.level = dst->level;
    subsrc.face = src->face;
@@ -184,7 +171,6 @@ sp_mpeg12_resource_copy_region(struct pipe_video_context *vpipe,
       util_resource_copy_region(ctx->pipe, dst->texture, subdst, dstx, dsty, dst->zslice,
                                 src->texture, subsrc, srcx, srcy, src->zslice,
                                 width, height);
->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
 }
 
 static struct pipe_transfer*
@@ -366,18 +352,12 @@ init_pipe_state(struct sp_mpeg12_context *ctx)
    rast.flatshade = 1;
    rast.flatshade_first = 0;
    rast.light_twoside = 0;
-<<<<<<< HEAD
-   rast.cull_face = PIPE_FACE_FRONT;
-   rast.fill_front = PIPE_POLYGON_MODE_FILL;
-   rast.fill_back = PIPE_POLYGON_MODE_FILL;
-=======
    rast.front_ccw = 1;
    rast.cull_face = PIPE_FACE_NONE;
    rast.fill_back = PIPE_POLYGON_MODE_FILL;
    rast.fill_front = PIPE_POLYGON_MODE_FILL;
    rast.offset_point = 0;
    rast.offset_line = 0;
->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
    rast.scissor = 0;
    rast.poly_smooth = 0;
    rast.poly_stipple_enable = 0;
@@ -400,11 +380,8 @@ init_pipe_state(struct sp_mpeg12_context *ctx)
    ctx->rast = ctx->pipe->create_rasterizer_state(ctx->pipe, &rast);
    ctx->pipe->bind_rasterizer_state(ctx->pipe, ctx->rast);
 
-<<<<<<< HEAD
-
-=======
    memset(&blend, 0, sizeof blend);
->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
+
    blend.independent_blend_enable = 0;
    blend.rt[0].blend_enable = 0;
    blend.rt[0].rgb_func = PIPE_BLEND_ADD;