nv30: disable emit texture image in state_emit, already done in fragtex

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 0ee6cfdb33934ef2f38227487c6cd4e919f570b2..c1cc3eca1e3651b43c73e3eb851602adb233b4b6 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -51,10 +51,10 @@ struct nv30_context {
        struct pipe_buffer *rt[2];
        struct pipe_buffer *zeta;
 
-       struct {
+       /*struct {
                struct pipe_buffer *buffer;
                uint32_t format;
-       } tex[16];
+       } tex[16];*/
 
        unsigned vb_enable;
        struct {

diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 2cb4692e17664b6aefa320c8743c3907dac8c7b7..eda2fd45f569e24ff3112f4cef2a3e84188ac95e 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -60,12 +60,11 @@ nv30_emit_hw_state(struct nv30_context *nv30)
                OUT_RING(0);*/
        }
 
-       /* Texture images */
+       /* Texture images, emitted in nv30_fragtex_build */
+#if 0
        for (i = 0; i < 16; i++) {
                if (!(nv30->fp_samplers & (1 << i)))
                        continue;
-               if (!nv30->tex[i].buffer)
-                       continue;
                BEGIN_RING(rankine, NV34TCL_TX_OFFSET(i), 2);
                OUT_RELOCl(nv30->tex[i].buffer, 0, NOUVEAU_BO_VRAM |
                           NOUVEAU_BO_GART | NOUVEAU_BO_RD);
@@ -74,6 +73,7 @@ nv30_emit_hw_state(struct nv30_context *nv30)
                           NOUVEAU_BO_OR, NV34TCL_TX_FORMAT_DMA0,
                           NV34TCL_TX_FORMAT_DMA1);
        }
+#endif
 
        /* Fragment program */
        BEGIN_RING(rankine, NV34TCL_FP_ACTIVE_PROGRAM, 1);