AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Patrice Mandin
2008-03-18 21:50:01 +01:00
parent e4b5008de4
commit 75e714d476
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nv30/nv30_context.h
+2 -2
View File
@@ -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 {
src/gallium/drivers/nv30/nv30_state_emit.c
+3 -3
View File
@@ -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);