nv30: Emit blend state using state objects

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 57cc991cd7aecce0e9480cbc7ad4eee52a2e16a1..eedebc91b23ee6ba4403dbd1f97b60ceab89262f 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -87,8 +87,7 @@ struct nv30_zsa_state {
        struct nouveau_stateobj *so;
 };
 
-/* TODO: rename when removing the old state emitter */
-struct nv30_blend_state_new {
+struct nv30_blend_state {
        struct pipe_blend_state pipe;
        struct nouveau_stateobj *so;
 };
@@ -125,7 +124,7 @@ struct nv30_context {
        unsigned vp_samplers;
 
        /* Context state */
-       struct nv30_blend_state_new *blend;
+       struct nv30_blend_state *blend;
        struct pipe_blend_color blend_colour;
        struct pipe_viewport_state viewport;
        struct pipe_framebuffer_state framebuffer;
@@ -212,6 +211,7 @@ extern void nv30_fragtex_bind(struct nv30_context *);
 extern boolean nv30_state_validate(struct nv30_context *nv30);
 extern void nv30_emit_hw_state(struct nv30_context *nv30);
 extern void nv30_state_tex_update(struct nv30_context *nv30);
+extern struct nv30_state_entry nv30_state_blend;
 extern struct nv30_state_entry nv30_state_blend_colour;
 extern struct nv30_state_entry nv30_state_framebuffer;
 

diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index e67a701809af7aa26330748ee87b485e351cebe1..cf46dcef936419133851a95367006ce1d6cf51f1 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -9,63 +9,65 @@ static void *
 nv30_blend_state_create(struct pipe_context *pipe,
                        const struct pipe_blend_state *cso)
 {
-       struct nv30_blend_state *cb;
-
-       cb = malloc(sizeof(struct nv30_blend_state));
-
-       cb->b_enable = cso->blend_enable ? 1 : 0;
-       cb->b_srcfunc = ((nvgl_blend_func(cso->alpha_src_factor)<<16) |
-                        (nvgl_blend_func(cso->rgb_src_factor)));
-       cb->b_dstfunc = ((nvgl_blend_func(cso->alpha_dst_factor)<<16) |
-                        (nvgl_blend_func(cso->rgb_dst_factor)));
-       cb->b_eqn = ((nvgl_blend_eqn(cso->alpha_func) << 16) |
-                    (nvgl_blend_eqn(cso->rgb_func)));
+       struct nv30_context *nv30 = nv30_context(pipe);
+       struct nouveau_grobj *rankine = nv30->screen->rankine;
+       struct nv30_blend_state *bso = CALLOC(1, sizeof(*bso));
+       struct nouveau_stateobj *so = so_new(16, 0);
+
+       if (cso->blend_enable) {
+               so_method(so, rankine, NV34TCL_BLEND_FUNC_ENABLE, 3);
+               so_data  (so, 1);
+               so_data  (so, (nvgl_blend_func(cso->alpha_src_factor) << 16) |
+                              nvgl_blend_func(cso->rgb_src_factor));
+               so_data  (so, nvgl_blend_func(cso->alpha_dst_factor) << 16 |
+                             nvgl_blend_func(cso->rgb_dst_factor));
+               so_method(so, rankine, NV34TCL_BLEND_EQUATION, 1);
+               so_data  (so, nvgl_blend_eqn(cso->alpha_func) << 16 |
+                             nvgl_blend_eqn(cso->rgb_func));
+       } else {
+               so_method(so, rankine, NV34TCL_BLEND_FUNC_ENABLE, 1);
+               so_data  (so, 0);
+       }
 
-       cb->l_enable = cso->logicop_enable ? 1 : 0;
-       cb->l_op = nvgl_logicop_func(cso->logicop_func);
+       so_method(so, rankine, NV34TCL_COLOR_MASK, 1);
+       so_data  (so, (((cso->colormask & PIPE_MASK_A) ? (0x01 << 24) : 0) |
+                      ((cso->colormask & PIPE_MASK_R) ? (0x01 << 16) : 0) |
+                      ((cso->colormask & PIPE_MASK_G) ? (0x01 <<  8) : 0) |
+                      ((cso->colormask & PIPE_MASK_B) ? (0x01 <<  0) : 0)));
 
-       cb->c_mask = (((cso->colormask & PIPE_MASK_A) ? (0x01<<24) : 0) |
-                     ((cso->colormask & PIPE_MASK_R) ? (0x01<<16) : 0) |
-                     ((cso->colormask & PIPE_MASK_G) ? (0x01<< 8) : 0) |
-                     ((cso->colormask & PIPE_MASK_B) ? (0x01<< 0) : 0));
+       if (cso->logicop_enable) {
+               so_method(so, rankine, NV34TCL_COLOR_LOGIC_OP_ENABLE, 2);
+               so_data  (so, 1);
+               so_data  (so, nvgl_logicop_func(cso->logicop_func));
+       } else {
+               so_method(so, rankine, NV34TCL_COLOR_LOGIC_OP_ENABLE, 1);
+               so_data  (so, 0);
+       }
 
-       cb->d_enable = cso->dither ? 1 : 0;
+       so_method(so, rankine, NV34TCL_DITHER_ENABLE, 1);
+       so_data  (so, cso->dither ? 1 : 0);
 
-       return (void *)cb;
+       so_ref(so, &bso->so);
+       bso->pipe = *cso;
+       return (void *)bso;
 }
 
 static void
 nv30_blend_state_bind(struct pipe_context *pipe, void *hwcso)
 {
        struct nv30_context *nv30 = nv30_context(pipe);
-       struct nv30_blend_state *cb = hwcso;
-
-       if (!hwcso) {
-               return;
-       }
-
-       BEGIN_RING(rankine, NV34TCL_DITHER_ENABLE, 1);
-       OUT_RING  (cb->d_enable);
 
-       BEGIN_RING(rankine, NV34TCL_BLEND_FUNC_ENABLE, 3);
-       OUT_RING  (cb->b_enable);
-       OUT_RING  (cb->b_srcfunc);
-       OUT_RING  (cb->b_dstfunc);
-       BEGIN_RING(rankine, NV34TCL_BLEND_EQUATION, 1);
-       OUT_RING  (cb->b_eqn);
-
-       BEGIN_RING(rankine, NV34TCL_COLOR_MASK, 1);
-       OUT_RING  (cb->c_mask);
-
-       BEGIN_RING(rankine, NV34TCL_COLOR_LOGIC_OP_ENABLE, 2);
-       OUT_RING  (cb->l_enable);
-       OUT_RING  (cb->l_op);
+       nv30->blend = hwcso;
+       nv30->dirty |= NV30_NEW_BLEND;
 }
 
 static void
 nv30_blend_state_delete(struct pipe_context *pipe, void *hwcso)
 {
-       free(hwcso);
+       struct nv30_blend_state *bso = hwcso;
+
+       so_ref(NULL, &bso->so);
+       FREE(bso);
 }
 
 

diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
index 117520dd13c0ec73c5a1a55373b3a0cc693d4717..8489b7b796965b75912224bd11e42e046d3c08b5 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state.h
+++ b/src/gallium/drivers/nv30/nv30_state.h
@@ -3,20 +3,6 @@
 
 #include "pipe/p_state.h"
 
-struct nv30_blend_state {
-       uint32_t b_enable;
-       uint32_t b_srcfunc;
-       uint32_t b_dstfunc;
-       uint32_t b_eqn;
-
-       uint32_t l_enable;
-       uint32_t l_op;
-
-       uint32_t c_mask;
-
-       uint32_t d_enable;
-};
-
 struct nv30_sampler_state {
        uint32_t fmt;
        uint32_t wrap;

diff --git a/src/gallium/drivers/nv30/nv30_state_blend.c b/src/gallium/drivers/nv30/nv30_state_blend.c
index a1b0100472d8dce681c2b3a4f438d87a605d0229..44d43e132a52fa6d294210f00b355050e7b83f57 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state_blend.c
+++ b/src/gallium/drivers/nv30/nv30_state_blend.c
@@ -7,7 +7,7 @@ nv30_state_blend_validate(struct nv30_context *nv30)
        return TRUE;
 }
 
-struct nv30_state_entry nv30_state_blend_new = {
+struct nv30_state_entry nv30_state_blend = {
        .validate = nv30_state_blend_validate,
        .dirty = {
                .pipe = NV30_NEW_BLEND,

diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 541ad0da3e876aea1f6481ebc954d989e1cf463a..492f4110117b91658f665a25fc07a1643ea63351 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -3,6 +3,7 @@
 
 static struct nv30_state_entry *render_states[] = {
        &nv30_state_framebuffer,
+       &nv30_state_blend,
        &nv30_state_blend_colour,
        NULL
 };