diff options
| author | Brian Paul <[email protected]> | 2012-08-03 11:56:28 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-08-03 11:56:28 -0600 |
| commit | 459dd568979a5745d84f8fd2bdff38242ee3c16f (patch) | |
| tree | b526f0ae0b5c0ab34e568254f84716fa8cf1980b /src/gallium/state_trackers | |
| parent | 3d1bec5d9a1a365286110000a1a37dc96c8db883 (diff) | |
st/xa: updates for CSO interface changes
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_composite.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_context.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_renderer.c | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_yuv.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/state_trackers/xa/xa_composite.c b/src/gallium/state_trackers/xa/xa_composite.c index 1f076ff26a8..17d2d7f727d 100644 --- a/src/gallium/state_trackers/xa/xa_composite.c +++ b/src/gallium/state_trackers/xa/xa_composite.c @@ -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); - 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); } diff --git a/src/gallium/state_trackers/xa/xa_context.c b/src/gallium/state_trackers/xa/xa_context.c index 8da7c31cf48..2e9806bb0a9 100644 --- a/src/gallium/state_trackers/xa/xa_context.c +++ b/src/gallium/state_trackers/xa/xa_context.c @@ -315,8 +315,8 @@ xa_solid_prepare(struct xa_context *ctx, struct xa_surface *dst, renderer_bind_destination(ctx, ctx->srf, width, height); bind_solid_blend_state(ctx); - cso_set_samplers(ctx->cso, 0, NULL); - cso_set_fragment_sampler_views(ctx->cso, 0, NULL); + cso_set_samplers(ctx->cso, PIPE_SHADER_FRAGMENT, 0, NULL); + cso_set_sampler_views(ctx->cso, PIPE_SHADER_FRAGMENT, 0, NULL); shader = xa_shaders_get(ctx->shaders, vs_traits, fs_traits); cso_set_vertex_shader_handle(ctx->cso, shader.vs); diff --git a/src/gallium/state_trackers/xa/xa_renderer.c b/src/gallium/state_trackers/xa/xa_renderer.c index 217887ec1ae..23345fe93b8 100644 --- a/src/gallium/state_trackers/xa/xa_renderer.c +++ b/src/gallium/state_trackers/xa/xa_renderer.c @@ -430,8 +430,8 @@ renderer_copy_prepare(struct xa_context *r, sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST; sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST; sampler.normalized_coords = 1; - cso_single_sampler(r->cso, 0, &sampler); - cso_single_sampler_done(r->cso); + cso_single_sampler(r->cso, PIPE_SHADER_FRAGMENT, 0, &sampler); + cso_single_sampler_done(r->cso, PIPE_SHADER_FRAGMENT); } renderer_bind_destination(r, dst_surface, @@ -445,7 +445,7 @@ renderer_copy_prepare(struct xa_context *r, u_sampler_view_default_template(&templ, src_texture, src_texture->format); 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); } diff --git a/src/gallium/state_trackers/xa/xa_yuv.c b/src/gallium/state_trackers/xa/xa_yuv.c index 36213593d15..912ea77c753 100644 --- a/src/gallium/state_trackers/xa/xa_yuv.c +++ b/src/gallium/state_trackers/xa/xa_yuv.c @@ -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->num_bound_samplers = 3; - cso_set_samplers(r->cso, 3, (const struct pipe_sampler_state **)samplers); - cso_set_fragment_sampler_views(r->cso, 3, r->bound_sampler_views); + cso_set_samplers(r->cso, PIPE_SHADER_FRAGMENT, 3, (const struct pipe_sampler_state **)samplers); + cso_set_sampler_views(r->cso, PIPE_SHADER_FRAGMENT, 3, r->bound_sampler_views); } static void |