nv40: construct vbo state the same way as the rest

[mesa.git] / src / gallium / drivers / nv40 / nv40_fragtex.c

diff --git a/src/gallium/drivers/nv40/nv40_fragtex.c b/src/gallium/drivers/nv40/nv40_fragtex.c
index 811f3098ba7702082218c67860d7bb676ed9ed47..ed47d707b2f0e20c854037090c6173597e783b1b 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_fragtex.c
+++ b/src/gallium/drivers/nv40/nv40_fragtex.c
@@ -41,6 +41,7 @@ static struct nv40_texture_format *
 nv40_fragtex_format(uint pipe_format)
 {
        struct nv40_texture_format *tf = nv40_texture_formats;
+       char fs[128];
 
        while (tf->defined) {
                if (tf->pipe == pipe_format)
@@ -48,11 +49,13 @@ nv40_fragtex_format(uint pipe_format)
                tf++;
        }
 
+       pf_sprint_name(fs, pipe_format);
+       NOUVEAU_ERR("unknown texture format %s\n", fs);
        return NULL;
 }
 
 
-static void
+static struct nouveau_stateobj *
 nv40_fragtex_build(struct nv40_context *nv40, int unit)
 {
        struct nv40_sampler_state *ps = nv40->tex_sampler[unit];
@@ -90,7 +93,7 @@ nv40_fragtex_build(struct nv40_context *nv40, int unit)
                break;
        default:
                NOUVEAU_ERR("Unknown target %d\n", pt->target);
-               return;
+               return NULL;
        }
 
        if (swizzled) {
@@ -117,25 +120,27 @@ nv40_fragtex_build(struct nv40_context *nv40, int unit)
        so_method(so, nv40->hw->curie, NV40TCL_TEX_SIZE1(unit), 1);
        so_data  (so, (pt->depth[0] << NV40TCL_TEX_SIZE1_DEPTH_SHIFT) | txp);
 
-       so_emit(nv40->nvws, so);
-       so_ref (so, &nv40->so_fragtex[unit]);
-       so_ref (NULL, &so);
+       return so;
 }
 
-void
-nv40_fragtex_bind(struct nv40_context *nv40)
+static boolean
+nv40_fragtex_validate(struct nv40_context *nv40)
 {
        struct nv40_fragment_program *fp = nv40->pipe_state.fragprog;
+       struct nv40_state *state = &nv40->state;
+       struct nouveau_stateobj *so;
        unsigned samplers, unit;
 
-       samplers = nv40->fp_samplers & ~fp->samplers;
+       samplers = state->fp_samplers & ~fp->samplers;
        while (samplers) {
                unit = ffs(samplers) - 1;
                samplers &= ~(1 << unit);
 
-               so_ref(NULL, &nv40->so_fragtex[unit]);
-               BEGIN_RING(curie, NV40TCL_TEX_ENABLE(unit), 1);
-               OUT_RING  (0);
+               so = so_new(2, 0);
+               so_method(so, nv40->hw->curie, NV40TCL_TEX_ENABLE(unit), 1);
+               so_data  (so, 0);
+               so_ref(so, &nv40->state.hw[NV40_STATE_FRAGTEX0 + unit]);
+               state->dirty |= (1ULL << (NV40_STATE_FRAGTEX0 + unit));
        }
 
        samplers = nv40->dirty_samplers & fp->samplers;
@@ -143,9 +148,20 @@ nv40_fragtex_bind(struct nv40_context *nv40)
                unit = ffs(samplers) - 1;
                samplers &= ~(1 << unit);
 
-               nv40_fragtex_build(nv40, unit);
+               so = nv40_fragtex_build(nv40, unit);
+               so_ref(so, &nv40->state.hw[NV40_STATE_FRAGTEX0 + unit]);
+               state->dirty |= (1ULL << (NV40_STATE_FRAGTEX0 + unit));
        }
 
-       nv40->fp_samplers = fp->samplers;
+       nv40->state.fp_samplers = fp->samplers;
+       return FALSE;
 }
 
+struct nv40_state_entry nv40_state_fragtex = {
+       .validate = nv40_fragtex_validate,
+       .dirty = {
+               .pipe = NV40_NEW_SAMPLER | NV40_NEW_FRAGPROG,
+               .hw = 0
+       }
+};
+