OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/xa: updates for CSO interface changes

Browse Source
This commit is contained in:
Brian Paul
2012-08-03 11:56:28 -06:00
parent 3d1bec5d9a
commit 459dd56897
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,9 +459,9 @@ bind_samplers(struct xa_context *ctx,
} }
cso_set_samplers(ctx->cso, ctx->num_bound_samplers, cso_set_samplers(ctx->cso, PIPE_SHADER_FRAGMENT, ctx->num_bound_samplers,
(const struct pipe_sampler_state **)samplers); (const struct pipe_sampler_state **)samplers);
cso_set_fragment_sampler_views(ctx->cso, ctx->num_bound_samplers, cso_set_sampler_views(ctx->cso, PIPE_SHADER_FRAGMENT, ctx->num_bound_samplers,
ctx->bound_sampler_views); ctx->bound_sampler_views);
} }

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

@@ -315,8 +315,8 @@ xa_solid_prepare(struct xa_context *ctx, struct xa_surface *dst,
renderer_bind_destination(ctx, ctx->srf, width, height); renderer_bind_destination(ctx, ctx->srf, width, height);
bind_solid_blend_state(ctx); bind_solid_blend_state(ctx);
cso_set_samplers(ctx->cso, 0, NULL); cso_set_samplers(ctx->cso, PIPE_SHADER_FRAGMENT, 0, NULL);
cso_set_fragment_sampler_views(ctx->cso, 0, NULL); cso_set_sampler_views(ctx->cso, PIPE_SHADER_FRAGMENT, 0, NULL);
shader = xa_shaders_get(ctx->shaders, vs_traits, fs_traits); shader = xa_shaders_get(ctx->shaders, vs_traits, fs_traits);
cso_set_vertex_shader_handle(ctx->cso, shader.vs); cso_set_vertex_shader_handle(ctx->cso, shader.vs);

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

@@ -430,8 +430,8 @@ renderer_copy_prepare(struct xa_context *r,
sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST; sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST;
sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST; sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST;
sampler.normalized_coords = 1; sampler.normalized_coords = 1;
cso_single_sampler(r->cso, 0, &sampler); cso_single_sampler(r->cso, PIPE_SHADER_FRAGMENT, 0, &sampler);
cso_single_sampler_done(r->cso); cso_single_sampler_done(r->cso, PIPE_SHADER_FRAGMENT);
} }
renderer_bind_destination(r, dst_surface, renderer_bind_destination(r, dst_surface,
@@ -445,7 +445,7 @@ renderer_copy_prepare(struct xa_context *r,
u_sampler_view_default_template(&templ, u_sampler_view_default_template(&templ,
src_texture, src_texture->format); src_texture, src_texture->format);
src_view = pipe->create_sampler_view(pipe, src_texture, &templ); src_view = pipe->create_sampler_view(pipe, src_texture, &templ);
cso_set_fragment_sampler_views(r->cso, 1, &src_view); cso_set_sampler_views(r->cso, PIPE_SHADER_FRAGMENT, 1, &src_view);
pipe_sampler_view_reference(&src_view, NULL); pipe_sampler_view_reference(&src_view, NULL);
} }

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

@@ -92,8 +92,8 @@ xa_yuv_bind_samplers(struct xa_context *r, struct xa_surface *yuv[])
r->pipe->create_sampler_view(r->pipe, yuv[i]->tex, &view_templ); r->pipe->create_sampler_view(r->pipe, yuv[i]->tex, &view_templ);
} }
r->num_bound_samplers = 3; r->num_bound_samplers = 3;
cso_set_samplers(r->cso, 3, (const struct pipe_sampler_state **)samplers); cso_set_samplers(r->cso, PIPE_SHADER_FRAGMENT, 3, (const struct pipe_sampler_state **)samplers);
cso_set_fragment_sampler_views(r->cso, 3, r->bound_sampler_views); cso_set_sampler_views(r->cso, PIPE_SHADER_FRAGMENT, 3, r->bound_sampler_views);
} }
static void static void