nv40: remove pipe_state struct now.

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

diff --git a/src/gallium/drivers/nv40/nv40_state_blend.c b/src/gallium/drivers/nv40/nv40_state_blend.c
index 81b927a67a94ddfb35c826c19a62fdadba6b0857..dd09830aa3d5fab5368a6800081dbd38528a27f8 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_blend.c
+++ b/src/gallium/drivers/nv40/nv40_state_blend.c
@@ -3,7 +3,7 @@
 static boolean
 nv40_state_blend_validate(struct nv40_context *nv40)
 {
-       so_ref(nv40->pipe_state.blend->so, &nv40->state.hw[NV40_STATE_BLEND]);
+       so_ref(nv40->blend->so, &nv40->state.hw[NV40_STATE_BLEND]);
        return TRUE;
 }
 
@@ -19,7 +19,7 @@ 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;
+       struct pipe_blend_color *bcol = &nv40->blend_colour;
 
        so_method(so, nv40->hw->curie, NV40TCL_BLEND_COLOR, 1);
        so_data  (so, ((float_to_ubyte(bcol->color[3]) << 24) |