From 3c520132737623d53e5c8dec6d3496ab8dffda1f Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 8 Apr 2014 16:48:49 -0400 Subject: [PATCH] st/xa: remove unneeded args Signed-off-by: Rob Clark Reviewed-by: Thomas Hellstrom --- src/gallium/state_trackers/xa/xa_composite.c | 3 +-- src/gallium/state_trackers/xa/xa_context.c | 5 +---- src/gallium/state_trackers/xa/xa_priv.h | 3 +-- src/gallium/state_trackers/xa/xa_renderer.c | 7 ++++--- src/gallium/state_trackers/xa/xa_yuv.c | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/gallium/state_trackers/xa/xa_composite.c b/src/gallium/state_trackers/xa/xa_composite.c index abe5be241f1..b65f6eb09aa 100644 --- a/src/gallium/state_trackers/xa/xa_composite.c +++ b/src/gallium/state_trackers/xa/xa_composite.c @@ -477,8 +477,7 @@ xa_composite_prepare(struct xa_context *ctx, return ret; ctx->dst = dst_srf; - renderer_bind_destination(ctx, ctx->srf, ctx->srf->width, - ctx->srf->height); + renderer_bind_destination(ctx, ctx->srf); ret = bind_composite_blend_state(ctx, comp); if (ret != XA_ERR_NONE) diff --git a/src/gallium/state_trackers/xa/xa_context.c b/src/gallium/state_trackers/xa/xa_context.c index c2dc53bd83a..ee326762e42 100644 --- a/src/gallium/state_trackers/xa/xa_context.c +++ b/src/gallium/state_trackers/xa/xa_context.c @@ -281,7 +281,6 @@ xa_solid_prepare(struct xa_context *ctx, struct xa_surface *dst, { unsigned vs_traits, fs_traits; struct xa_shader shader; - int width, height; int ret; ret = xa_ctx_srf_create(ctx, dst); @@ -295,8 +294,6 @@ xa_solid_prepare(struct xa_context *ctx, struct xa_surface *dst, ctx->has_solid_color = 1; ctx->dst = dst; - width = ctx->srf->width; - height = ctx->srf->height; #if 0 debug_printf("Color Pixel=(%d, %d, %d, %d), RGBA=(%f, %f, %f, %f)\n", @@ -309,7 +306,7 @@ xa_solid_prepare(struct xa_context *ctx, struct xa_surface *dst, vs_traits = VS_SOLID_FILL; fs_traits = FS_SOLID_FILL; - renderer_bind_destination(ctx, ctx->srf, width, height); + renderer_bind_destination(ctx, ctx->srf); bind_solid_blend_state(ctx); cso_set_samplers(ctx->cso, PIPE_SHADER_FRAGMENT, 0, NULL); cso_set_sampler_views(ctx->cso, PIPE_SHADER_FRAGMENT, 0, NULL); diff --git a/src/gallium/state_trackers/xa/xa_priv.h b/src/gallium/state_trackers/xa/xa_priv.h index b99c2144eb4..8b96bf56417 100644 --- a/src/gallium/state_trackers/xa/xa_priv.h +++ b/src/gallium/state_trackers/xa/xa_priv.h @@ -236,8 +236,7 @@ void renderer_draw_yuv(struct xa_context *r, struct xa_surface *srf[]); void renderer_bind_destination(struct xa_context *r, - struct pipe_surface *surface, int width, - int height); + struct pipe_surface *surface); void renderer_init_state(struct xa_context *r); void renderer_copy_prepare(struct xa_context *r, diff --git a/src/gallium/state_trackers/xa/xa_renderer.c b/src/gallium/state_trackers/xa/xa_renderer.c index 8a122dc2182..33ae133dacb 100644 --- a/src/gallium/state_trackers/xa/xa_renderer.c +++ b/src/gallium/state_trackers/xa/xa_renderer.c @@ -325,8 +325,10 @@ setup_vertex_data_yuv(struct xa_context *r, */ void renderer_bind_destination(struct xa_context *r, - struct pipe_surface *surface, int width, int height) + struct pipe_surface *surface) { + int width = surface->width; + int height = surface->height; struct pipe_framebuffer_state fb; struct pipe_viewport_state viewport; @@ -406,8 +408,7 @@ renderer_copy_prepare(struct xa_context *r, PIPE_BIND_RENDER_TARGET)); (void)screen; - renderer_bind_destination(r, dst_surface, - dst_surface->width, dst_surface->height); + renderer_bind_destination(r, dst_surface); /* set misc state we care about */ { diff --git a/src/gallium/state_trackers/xa/xa_yuv.c b/src/gallium/state_trackers/xa/xa_yuv.c index 9c7c4d68781..43f56ff0515 100644 --- a/src/gallium/state_trackers/xa/xa_yuv.c +++ b/src/gallium/state_trackers/xa/xa_yuv.c @@ -131,7 +131,7 @@ xa_yuv_planar_blit(struct xa_context *r, if (ret != XA_ERR_NONE) return -XA_ERR_NORES; - renderer_bind_destination(r, r->srf, r->srf->width, r->srf->height); + renderer_bind_destination(r, r->srf); xa_yuv_bind_blend_state(r); xa_yuv_bind_shaders(r); xa_yuv_bind_samplers(r, yuv); -- 2.30.2