diff options
| author | Brian Paul <[email protected]> | 2012-08-03 11:56:36 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-08-03 11:56:36 -0600 |
| commit | c61d3fe8bddcbcf750c5f057a45b262fea92ca5e (patch) | |
| tree | e0a882a6c921fe0ad19be317c85710a8e50668ce /src/gallium/state_trackers/xorg | |
| parent | 459dd568979a5745d84f8fd2bdff38242ee3c16f (diff) | |
st/xorg: updates for CSO interface changes
Diffstat (limited to 'src/gallium/state_trackers/xorg')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_composite.c | 12 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_xv.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c index 4c05c2bebc1..7ccb3fe4734 100644 --- a/src/gallium/state_trackers/xorg/xorg_composite.c +++ b/src/gallium/state_trackers/xorg/xorg_composite.c @@ -418,10 +418,12 @@ bind_samplers(struct exa_context *exa, int op, exa->bound_sampler_views[1] = src_view; } - cso_set_samplers(exa->renderer->cso, exa->num_bound_samplers, + cso_set_samplers(exa->renderer->cso, PIPE_SHADER_FRAGMENT, + exa->num_bound_samplers, (const struct pipe_sampler_state **)samplers); - cso_set_fragment_sampler_views(exa->renderer->cso, exa->num_bound_samplers, - exa->bound_sampler_views); + cso_set_sampler_views(exa->renderer->cso, PIPE_SHADER_FRAGMENT, + exa->num_bound_samplers, + exa->bound_sampler_views); } @@ -550,8 +552,8 @@ boolean xorg_solid_bind_state(struct exa_context *exa, renderer_bind_destination(exa->renderer, dst_surf, pixmap->width, pixmap->height); bind_blend_state(exa, PictOpSrc, NULL, NULL, NULL); - cso_set_samplers(exa->renderer->cso, 0, NULL); - cso_set_fragment_sampler_views(exa->renderer->cso, 0, NULL); + cso_set_samplers(exa->renderer->cso, PIPE_SHADER_FRAGMENT, 0, NULL); + cso_set_sampler_views(exa->renderer->cso, PIPE_SHADER_FRAGMENT, 0, NULL); shader = xorg_shaders_get(exa->renderer->shaders, vs_traits, fs_traits); cso_set_vertex_shader_handle(exa->renderer->cso, shader.vs); diff --git a/src/gallium/state_trackers/xorg/xorg_xv.c b/src/gallium/state_trackers/xorg/xorg_xv.c index d19f44c26fd..7cbad702bf4 100644 --- a/src/gallium/state_trackers/xorg/xorg_xv.c +++ b/src/gallium/state_trackers/xorg/xorg_xv.c @@ -482,9 +482,9 @@ bind_samplers(struct xorg_xv_port_priv *port) samplers[2] = &sampler; - cso_set_samplers(port->r->cso, 3, + cso_set_samplers(port->r->cso, PIPE_SHADER_FRAGMENT, 3, (const struct pipe_sampler_state **)samplers); - cso_set_fragment_sampler_views(port->r->cso, 3, dst_views); + cso_set_sampler_views(port->r->cso, PIPE_SHADER_FRAGMENT, 3, dst_views); } static int |