nv40: almost there..

diff --git a/src/gallium/drivers/nv40/Makefile b/src/gallium/drivers/nv40/Makefile
index 12b8eef2590dca138e20fd2c170ec28dd82f6072..82295cbefcab068d65fa946cd4c716f24b629935 100644 (file)
--- a/src/gallium/drivers/nv40/Makefile
+++ b/src/gallium/drivers/nv40/Makefile
@@ -12,10 +12,14 @@ DRIVER_SOURCES = \
        nv40_miptree.c \
        nv40_query.c \
        nv40_state.c \
-       nv40_state_emit.c \
+       nv40_state_blend.c \
        nv40_state_clip.c \
+       nv40_state_emit.c \
+       nv40_state_rasterizer.c \
        nv40_state_scissor.c \
        nv40_state_stipple.c \
+       nv40_state_viewport.c \
+       nv40_state_zsa.c \
        nv40_surface.c \
        nv40_vbo.c \
        nv40_vertprog.c

diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index 2dd137ead0f28ac84f4fb32da003b6715152e6f8..d71fe11a4abf3afec516ff29d6ff7dba02cca08a 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_context.h
+++ b/src/gallium/drivers/nv40/nv40_context.h
@@ -23,12 +23,38 @@
        fprintf(stderr, "nouveau: "fmt, ##args);
 
 enum nv40_state_index {
-       NV40_STATE_CLIP = 1ULL,
-       NV40_STATE_SCISSOR = 2ULL,
-       NV40_STATE_STIPPLE = 3ULL,
-       NV40_STATE_FRAGPROG = 4ULL,
-       NV40_STATE_VERTPROG = 5ULL,
-       NV40_STATE_MAX = 6ULL
+       NV40_STATE_FB = 0,
+       NV40_STATE_VIEWPORT = 1,
+       NV40_STATE_BLEND = 2,
+       NV40_STATE_RAST = 3,
+       NV40_STATE_ZSA = 4,
+       NV40_STATE_BCOL = 5,
+       NV40_STATE_CLIP = 6,
+       NV40_STATE_SCISSOR = 7,
+       NV40_STATE_STIPPLE = 8,
+       NV40_STATE_FRAGPROG = 9,
+       NV40_STATE_VERTPROG = 10,
+       NV40_STATE_FRAGTEX0 = 11,
+       NV40_STATE_FRAGTEX1 = 12,
+       NV40_STATE_FRAGTEX2 = 13,
+       NV40_STATE_FRAGTEX3 = 14,
+       NV40_STATE_FRAGTEX4 = 15,
+       NV40_STATE_FRAGTEX5 = 16,
+       NV40_STATE_FRAGTEX6 = 17,
+       NV40_STATE_FRAGTEX7 = 18,
+       NV40_STATE_FRAGTEX8 = 19,
+       NV40_STATE_FRAGTEX9 = 20,
+       NV40_STATE_FRAGTEX10 = 21,
+       NV40_STATE_FRAGTEX11 = 22,
+       NV40_STATE_FRAGTEX12 = 23,
+       NV40_STATE_FRAGTEX13 = 24,
+       NV40_STATE_FRAGTEX14 = 25,
+       NV40_STATE_FRAGTEX15 = 26,
+       NV40_STATE_VERTTEX0 = 27,
+       NV40_STATE_VERTTEX1 = 28,
+       NV40_STATE_VERTTEX2 = 29,
+       NV40_STATE_VERTTEX3 = 30,
+       NV40_STATE_MAX = 31
 };
 
 #define NV40_NEW_BLEND         (1 <<  0)
@@ -75,6 +101,17 @@ struct nv40_rasterizer_state {
        struct nouveau_stateobj *so;
 };
 
+struct nv40_zsa_state {
+       struct pipe_depth_stencil_alpha_state pipe;
+       struct nouveau_stateobj *so;
+};
+
+struct nv40_blend_state {
+       struct pipe_blend_state pipe;
+       struct nouveau_stateobj *so;
+};
+
+
 struct nv40_state {
        unsigned scissor_enabled;
        unsigned stipple_enabled;
@@ -107,6 +144,11 @@ struct nv40_context {
                struct nv40_vertex_program *vertprog;
                struct nv40_fragment_program *fragprog;
                struct pipe_buffer *constbuf[PIPE_SHADER_TYPES];
+               struct nv40_rasterizer_state *rasterizer;
+               struct nv40_zsa_state *zsa;
+               struct nv40_blend_state *blend;
+               struct pipe_blend_color blend_colour;
+               struct pipe_viewport_state viewport;
        } pipe_state;
 
        struct nv40_state state;
@@ -115,13 +157,6 @@ struct nv40_context {
        struct nouveau_stateobj *so_framebuffer;
        struct nouveau_stateobj *so_fragtex[16];
        struct nouveau_stateobj *so_vtxbuf;
-       struct nouveau_stateobj *so_blend;
-       struct nv40_rasterizer_state *rasterizer;
-       struct nouveau_stateobj *so_rast;
-       struct nouveau_stateobj *so_zsa;
-       struct nouveau_stateobj *so_bcol;
-       struct nouveau_stateobj *so_viewport;
-       struct nouveau_stateobj *so_stipple;
 
        struct pipe_vertex_buffer  vtxbuf[PIPE_ATTRIB_MAX];
        struct pipe_vertex_element vtxelt[PIPE_ATTRIB_MAX];
@@ -164,10 +199,15 @@ extern void nv40_fragtex_bind(struct nv40_context *);
 extern void nv40_emit_hw_state(struct nv40_context *nv40);
 extern void nv40_state_tex_update(struct nv40_context *nv40);
 extern struct nv40_state_entry nv40_state_clip;
+extern struct nv40_state_entry nv40_state_rasterizer;
 extern struct nv40_state_entry nv40_state_scissor;
 extern struct nv40_state_entry nv40_state_stipple;
 extern struct nv40_state_entry nv40_state_fragprog;
 extern struct nv40_state_entry nv40_state_vertprog;
+extern struct nv40_state_entry nv40_state_blend;
+extern struct nv40_state_entry nv40_state_blend_colour;
+extern struct nv40_state_entry nv40_state_zsa;
+extern struct nv40_state_entry nv40_state_viewport;
 
 /* nv40_vbo.c */
 extern boolean nv40_draw_arrays(struct pipe_context *, unsigned mode,

diff --git a/src/gallium/drivers/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c
index 8ffbb131f7341ff04c41b8b52657b4cc5d211ab6..41631ef2dd698100a5fe02d8401884cb02266282 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state.c
+++ b/src/gallium/drivers/nv40/nv40_state.c
@@ -11,6 +11,7 @@ nv40_blend_state_create(struct pipe_context *pipe,
 {
        struct nv40_context *nv40 = nv40_context(pipe);
        struct nouveau_grobj *curie = nv40->hw->curie;
+       struct nv40_blend_state *bso = MALLOC(sizeof(*bso));
        struct nouveau_stateobj *so = so_new(16, 0);
 
        if (cso->blend_enable) {
@@ -46,7 +47,9 @@ nv40_blend_state_create(struct pipe_context *pipe,
        so_method(so, curie, NV40TCL_DITHER_ENABLE, 1);
        so_data  (so, cso->dither ? 1 : 0);
 
-       return (void *)so;
+       bso->so = so;
+       bso->pipe = *cso;
+       return (void *)bso;
 }
 
 static void
@@ -54,16 +57,17 @@ nv40_blend_state_bind(struct pipe_context *pipe, void *hwcso)
 {
        struct nv40_context *nv40 = nv40_context(pipe);
 
-       so_ref(hwcso, &nv40->so_blend);
+       nv40->pipe_state.blend = hwcso;
        nv40->dirty |= NV40_NEW_BLEND;
 }
 
 static void
 nv40_blend_state_delete(struct pipe_context *pipe, void *hwcso)
 {
-       struct nouveau_stateobj *so = hwcso;
+       struct nv40_blend_state *bso = hwcso;
 
-       so_ref(NULL, &so);
+       so_ref(NULL, &bso->so);
+       FREE(bso);
 }
 
 
@@ -260,7 +264,7 @@ nv40_sampler_state_bind(struct pipe_context *pipe, unsigned unit,
 static void
 nv40_sampler_state_delete(struct pipe_context *pipe, void *hwcso)
 {
-       free(hwcso);
+       FREE(hwcso);
 }
 
 static void
@@ -392,10 +396,8 @@ static void
 nv40_rasterizer_state_bind(struct pipe_context *pipe, void *hwcso)
 {
        struct nv40_context *nv40 = nv40_context(pipe);
-       struct nv40_rasterizer_state *rsso = hwcso;
 
-       so_ref(rsso->so, &nv40->so_rast);
-       nv40->rasterizer = rsso;
+       nv40->pipe_state.rasterizer = hwcso;
        nv40->dirty |= NV40_NEW_RAST;
 }
 
@@ -405,7 +407,7 @@ nv40_rasterizer_state_delete(struct pipe_context *pipe, void *hwcso)
        struct nv40_rasterizer_state *rsso = hwcso;
 
        so_ref(NULL, &rsso->so);
-       free(rsso);
+       FREE(rsso);
 }
 
 static void *
@@ -413,6 +415,7 @@ nv40_depth_stencil_alpha_state_create(struct pipe_context *pipe,
                        const struct pipe_depth_stencil_alpha_state *cso)
 {
        struct nv40_context *nv40 = nv40_context(pipe);
+       struct nv40_zsa_state *zsaso = MALLOC(sizeof(*zsaso));
        struct nouveau_stateobj *so = so_new(32, 0);
 
        so_method(so, nv40->hw->curie, NV40TCL_DEPTH_FUNC, 3);
@@ -455,7 +458,9 @@ nv40_depth_stencil_alpha_state_create(struct pipe_context *pipe,
                so_data  (so, 0);
        }
 
-       return (void *)so;
+       zsaso->so = so;
+       zsaso->pipe = *cso;
+       return (void *)zsaso;
 }
 
 static void
@@ -463,16 +468,17 @@ nv40_depth_stencil_alpha_state_bind(struct pipe_context *pipe, void *hwcso)
 {
        struct nv40_context *nv40 = nv40_context(pipe);
 
-       so_ref(hwcso, &nv40->so_zsa);
+       nv40->pipe_state.zsa = hwcso;
        nv40->dirty |= NV40_NEW_ZSA;
 }
 
 static void
 nv40_depth_stencil_alpha_state_delete(struct pipe_context *pipe, void *hwcso)
 {
-       struct nouveau_stateobj *so = hwcso;
+       struct nv40_zsa_state *zsaso = hwcso;
 
-       so_ref(NULL, &so);
+       so_ref(NULL, &zsaso->so);
+       FREE(zsaso);
 }
 
 static void *
@@ -503,7 +509,7 @@ nv40_vp_state_delete(struct pipe_context *pipe, void *hwcso)
        struct nv40_vertex_program *vp = hwcso;
 
        nv40_vertprog_destroy(nv40, vp);
-       free(vp);
+       FREE(vp);
 }
 
 static void *
@@ -534,7 +540,7 @@ nv40_fp_state_delete(struct pipe_context *pipe, void *hwcso)
        struct nv40_fragment_program *fp = hwcso;
 
        nv40_fragprog_destroy(nv40, fp);
-       free(fp);
+       FREE(fp);
 }
 
 static void
@@ -542,16 +548,8 @@ nv40_set_blend_color(struct pipe_context *pipe,
                     const struct pipe_blend_color *bcol)
 {
        struct nv40_context *nv40 = nv40_context(pipe);
-       struct nouveau_stateobj *so = so_new(2, 0);
-
-       so_method(so, nv40->hw->curie, NV40TCL_BLEND_COLOR, 1);
-       so_data  (so, ((float_to_ubyte(bcol->color[3]) << 24) |
-                      (float_to_ubyte(bcol->color[0]) << 16) |
-                      (float_to_ubyte(bcol->color[1]) <<  8) |
-                      (float_to_ubyte(bcol->color[2]) <<  0)));
 
-       so_ref(so, &nv40->so_bcol);
-       so_ref(NULL, &so);
+       nv40->pipe_state.blend_colour = *bcol;
        nv40->dirty |= NV40_NEW_BCOL;
 }
 
@@ -754,20 +752,8 @@ nv40_set_viewport_state(struct pipe_context *pipe,
                        const struct pipe_viewport_state *vpt)
 {
        struct nv40_context *nv40 = nv40_context(pipe);
-       struct nouveau_stateobj *so = so_new(9, 0);
-
-       so_method(so, nv40->hw->curie, NV40TCL_VIEWPORT_TRANSLATE_X, 8);
-       so_data  (so, fui(vpt->translate[0]));
-       so_data  (so, fui(vpt->translate[1]));
-       so_data  (so, fui(vpt->translate[2]));
-       so_data  (so, fui(vpt->translate[3]));
-       so_data  (so, fui(vpt->scale[0]));
-       so_data  (so, fui(vpt->scale[1]));
-       so_data  (so, fui(vpt->scale[2]));
-       so_data  (so, fui(vpt->scale[3]));
-
-       so_ref(so, &nv40->so_viewport);
-       so_ref(NULL, &so);
+
+       nv40->pipe_state.viewport = *vpt;
        nv40->dirty |= NV40_NEW_VIEWPORT;
 }
 

diff --git a/src/gallium/drivers/nv40/nv40_state_blend.c b/src/gallium/drivers/nv40/nv40_state_blend.c
new file mode 100644 (file)
index 0000000..b12f8b0
--- /dev/null
+++ b/src/gallium/drivers/nv40/nv40_state_blend.c
@@ -0,0 +1,41 @@
+#include "nv40_context.h"
+
+static boolean
+nv40_state_blend_validate(struct nv40_context *nv40)
+{
+       so_ref(nv40->pipe_state.blend->so, &nv40->state.hw[NV40_STATE_BLEND]);
+       return TRUE;
+}
+
+struct nv40_state_entry nv40_state_blend = {
+       .validate = nv40_state_blend_validate,
+       .dirty = {
+               .pipe = NV40_NEW_BLEND,
+               .hw = NV40_STATE_BLEND
+       }
+};
+
+static boolean
+nv40_state_blend_colour_validate(struct nv40_context *nv40)
+{
+       struct nouveau_stateobj *so = so_new(2, 0);
+       struct pipe_blend_color *bcol = &nv40->pipe_state.blend_colour;
+
+       so_method(so, nv40->hw->curie, NV40TCL_BLEND_COLOR, 1);
+       so_data  (so, ((float_to_ubyte(bcol->color[3]) << 24) |
+                      (float_to_ubyte(bcol->color[0]) << 16) |
+                      (float_to_ubyte(bcol->color[1]) <<  8) |
+                      (float_to_ubyte(bcol->color[2]) <<  0)));
+
+       so_ref(so, &nv40->state.hw[NV40_STATE_BCOL]);
+       so_ref(NULL, &so);
+       return TRUE;
+}
+
+struct nv40_state_entry nv40_state_blend_colour = {
+       .validate = nv40_state_blend_colour_validate,
+       .dirty = {
+               .pipe = NV40_NEW_BCOL,
+               .hw = NV40_STATE_BCOL
+       }
+};

diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
index 58beb72389a88efdfb098e8d60d2edc0961af1f6..65d7e2978a8485c02eb107958047832ff2a8f309 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_emit.c
+++ b/src/gallium/drivers/nv40/nv40_state_emit.c
@@ -2,11 +2,16 @@
 #include "nv40_state.h"
 
 static struct nv40_state_entry *render_states[] = {
+       &nv40_state_rasterizer,
        &nv40_state_clip,
        &nv40_state_scissor,
        &nv40_state_stipple,
        &nv40_state_fragprog,
        &nv40_state_vertprog,
+       &nv40_state_blend,
+       &nv40_state_blend_colour,
+       &nv40_state_zsa,
+       &nv40_state_viewport,
        NULL
 };
 
@@ -79,21 +84,6 @@ nv40_emit_hw_state(struct nv40_context *nv40)
        if (nv40->dirty & NV40_NEW_FB)
                so_emit(nv40->nvws, nv40->so_framebuffer);
 
-       if (nv40->dirty & NV40_NEW_BLEND)
-               so_emit(nv40->nvws, nv40->so_blend);
-
-       if (nv40->dirty & NV40_NEW_RAST)
-               so_emit(nv40->nvws, nv40->so_rast);
-
-       if (nv40->dirty & NV40_NEW_ZSA)
-               so_emit(nv40->nvws, nv40->so_zsa);
-
-       if (nv40->dirty & NV40_NEW_BCOL)
-               so_emit(nv40->nvws, nv40->so_bcol);
-
-       if (nv40->dirty & NV40_NEW_VIEWPORT)
-               so_emit(nv40->nvws, nv40->so_viewport);
-
        if (nv40->dirty_samplers || (nv40->dirty & NV40_NEW_FRAGPROG)) {
                nv40_fragtex_bind(nv40);
 

diff --git a/src/gallium/drivers/nv40/nv40_state_rasterizer.c b/src/gallium/drivers/nv40/nv40_state_rasterizer.c
new file mode 100644 (file)
index 0000000..59b35d1
--- /dev/null
+++ b/src/gallium/drivers/nv40/nv40_state_rasterizer.c
@@ -0,0 +1,17 @@
+#include "nv40_context.h"
+
+static boolean
+nv40_state_rasterizer_validate(struct nv40_context *nv40)
+{
+       so_ref(nv40->pipe_state.rasterizer->so,
+              &nv40->state.hw[NV40_STATE_RAST]);
+       return TRUE;
+}
+
+struct nv40_state_entry nv40_state_rasterizer = {
+       .validate = nv40_state_rasterizer_validate,
+       .dirty = {
+               .pipe = NV40_NEW_RAST,
+               .hw = NV40_STATE_RAST
+       }
+};

diff --git a/src/gallium/drivers/nv40/nv40_state_scissor.c b/src/gallium/drivers/nv40/nv40_state_scissor.c
index dc7b6d3a9d88f52249be3c637e4935447261c5b6..2871fa2516d5ffaf388fe1bd852f8c6aedd15348 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_scissor.c
+++ b/src/gallium/drivers/nv40/nv40_state_scissor.c
@@ -3,7 +3,7 @@
 static boolean
 nv40_state_scissor_validate(struct nv40_context *nv40)
 {
-       struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
+       struct pipe_rasterizer_state *rast = &nv40->pipe_state.rasterizer->pipe;
        struct pipe_scissor_state *s = &nv40->pipe_state.scissor;
        struct nouveau_stateobj *so;
 

diff --git a/src/gallium/drivers/nv40/nv40_state_stipple.c b/src/gallium/drivers/nv40/nv40_state_stipple.c
index 1b0b194432ea40b1a41eba0da1d3c0ed89f901c4..bd163582a39acc17517ba0e24fa5024f524d918e 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_stipple.c
+++ b/src/gallium/drivers/nv40/nv40_state_stipple.c
@@ -3,7 +3,7 @@
 static boolean
 nv40_state_stipple_validate(struct nv40_context *nv40)
 {
-       struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
+       struct pipe_rasterizer_state *rast = &nv40->pipe_state.rasterizer->pipe;
        struct nouveau_grobj *curie = nv40->hw->curie;
        struct nouveau_stateobj *so;
 

diff --git a/src/gallium/drivers/nv40/nv40_state_viewport.c b/src/gallium/drivers/nv40/nv40_state_viewport.c
new file mode 100644 (file)
index 0000000..79fcc31
--- /dev/null
+++ b/src/gallium/drivers/nv40/nv40_state_viewport.c
@@ -0,0 +1,30 @@
+#include "nv40_context.h"
+
+static boolean
+nv40_state_viewport_validate(struct nv40_context *nv40)
+{
+       struct nouveau_stateobj *so = so_new(9, 0);
+       struct pipe_viewport_state *vpt = &nv40->pipe_state.viewport;
+
+       so_method(so, nv40->hw->curie, NV40TCL_VIEWPORT_TRANSLATE_X, 8);
+       so_data  (so, fui(vpt->translate[0]));
+       so_data  (so, fui(vpt->translate[1]));
+       so_data  (so, fui(vpt->translate[2]));
+       so_data  (so, fui(vpt->translate[3]));
+       so_data  (so, fui(vpt->scale[0]));
+       so_data  (so, fui(vpt->scale[1]));
+       so_data  (so, fui(vpt->scale[2]));
+       so_data  (so, fui(vpt->scale[3]));
+
+       so_ref(so, &nv40->state.hw[NV40_STATE_VIEWPORT]);
+       so_ref(NULL, &so);
+       return TRUE;
+}
+
+struct nv40_state_entry nv40_state_viewport = {
+       .validate = nv40_state_viewport_validate,
+       .dirty = {
+               .pipe = NV40_NEW_VIEWPORT,
+               .hw = NV40_STATE_VIEWPORT
+       }
+};

diff --git a/src/gallium/drivers/nv40/nv40_state_zsa.c b/src/gallium/drivers/nv40/nv40_state_zsa.c
new file mode 100644 (file)
index 0000000..061a355
--- /dev/null
+++ b/src/gallium/drivers/nv40/nv40_state_zsa.c
@@ -0,0 +1,17 @@
+#include "nv40_context.h"
+
+static boolean
+nv40_state_zsa_validate(struct nv40_context *nv40)
+{
+       so_ref(nv40->pipe_state.zsa->so,
+              &nv40->state.hw[NV40_STATE_ZSA]);
+       return TRUE;
+}
+
+struct nv40_state_entry nv40_state_zsa = {
+       .validate = nv40_state_zsa_validate,
+       .dirty = {
+               .pipe = NV40_NEW_ZSA,
+               .hw = NV40_STATE_ZSA
+       }
+};