KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/xa: remove unneeded args 

Signed-off-by: Rob Clark <robclark@freedesktop.org>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
This commit is contained in:
Rob Clark 2014-04-08 16:48:49 -04:00 committed by Thomas Hellstrom
parent cda5e0c25e
commit 3c52013273
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/state_trackers/xa/xa_composite.c
View File

@ -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)

5
src/gallium/state_trackers/xa/xa_context.c
View File

@ -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);

3
src/gallium/state_trackers/xa/xa_priv.h
View File

@ -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,

7
src/gallium/state_trackers/xa/xa_renderer.c
View File

@ -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 */
{

2
src/gallium/state_trackers/xa/xa_yuv.c
View File

@ -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);