nv30: Add state for blend

diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
index ec11de76446178713230e6d578d10cba4eb8569a..04f53ee4565f38285709e9e05db5801996b3c1dc 100644 (file)
--- a/src/gallium/drivers/nv30/Makefile
+++ b/src/gallium/drivers/nv30/Makefile
@@ -13,6 +13,7 @@ DRIVER_SOURCES = \
        nv30_query.c \
        nv30_screen.c \
        nv30_state.c \
+       nv30_state_blend.c \
        nv30_state_emit.c \
        nv30_state_fb.c \
        nv30_surface.c \

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 9fbe66dc74e0fb6ac4fd9f313f77aadef6cf405a..1695ba5a01732e223ec15cf801ede6c113a64e95 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -76,6 +76,13 @@ enum nv30_state_index {
 #define NV30_NEW_ARRAYS                (1 << 11)
 #define NV30_NEW_UCP           (1 << 12)
 
+/* TODO: rename when removing the old state emitter */
+struct nv30_blend_state_new {
+       struct pipe_blend_state pipe;
+       struct nouveau_stateobj *so;
+};
+
+
 struct nv30_state {
        struct nouveau_stateobj *hw[NV30_STATE_MAX];
 };
@@ -101,6 +108,8 @@ struct nv30_context {
        unsigned vp_samplers;
 
        /* Context state */
+       struct nv30_blend_state_new *blend;
+       struct pipe_blend_color blend_colour;
        struct pipe_framebuffer_state framebuffer;
 
        uint32_t rt_enable;

diff --git a/src/gallium/drivers/nv30/nv30_state_blend.c b/src/gallium/drivers/nv30/nv30_state_blend.c
new file mode 100644 (file)
index 0000000..a1b0100
--- /dev/null
+++ b/src/gallium/drivers/nv30/nv30_state_blend.c
@@ -0,0 +1,40 @@
+#include "nv30_context.h"
+
+static boolean
+nv30_state_blend_validate(struct nv30_context *nv30)
+{
+       so_ref(nv30->blend->so, &nv30->state.hw[NV30_STATE_BLEND]);
+       return TRUE;
+}
+
+struct nv30_state_entry nv30_state_blend_new = {
+       .validate = nv30_state_blend_validate,
+       .dirty = {
+               .pipe = NV30_NEW_BLEND,
+               .hw = NV30_STATE_BLEND
+       }
+};
+
+static boolean
+nv30_state_blend_colour_validate(struct nv30_context *nv30)
+{
+       struct nouveau_stateobj *so = so_new(2, 0);
+       struct pipe_blend_color *bcol = &nv30->blend_colour;
+
+       so_method(so, nv30->screen->rankine, NV34TCL_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, &nv30->state.hw[NV30_STATE_BCOL]);
+       return TRUE;
+}
+
+struct nv30_state_entry nv30_state_blend_colour = {
+       .validate = nv30_state_blend_colour_validate,
+       .dirty = {
+               .pipe = NV30_NEW_BCOL,
+               .hw = NV30_STATE_BCOL
+       }
+};