3 files changed, 172 insertions, 179 deletions

diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index 45289380d08..1c64d58372d 100644
--- a/src/gallium/drivers/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
@@ -415,8 +415,7 @@ softpipe_video_surface_create(struct pipe_screen *screen,
    template.tex_usage = PIPE_TEXTURE_USAGE_SAMPLER | PIPE_TEXTURE_USAGE_RENDER_TARGET;
 
    sp_vsfc->tex = screen->texture_create(screen, &template);
-   if (!sp_vsfc->tex)
-   {
+   if (!sp_vsfc->tex) {
       FREE(sp_vsfc);
       return NULL;
    }
diff --git a/src/gallium/drivers/softpipe/sp_video_context.c b/src/gallium/drivers/softpipe/sp_video_context.c
index 1b47bbede26..3be33fbbdf8 100644
--- a/src/gallium/drivers/softpipe/sp_video_context.c
+++ b/src/gallium/drivers/softpipe/sp_video_context.c
@@ -7,24 +7,24 @@
 static void
 sp_mpeg12_destroy(struct pipe_video_context *vpipe)
 {
-	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+   struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
 
-	assert(vpipe);
+   assert(vpipe);
 	
-	/* Asserted in softpipe_delete_fs_state() for some reason */
-	ctx->pipe->bind_vs_state(ctx->pipe, NULL);
-	ctx->pipe->bind_fs_state(ctx->pipe, NULL);
+   /* Asserted in softpipe_delete_fs_state() for some reason */
+   ctx->pipe->bind_vs_state(ctx->pipe, NULL);
+   ctx->pipe->bind_fs_state(ctx->pipe, NULL);
 
-	ctx->pipe->delete_blend_state(ctx->pipe, ctx->blend);
-	ctx->pipe->delete_rasterizer_state(ctx->pipe, ctx->rast);
-	ctx->pipe->delete_depth_stencil_alpha_state(ctx->pipe, ctx->dsa);
+   ctx->pipe->delete_blend_state(ctx->pipe, ctx->blend);
+   ctx->pipe->delete_rasterizer_state(ctx->pipe, ctx->rast);
+   ctx->pipe->delete_depth_stencil_alpha_state(ctx->pipe, ctx->dsa);
 
-	pipe_video_surface_reference(&ctx->decode_target, NULL);
-	vl_compositor_cleanup(&ctx->compositor);
-	vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
-	ctx->pipe->destroy(ctx->pipe);
+   pipe_video_surface_reference(&ctx->decode_target, NULL);
+   vl_compositor_cleanup(&ctx->compositor);
+   vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
+   ctx->pipe->destroy(ctx->pipe);
 
-	FREE(ctx);
+   FREE(ctx);
 }
 
 static void
@@ -35,20 +35,20 @@ sp_mpeg12_decode_macroblocks(struct pipe_video_context *vpipe,
                              struct pipe_macroblock *macroblocks,
                              struct pipe_fence_handle **fence)
 {
-	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
-	struct pipe_mpeg12_macroblock *mpeg12_macroblocks = (struct pipe_mpeg12_macroblock*)macroblocks;
+   struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+   struct pipe_mpeg12_macroblock *mpeg12_macroblocks = (struct pipe_mpeg12_macroblock*)macroblocks;
 
-	assert(vpipe);
-	assert(num_macroblocks);
-	assert(macroblocks);
-	assert(macroblocks->codec == PIPE_VIDEO_CODEC_MPEG12);
-	assert(ctx->decode_target);
+   assert(vpipe);
+   assert(num_macroblocks);
+   assert(macroblocks);
+   assert(macroblocks->codec == PIPE_VIDEO_CODEC_MPEG12);
+   assert(ctx->decode_target);
 
-	vl_mpeg12_mc_renderer_render_macroblocks(&ctx->mc_renderer,
-	                                         softpipe_video_surface(ctx->decode_target)->tex,
-	                                         past ? softpipe_video_surface(past)->tex : NULL,
-	                                         future ? softpipe_video_surface(future)->tex : NULL,
-	                                         num_macroblocks, mpeg12_macroblocks, fence);
+   vl_mpeg12_mc_renderer_render_macroblocks(&ctx->mc_renderer,
+                                            softpipe_video_surface(ctx->decode_target)->tex,
+                                            past ? softpipe_video_surface(past)->tex : NULL,
+                                            future ? softpipe_video_surface(future)->tex : NULL,
+                                            num_macroblocks, mpeg12_macroblocks, fence);
 }
 
 static void
@@ -58,12 +58,12 @@ sp_mpeg12_clear_surface(struct pipe_video_context *vpipe,
                         unsigned value,
                         struct pipe_surface *surface)
 {
-	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+   struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
 
-	assert(vpipe);
-	assert(surface);
+   assert(vpipe);
+   assert(surface);
 
-	ctx->pipe->surface_fill(ctx->pipe, surface, x, y, width, height, value);
+   ctx->pipe->surface_fill(ctx->pipe, surface, x, y, width, height, value);
 }
 
 static void
@@ -85,106 +85,105 @@ sp_mpeg12_render_picture(struct pipe_video_context     *vpipe,
                          struct pipe_video_rect        *layer_dst_areas*/
                          struct pipe_fence_handle      **fence)
 {
-	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+   struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
 	
-	assert(vpipe);
-	assert(src_surface);
-	assert(src_area);
-	assert(dst_surface);
-	assert(dst_area);
+   assert(vpipe);
+   assert(src_surface);
+   assert(src_area);
+   assert(dst_surface);
+   assert(dst_area);
 	
-	vl_compositor_render(&ctx->compositor, softpipe_video_surface(src_surface)->tex,
-	                     picture_type, src_area, dst_surface->texture, dst_area, fence);
+   vl_compositor_render(&ctx->compositor, softpipe_video_surface(src_surface)->tex,
+                        picture_type, src_area, dst_surface->texture, dst_area, fence);
 }
 
 static void
 sp_mpeg12_set_decode_target(struct pipe_video_context *vpipe,
                             struct pipe_video_surface *dt)
 {
-	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+   struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
 
-	assert(vpipe);
-	assert(dt);
+   assert(vpipe);
+   assert(dt);
 
-	pipe_video_surface_reference(&ctx->decode_target, dt);
+   pipe_video_surface_reference(&ctx->decode_target, dt);
 }
 
 static bool
 init_pipe_state(struct sp_mpeg12_context *ctx)
 {
-	struct pipe_rasterizer_state rast;
-	struct pipe_blend_state blend;
-	struct pipe_depth_stencil_alpha_state dsa;
+   struct pipe_rasterizer_state rast;
+   struct pipe_blend_state blend;
+   struct pipe_depth_stencil_alpha_state dsa;
 
-	assert(ctx);
+   assert(ctx);
 	
-	rast.flatshade = 1;
-	rast.flatshade_first = 0;
-	rast.light_twoside = 0;
-	rast.front_winding = PIPE_WINDING_CCW;
-	rast.cull_mode = PIPE_WINDING_CW;
-	rast.fill_cw = PIPE_POLYGON_MODE_FILL;
-	rast.fill_ccw = PIPE_POLYGON_MODE_FILL;
-	rast.offset_cw = 0;
-	rast.offset_ccw = 0;
-	rast.scissor = 0;
-	rast.poly_smooth = 0;
-	rast.poly_stipple_enable = 0;
-	rast.point_sprite = 0;
-	rast.point_size_per_vertex = 0;
-	rast.multisample = 0;
-	rast.line_smooth = 0;
-	rast.line_stipple_enable = 0;
-	rast.line_stipple_factor = 0;
-	rast.line_stipple_pattern = 0;
-	rast.line_last_pixel = 0;
-	rast.bypass_vs_clip_and_viewport = 0;
-	rast.line_width = 1;
-	rast.point_smooth = 0;
-	rast.point_size = 1;
-	rast.offset_units = 1;
-	rast.offset_scale = 1;
-	/*rast.sprite_coord_mode[i] = ;*/
-	ctx->rast = ctx->pipe->create_rasterizer_state(ctx->pipe, &rast);
-	ctx->pipe->bind_rasterizer_state(ctx->pipe, ctx->rast);
+   rast.flatshade = 1;
+   rast.flatshade_first = 0;
+   rast.light_twoside = 0;
+   rast.front_winding = PIPE_WINDING_CCW;
+   rast.cull_mode = PIPE_WINDING_CW;
+   rast.fill_cw = PIPE_POLYGON_MODE_FILL;
+   rast.fill_ccw = PIPE_POLYGON_MODE_FILL;
+   rast.offset_cw = 0;
+   rast.offset_ccw = 0;
+   rast.scissor = 0;
+   rast.poly_smooth = 0;
+   rast.poly_stipple_enable = 0;
+   rast.point_sprite = 0;
+   rast.point_size_per_vertex = 0;
+   rast.multisample = 0;
+   rast.line_smooth = 0;
+   rast.line_stipple_enable = 0;
+   rast.line_stipple_factor = 0;
+   rast.line_stipple_pattern = 0;
+   rast.line_last_pixel = 0;
+   rast.bypass_vs_clip_and_viewport = 0;
+   rast.line_width = 1;
+   rast.point_smooth = 0;
+   rast.point_size = 1;
+   rast.offset_units = 1;
+   rast.offset_scale = 1;
+   /*rast.sprite_coord_mode[i] = ;*/
+   ctx->rast = ctx->pipe->create_rasterizer_state(ctx->pipe, &rast);
+   ctx->pipe->bind_rasterizer_state(ctx->pipe, ctx->rast);
 
-	blend.blend_enable = 0;
-	blend.rgb_func = PIPE_BLEND_ADD;
-	blend.rgb_src_factor = PIPE_BLENDFACTOR_ONE;
-	blend.rgb_dst_factor = PIPE_BLENDFACTOR_ONE;
-	blend.alpha_func = PIPE_BLEND_ADD;
-	blend.alpha_src_factor = PIPE_BLENDFACTOR_ONE;
-	blend.alpha_dst_factor = PIPE_BLENDFACTOR_ONE;
-	blend.logicop_enable = 0;
-	blend.logicop_func = PIPE_LOGICOP_CLEAR;
-	/* Needed to allow color writes to FB, even if blending disabled */
-	blend.colormask = PIPE_MASK_RGBA;
-	blend.dither = 0;
-	ctx->blend = ctx->pipe->create_blend_state(ctx->pipe, &blend);
-	ctx->pipe->bind_blend_state(ctx->pipe, ctx->blend);
+   blend.blend_enable = 0;
+   blend.rgb_func = PIPE_BLEND_ADD;
+   blend.rgb_src_factor = PIPE_BLENDFACTOR_ONE;
+   blend.rgb_dst_factor = PIPE_BLENDFACTOR_ONE;
+   blend.alpha_func = PIPE_BLEND_ADD;
+   blend.alpha_src_factor = PIPE_BLENDFACTOR_ONE;
+   blend.alpha_dst_factor = PIPE_BLENDFACTOR_ONE;
+   blend.logicop_enable = 0;
+   blend.logicop_func = PIPE_LOGICOP_CLEAR;
+   /* Needed to allow color writes to FB, even if blending disabled */
+   blend.colormask = PIPE_MASK_RGBA;
+   blend.dither = 0;
+   ctx->blend = ctx->pipe->create_blend_state(ctx->pipe, &blend);
+   ctx->pipe->bind_blend_state(ctx->pipe, ctx->blend);
 
-	dsa.depth.enabled = 0;
-	dsa.depth.writemask = 0;
-	dsa.depth.func = PIPE_FUNC_ALWAYS;
-	dsa.depth.occlusion_count = 0;
-	for (unsigned i = 0; i < 2; ++i)
-	{
-		dsa.stencil[i].enabled = 0;
-		dsa.stencil[i].func = PIPE_FUNC_ALWAYS;
-		dsa.stencil[i].fail_op = PIPE_STENCIL_OP_KEEP;
-		dsa.stencil[i].zpass_op = PIPE_STENCIL_OP_KEEP;
-		dsa.stencil[i].zfail_op = PIPE_STENCIL_OP_KEEP;
-		dsa.stencil[i].ref_value = 0;
-		dsa.stencil[i].valuemask = 0;
-		dsa.stencil[i].writemask = 0;
-	}
-	dsa.alpha.enabled = 0;
-	dsa.alpha.func = PIPE_FUNC_ALWAYS;
-	dsa.alpha.ref_value = 0;
-	ctx->dsa = ctx->pipe->create_depth_stencil_alpha_state(ctx->pipe, &dsa);
-	ctx->pipe->bind_depth_stencil_alpha_state(ctx->pipe, ctx->dsa);
+   dsa.depth.enabled = 0;
+   dsa.depth.writemask = 0;
+   dsa.depth.func = PIPE_FUNC_ALWAYS;
+   dsa.depth.occlusion_count = 0;
+   for (unsigned i = 0; i < 2; ++i) {
+      dsa.stencil[i].enabled = 0;
+      dsa.stencil[i].func = PIPE_FUNC_ALWAYS;
+      dsa.stencil[i].fail_op = PIPE_STENCIL_OP_KEEP;
+      dsa.stencil[i].zpass_op = PIPE_STENCIL_OP_KEEP;
+      dsa.stencil[i].zfail_op = PIPE_STENCIL_OP_KEEP;
+      dsa.stencil[i].ref_value = 0;
+      dsa.stencil[i].valuemask = 0;
+      dsa.stencil[i].writemask = 0;
+   }
+   dsa.alpha.enabled = 0;
+   dsa.alpha.func = PIPE_FUNC_ALWAYS;
+   dsa.alpha.ref_value = 0;
+   ctx->dsa = ctx->pipe->create_depth_stencil_alpha_state(ctx->pipe, &dsa);
+   ctx->pipe->bind_depth_stencil_alpha_state(ctx->pipe, ctx->dsa);
 	
-	return true;
+   return true;
 }
 
 static struct pipe_video_context *
@@ -192,65 +191,61 @@ sp_mpeg12_create(struct pipe_screen *screen, enum pipe_video_profile profile,
                  enum pipe_video_chroma_format chroma_format,
                  unsigned width, unsigned height)
 {
-	struct sp_mpeg12_context *ctx;
+   struct sp_mpeg12_context *ctx;
 
-	assert(u_reduce_video_profile(profile) == PIPE_VIDEO_CODEC_MPEG12);
+   assert(u_reduce_video_profile(profile) == PIPE_VIDEO_CODEC_MPEG12);
 
-	ctx = CALLOC_STRUCT(sp_mpeg12_context);
+   ctx = CALLOC_STRUCT(sp_mpeg12_context);
 
-	if (!ctx)
-		return NULL;
+   if (!ctx)
+      return NULL;
 
-	ctx->base.profile = profile;
-	ctx->base.chroma_format = chroma_format;
-	ctx->base.width = width;
-	ctx->base.height = height;
+   ctx->base.profile = profile;
+   ctx->base.chroma_format = chroma_format;
+   ctx->base.width = width;
+   ctx->base.height = height;
 
-	ctx->base.screen = screen;
-	ctx->base.destroy = sp_mpeg12_destroy;
-	ctx->base.decode_macroblocks = sp_mpeg12_decode_macroblocks;
-	ctx->base.clear_surface = sp_mpeg12_clear_surface;
-	ctx->base.render_picture = sp_mpeg12_render_picture;
-	ctx->base.set_decode_target = sp_mpeg12_set_decode_target;
+   ctx->base.screen = screen;
+   ctx->base.destroy = sp_mpeg12_destroy;
+   ctx->base.decode_macroblocks = sp_mpeg12_decode_macroblocks;
+   ctx->base.clear_surface = sp_mpeg12_clear_surface;
+   ctx->base.render_picture = sp_mpeg12_render_picture;
+   ctx->base.set_decode_target = sp_mpeg12_set_decode_target;
 
-	ctx->pipe = softpipe_create(screen);
-	if (!ctx->pipe)
-	{
-		FREE(ctx);
-		return NULL;
-	}
+   ctx->pipe = softpipe_create(screen);
+   if (!ctx->pipe) {
+      FREE(ctx);
+      return NULL;
+   }
 
-	/* TODO: Use slice buffering for softpipe when implemented, no advantage to buffering an entire picture */
-	if (!vl_mpeg12_mc_renderer_init(&ctx->mc_renderer, ctx->pipe,
-	                                width, height, chroma_format,
-	                                VL_MPEG12_MC_RENDERER_BUFFER_PICTURE,
-	                                /* TODO: Use XFER_NONE when implemented */
-	                                VL_MPEG12_MC_RENDERER_EMPTY_BLOCK_XFER_ONE,
-	                                true))
-	{
-		ctx->pipe->destroy(ctx->pipe);
-		FREE(ctx);
-		return NULL;
-	}
+   /* TODO: Use slice buffering for softpipe when implemented, no advantage to buffering an entire picture */
+   if (!vl_mpeg12_mc_renderer_init(&ctx->mc_renderer, ctx->pipe,
+                                   width, height, chroma_format,
+                                   VL_MPEG12_MC_RENDERER_BUFFER_PICTURE,
+                                   /* TODO: Use XFER_NONE when implemented */
+                                   VL_MPEG12_MC_RENDERER_EMPTY_BLOCK_XFER_ONE,
+                                   true)) {
+      ctx->pipe->destroy(ctx->pipe);
+      FREE(ctx);
+      return NULL;
+   }
 	
-	if (!vl_compositor_init(&ctx->compositor, ctx->pipe))
-	{
-		vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
-		ctx->pipe->destroy(ctx->pipe);
-		FREE(ctx);
-		return NULL;
-	}
+   if (!vl_compositor_init(&ctx->compositor, ctx->pipe)) {
+      vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
+      ctx->pipe->destroy(ctx->pipe);
+      FREE(ctx);
+      return NULL;
+   }
 	
-	if (!init_pipe_state(ctx))
-	{
-		vl_compositor_cleanup(&ctx->compositor);
-		vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
-		ctx->pipe->destroy(ctx->pipe);
-		FREE(ctx);
-		return NULL;
-	}
+   if (!init_pipe_state(ctx)) {
+      vl_compositor_cleanup(&ctx->compositor);
+      vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
+      ctx->pipe->destroy(ctx->pipe);
+      FREE(ctx);
+      return NULL;
+   }
 
-	return &ctx->base;
+   return &ctx->base;
 }
 
 struct pipe_video_context *
@@ -258,16 +253,15 @@ sp_video_create(struct pipe_screen *screen, enum pipe_video_profile profile,
                 enum pipe_video_chroma_format chroma_format,
                 unsigned width, unsigned height)
 {
-	assert(screen);
-	assert(width && height);
+   assert(screen);
+   assert(width && height);
 
-	switch (u_reduce_video_profile(profile))
-	{
-		case PIPE_VIDEO_CODEC_MPEG12:
-			return sp_mpeg12_create(screen, profile,
-			                        chroma_format,
-			                        width, height);
-		default:
-			return NULL;
-	}
+   switch (u_reduce_video_profile(profile)) {
+      case PIPE_VIDEO_CODEC_MPEG12:
+         return sp_mpeg12_create(screen, profile,
+                                 chroma_format,
+                                 width, height);
+      default:
+         return NULL;
+   }
 }
diff --git a/src/gallium/drivers/softpipe/sp_video_context.h b/src/gallium/drivers/softpipe/sp_video_context.h
index a70ce9f476a..2c7691c7cb9 100644
--- a/src/gallium/drivers/softpipe/sp_video_context.h
+++ b/src/gallium/drivers/softpipe/sp_video_context.h
@@ -11,15 +11,15 @@ struct pipe_video_surface;
 
 struct sp_mpeg12_context
 {
-	struct pipe_video_context base;
-	struct pipe_context *pipe;
-	struct pipe_video_surface *decode_target;
-	struct vl_mpeg12_mc_renderer mc_renderer;
-	struct vl_compositor compositor;
+   struct pipe_video_context base;
+   struct pipe_context *pipe;
+   struct pipe_video_surface *decode_target;
+   struct vl_mpeg12_mc_renderer mc_renderer;
+   struct vl_compositor compositor;
 
-	void *rast;
-	void *dsa;
-	void *blend;
+   void *rast;
+   void *dsa;
+   void *blend;
 };
 
 struct pipe_video_context *