diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:15:47 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:15:47 +0100 |
| commit | c95cbd45c657ac47e908a4d99d118737034bde43 (patch) | |
| tree | 68e6c2b91f97fadbe4dd073b9f7acaf5ee8d79cf /src/gallium/drivers/nv50/nv50_tex.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/nv50/nv50_tex.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_tex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c index 2813f54477..417d367942 100644 --- a/src/gallium/drivers/nv50/nv50_tex.c +++ b/src/gallium/drivers/nv50/nv50_tex.c @@ -131,9 +131,9 @@ nv50_tex_construct(struct nv50_context *nv50, struct nouveau_stateobj *so, NOUVEAU_BO_RD, 0, 0); so_data (so, mode); so_data (so, 0x00300000); - so_data (so, mt->base.base.width[0] | (1 << 31)); + so_data (so, mt->base.base.width0 | (1 << 31)); so_data (so, (mt->base.base.last_level << 28) | - (mt->base.base.depth[0] << 16) | mt->base.base.height[0]); + (mt->base.base.depth0 << 16) | mt->base.base.height0); so_data (so, 0x03000000); so_data (so, mt->base.base.last_level << 4); |