nv30: Add state for blend

This commit is contained in:
Patrice Mandin 2008-06-21 12:03:05 +02:00
parent 582b39ebb9
commit 5fea663b5f
3 changed files with 50 additions and 0 deletions

View file

@ -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 \

View file

@ -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;

View file

@ -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
}
};