nv50: use broadcast TEMP reg in tx_insn

[mesa.git] / src / gallium / drivers / nv50 / nv50_tex.c

diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c
index 46c3073defb428ccb4c22ac64dc92ba3df6dfe6a..033cb50c1152b41df1118e376a9e7e7b39c5fdea 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_tex.c
+++ b/src/gallium/drivers/nv50/nv50_tex.c
@@ -29,7 +29,7 @@ static int
 nv50_tex_construct(struct nv50_context *nv50, struct nouveau_stateobj *so,
                   struct nv50_miptree *mt, int unit)
 {
-       switch (mt->base.format) {
+       switch (mt->base.base.format) {
        case PIPE_FORMAT_A8R8G8B8_UNORM:
                so_data(so, NV50TIC_0_0_MAPA_C3 | NV50TIC_0_0_TYPEA_UNORM |
                            NV50TIC_0_0_MAPR_C2 | NV50TIC_0_0_TYPER_UNORM |
@@ -118,18 +118,18 @@ nv50_tex_construct(struct nv50_context *nv50, struct nouveau_stateobj *so,
                return 1;
        }
 
-       so_reloc(so, mt->bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_LOW |
+       so_reloc(so, mt->base.bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_LOW |
                     NOUVEAU_BO_RD, 0, 0);
        if (nv50->sampler[unit]->normalized)
-               so_data (so, 0xd0005000 | mt->bo->tile_mode << 22);
+               so_data (so, 0xd0005000 | mt->base.bo->tile_mode << 22);
        else
-               so_data (so, 0x5001d000 | mt->bo->tile_mode << 22);
+               so_data (so, 0x5001d000 | mt->base.bo->tile_mode << 22);
        so_data (so, 0x00300000);
-       so_data (so, mt->base.width[0]);
-       so_data (so, (mt->base.last_level << 28) |
-                    (mt->base.depth[0] << 16) | mt->base.height[0]);
+       so_data (so, mt->base.base.width[0]);
+       so_data (so, (mt->base.base.last_level << 28) |
+                    (mt->base.base.depth[0] << 16) | mt->base.base.height[0]);
        so_data (so, 0x03000000);
-       so_data (so, mt->base.last_level << 4);
+       so_data (so, mt->base.base.last_level << 4);
 
        return 0;
 }
@@ -145,25 +145,28 @@ nv50_tex_validate(struct nv50_context *nv50)
        push += MAX2(nv50->miptree_nr, nv50->state.miptree_nr) * 2;
 
        so = so_new(push, nv50->miptree_nr * 2);
-       so_method(so, tesla, 0x0f00, 1);
+       so_method(so, tesla, NV50TCL_CB_ADDR, 1);
        so_data  (so, NV50_CB_TIC);
        for (unit = 0; unit < nv50->miptree_nr; unit++) {
                struct nv50_miptree *mt = nv50->miptree[unit];
 
-               so_method(so, tesla, 0x40000f04, 8);
+               so_method(so, tesla, NV50TCL_CB_DATA(0) | 0x40000000, 8);
                if (nv50_tex_construct(nv50, so, mt, unit)) {
                        NOUVEAU_ERR("failed tex validate\n");
                        so_ref(NULL, &so);
                        return;
                }
 
-               so_method(so, tesla, 0x1458, 1);
-               so_data  (so, (unit << 9) | (unit << 1) | 1);
+               so_method(so, tesla, NV50TCL_SET_SAMPLER_TEX, 1);
+               so_data  (so, (unit << NV50TCL_SET_SAMPLER_TEX_TIC_SHIFT) |
+                       (unit << NV50TCL_SET_SAMPLER_TEX_SAMPLER_SHIFT) |
+                       NV50TCL_SET_SAMPLER_TEX_VALID);
        }
 
        for (; unit < nv50->state.miptree_nr; unit++) {
-               so_method(so, tesla, 0x1458, 1);
-               so_data  (so, (unit << 1) | 0);
+               so_method(so, tesla, NV50TCL_SET_SAMPLER_TEX, 1);
+               so_data  (so,
+                       (unit << NV50TCL_SET_SAMPLER_TEX_SAMPLER_SHIFT) | 0);
        }
 
        so_ref(so, &nv50->state.tic_upload);