nv10: fix some more state, work on the vertex emission code.

[mesa.git] / src / gallium / drivers / nv10 / nv10_fragtex.c

diff --git a/src/gallium/drivers/nv10/nv10_fragtex.c b/src/gallium/drivers/nv10/nv10_fragtex.c
index a4bf10828451da731a920ebb543cafa29849f5a4..67e0b4bd45dce0e396877b27d43c12d34eddd59e 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_fragtex.c
+++ b/src/gallium/drivers/nv10/nv10_fragtex.c
@@ -72,6 +72,7 @@ nv10_fragtex_format(uint pipe_format)
 static void
 nv10_fragtex_build(struct nv10_context *nv10, int unit)
 {
+#if 0
        struct nv10_sampler_state *ps = nv10->tex_sampler[unit];
        struct nv10_miptree *nv10mt = nv10->tex_miptree[unit];
        struct pipe_texture *pt = &nv10mt->base;
@@ -115,11 +116,13 @@ nv10_fragtex_build(struct nv10_context *nv10, int unit)
        OUT_RING  (ps->filt | 0x2000 /* magic */);
        OUT_RING  ((pt->width[0] << 16) | pt->height[0]);
        OUT_RING  (ps->bcol);
+#endif
 }
 
 void
 nv10_fragtex_bind(struct nv10_context *nv10)
 {
+#if 0
        struct nv10_fragment_program *fp = nv10->fragprog.active;
        unsigned samplers, unit;
 
@@ -141,5 +144,6 @@ nv10_fragtex_bind(struct nv10_context *nv10)
        }
 
        nv10->fp_samplers = fp->samplers;
+#endif
 }