Merge branch 'lp-offset-twoside'

[mesa.git] / src / mesa / drivers / dri / nouveau / nv20_state_raster.c

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_raster.c b/src/mesa/drivers/dri/nouveau/nv20_state_raster.c
index b43b29bb23b576f4514c5fdc1304f94eeaa1a4c3..3fb4ecae89fb583e34dbbf516febba99b5232a1c 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_state_raster.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_raster.c
@@ -27,16 +27,17 @@
 #include "nouveau_driver.h"
 #include "nouveau_context.h"
 #include "nouveau_gldefs.h"
-#include "nouveau_class.h"
+#include "nouveau_util.h"
+#include "nv20_3d.xml.h"
 #include "nv20_driver.h"
 
 void
-nv20_emit_logic_opcode(GLcontext *ctx, int emit)
+nv20_emit_logic_opcode(struct gl_context *ctx, int emit)
 {
        struct nouveau_channel *chan = context_chan(ctx);
        struct nouveau_grobj *kelvin = context_eng3d(ctx);
 
-       BEGIN_RING(chan, kelvin, NV20TCL_COLOR_LOGIC_OP_ENABLE, 2);
-       OUT_RING(chan, ctx->Color.ColorLogicOpEnabled ? 1 : 0);
+       BEGIN_RING(chan, kelvin, NV20_3D_COLOR_LOGIC_OP_ENABLE, 2);
+       OUT_RINGb(chan, ctx->Color.ColorLogicOpEnabled);
        OUT_RING(chan, nvgl_logicop_func(ctx->Color.LogicOp));
 }