diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2009-06-05 20:32:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2009-06-05 22:53:23 +1000 |
| commit | 1a92c71a66dd9d785906cdb78c107e63dcf48672 (patch) | |
| tree | 416392118feb9fc7a1a182f7ef39a31ba74c84dd /src/gallium/drivers/nv50/nv50_tex.c | |
| parent | b04470b0bce6a24a74a0ec8cf16d9d3f03aff5f2 (diff) | |
nv50: create textures with nouveau_bo, for flexibility with tiling later
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_tex.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_tex.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c index 5539a796e8..8bb81392fd 100644 --- a/src/gallium/drivers/nv50/nv50_tex.c +++ b/src/gallium/drivers/nv50/nv50_tex.c @@ -29,8 +29,6 @@ static int nv50_tex_construct(struct nv50_context *nv50, struct nouveau_stateobj *so, struct nv50_miptree *mt) { - struct nouveau_bo *bo = nouveau_bo(mt->buffer); - switch (mt->base.format) { case PIPE_FORMAT_A8R8G8B8_UNORM: so_data(so, NV50TIC_0_0_MAPA_C3 | NV50TIC_0_0_TYPEA_UNORM | @@ -120,9 +118,9 @@ nv50_tex_construct(struct nv50_context *nv50, struct nouveau_stateobj *so, return 1; } - so_reloc(so, bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_LOW | + so_reloc(so, mt->bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_LOW | NOUVEAU_BO_RD, 0, 0); - so_data (so, 0xd0005000 | bo->tile_mode << 22); + so_data (so, 0xd0005000 | mt->bo->tile_mode << 22); so_data (so, 0x00300000); so_data (so, mt->base.width[0]); so_data (so, (mt->base.last_level << 28) | |