Mesa (gallium-0.1): st/d3d: correction for sampler decl emit

Keith Whitwell keithw at kemper.freedesktop.org
Fri Aug 28 17:38:40 UTC 2009


Module: Mesa
Branch: gallium-0.1
Commit: 771a39105aea12b72453c036a1b7e16f9768450a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=771a39105aea12b72453c036a1b7e16f9768450a

Author: Keith Whitwell <keithw at vmware.com>
Date:   Fri Aug 28 17:13:54 2009 +0100

st/d3d: correction for sampler decl emit

Recent change broke this

---

 src/gallium/auxiliary/tgsi/tgsi_ureg.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
index 385ecf8..ee71bd8 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
@@ -757,8 +757,7 @@ static void emit_decls( struct ureg_program *ureg )
    for (i = 0; i < ureg->nr_samplers; i++) {
       emit_decl_range( ureg, 
                        TGSI_FILE_SAMPLER,
-                       ureg->sampler[i].Index, 
-                       ureg->sampler[i].Index );
+                       ureg->sampler[i].Index, 1 );
    }
 
    if (ureg->nr_constants) {
@@ -839,7 +838,7 @@ const struct tgsi_token *ureg_finalize( struct ureg_program *ureg )
 
    tokens = &ureg->domain[DOMAIN_DECL].tokens[0].token;
 
-   if (0) {
+   if (1) {
       debug_printf("%s: emitted shader %d tokens:\n", __FUNCTION__, 
                    ureg->domain[DOMAIN_DECL].count);
       tgsi_dump( tokens, 0 );




More information about the mesa-commit mailing list