Mesa (master): r300g: Set logical ID for each emitted texture/sampler.

Corbin Simpson csimpson at kemper.freedesktop.org
Thu Oct 15 23:59:03 UTC 2009


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

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Thu Oct 15 16:58:26 2009 -0700

r300g: Set logical ID for each emitted texture/sampler.

multitexarray works on my r300, but texrect doesn't.

---

 src/gallium/drivers/r300/r300_emit.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index 2c3bba9..f3adc09 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -531,7 +531,8 @@ void r300_emit_texture(struct r300_context* r300,
     CS_LOCALS(r300);
 
     BEGIN_CS(16);
-    OUT_CS_REG(R300_TX_FILTER0_0 + (offset * 4), sampler->filter0);
+    OUT_CS_REG(R300_TX_FILTER0_0 + (offset * 4), sampler->filter0 |
+        (offset << 28));
     OUT_CS_REG(R300_TX_FILTER1_0 + (offset * 4), sampler->filter1);
     OUT_CS_REG(R300_TX_BORDER_COLOR_0 + (offset * 4), sampler->border_color);
 




More information about the mesa-commit mailing list