summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/nv30/nv30_context.h4
-rw-r--r--src/gallium/drivers/nv30/nv30_state_emit.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 0ee6cfdb33..c1cc3eca1e 100644
--- 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 2cb4692e17..eda2fd45f5 100644
--- 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);