diff options
| author | Patrice Mandin <pmandin@caramail.com> | 2008-06-21 10:11:37 +0200 |
|---|---|---|
| committer | Patrice Mandin <pmandin@caramail.com> | 2008-06-21 10:11:37 +0200 |
| commit | 582b39ebb9f67e3b67a776be0961fe2e51ee46f7 (patch) | |
| tree | 41e44ae80eb2ce559c6a1c9b65f97e0e2aafd89f /src/gallium/drivers/nv30/nv30_state.c | |
| parent | 5e1d657d50c247d903b865572bd3e74048e8a8f1 (diff) | |
nv30: Update nouveau_class.h to get its proper defines instead of using nv40 ones
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_state.c')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c index 620038fa64..84f016eead 100644 --- a/src/gallium/drivers/nv30/nv30_state.c +++ b/src/gallium/drivers/nv30/nv30_state.c @@ -51,7 +51,7 @@ nv30_blend_state_bind(struct pipe_context *pipe, void *hwcso) OUT_RING (cb->b_enable); OUT_RING (cb->b_srcfunc); OUT_RING (cb->b_dstfunc); - BEGIN_RING(rankine, NV34TCL_BLEND_FUNC_EQUATION, 1); + BEGIN_RING(rankine, NV34TCL_BLEND_EQUATION, 1); OUT_RING (cb->b_eqn); BEGIN_RING(rankine, NV34TCL_COLOR_MASK, 1); @@ -531,7 +531,7 @@ nv30_set_blend_color(struct pipe_context *pipe, { struct nv30_context *nv30 = nv30_context(pipe); - BEGIN_RING(rankine, NV34TCL_BLEND_FUNC_COLOR, 1); + BEGIN_RING(rankine, NV34TCL_BLEND_COLOR, 1); OUT_RING ((float_to_ubyte(bcol->color[3]) << 24) | (float_to_ubyte(bcol->color[0]) << 16) | (float_to_ubyte(bcol->color[1]) << 8) | |