diff options
| author | Roland Scheidegger <[email protected]> | 2009-11-27 17:15:47 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2009-11-27 17:15:47 +0100 |
| commit | c95cbd45c657ac47e908a4d99d118737034bde43 (patch) | |
| tree | 68e6c2b91f97fadbe4dd073b9f7acaf5ee8d79cf /src/gallium/drivers/nv10/nv10_fragtex.c | |
| parent | 884007546c98b1779bf266ec5111b1e7e2b68b2e (diff) | |
| parent | d509f84543d0979e9bb53c20c195f378dd61e728 (diff) | |
Merge branch 'width0'
Conflicts:
src/gallium/drivers/r300/r300_texture.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'src/gallium/drivers/nv10/nv10_fragtex.c')
| -rw-r--r-- | src/gallium/drivers/nv10/nv10_fragtex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv10/nv10_fragtex.c b/src/gallium/drivers/nv10/nv10_fragtex.c index 27f2f875847..906fdfeeb93 100644 --- a/src/gallium/drivers/nv10/nv10_fragtex.c +++ b/src/gallium/drivers/nv10/nv10_fragtex.c @@ -62,9 +62,9 @@ nv10_fragtex_build(struct nv10_context *nv10, int unit) txf = tf->format << 8; txf |= (pt->last_level + 1) << 16; - txf |= log2i(pt->width[0]) << 20; - txf |= log2i(pt->height[0]) << 24; - txf |= log2i(pt->depth[0]) << 28; + txf |= log2i(pt->width0) << 20; + txf |= log2i(pt->height0) << 24; + txf |= log2i(pt->depth0) << 28; txf |= 8; switch (pt->target) { @@ -89,7 +89,7 @@ nv10_fragtex_build(struct nv10_context *nv10, int unit) OUT_RING (0x40000000); /* enable */ OUT_RING (txs); OUT_RING (ps->filt | 0x2000 /* magic */); - OUT_RING ((pt->width[0] << 16) | pt->height[0]); + OUT_RING ((pt->width0 << 16) | pt->height0); OUT_RING (ps->bcol); #endif } |