Mesa (master): st/xorg: updates for CSO interface changes

[Brian Paul]

Module: Mesa
Branch: master
Commit: c61d3fe8bddcbcf750c5f057a45b262fea92ca5e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c61d3fe8bddcbcf750c5f057a45b262fea92ca5e

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Aug  3 11:56:36 2012 -0600

st/xorg: updates for CSO interface changes

---

 src/gallium/state_trackers/xorg/xorg_composite.c |   12 +++++++-----
 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 4c05c2b..7ccb3fe 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 d19f44c..7cbad70 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