Mesa (master): st/xorg: cleanup and adjust to the changes in the ureg code

[Zack Rusin]

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

Author: Zack Rusin <zackr at vmware.com>
Date:   Thu Sep  3 12:44:15 2009 -0400

st/xorg: cleanup and adjust to the changes in the ureg code

---

 src/gallium/state_trackers/xorg/xorg_exa_tgsi.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_exa_tgsi.c b/src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
index 38b3a3a..f9b10d8 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
@@ -165,8 +165,8 @@ create_fs(struct pipe_context *pipe,
                           TGSI_SEMANTIC_COLOR,
                           0);
 
-   src_sampler = ureg_DECL_sampler(ureg);
    if (is_composite) {
+      src_sampler = ureg_DECL_sampler(ureg, 0);
       src_pos = ureg_DECL_fs_input(ureg,
                                    TGSI_SEMANTIC_POSITION,
                                    0,
@@ -180,7 +180,7 @@ create_fs(struct pipe_context *pipe,
    }
 
    if ((fs_traits & FS_MASK)) {
-      mask_sampler = ureg_DECL_sampler(ureg);
+      mask_sampler = ureg_DECL_sampler(ureg, 1);
       mask_pos = ureg_DECL_fs_input(ureg,
                                     TGSI_SEMANTIC_POSITION,
                                     1,
@@ -188,7 +188,7 @@ create_fs(struct pipe_context *pipe,
    }
 
 #if 0  /* unused right now */
-   dst_sampler = ureg_DECL_sampler(ureg);
+   dst_sampler = ureg_DECL_sampler(ureg, 2);
    dst_pos = ureg_DECL_fs_input(ureg,
                                 TGSI_SEMANTIC_POSITION,
                                 2,