X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fnouveau%2Fnv10_state_polygon.c;h=28e2dce3edf7f12ddc0d02424b67fa6cc0cc2844;hb=c139708087ead063da7ac64126af69f2fe7bcf1e;hp=4e49b0278cd7cbb3f3c5d1d338b27c32707999de;hpb=cd6a31cd4a9ea6deef4778c2eaef2d47240c3a6e;p=mesa.git

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c b/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
index 4e49b0278cd..28e2dce3edf 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
@@ -27,49 +27,47 @@
 #include "nouveau_driver.h"
 #include "nouveau_context.h"
 #include "nouveau_gldefs.h"
-#include "nouveau_class.h"
+#include "nouveau_util.h"
+#include "nv10_3d.xml.h"
 #include "nv10_driver.h"
 
 void
 nv10_emit_cull_face(struct gl_context *ctx, int emit)
 {
-	struct nouveau_channel *chan = context_chan(ctx);
-	struct nouveau_grobj *celsius = context_eng3d(ctx);
+	struct nouveau_pushbuf *push = context_push(ctx);
 	GLenum mode = ctx->Polygon.CullFaceMode;
 
-	BEGIN_RING(chan, celsius, NV10TCL_CULL_FACE_ENABLE, 1);
-	OUT_RING(chan, ctx->Polygon.CullFlag ? 1 : 0);
+	BEGIN_NV04(push, NV10_3D(CULL_FACE_ENABLE), 1);
+	PUSH_DATAb(push, ctx->Polygon.CullFlag);
 
-	BEGIN_RING(chan, celsius, NV10TCL_CULL_FACE, 1);
-	OUT_RING(chan, (mode == GL_FRONT ? NV10TCL_CULL_FACE_FRONT :
-			mode == GL_BACK ? NV10TCL_CULL_FACE_BACK :
-			NV10TCL_CULL_FACE_FRONT_AND_BACK));
+	BEGIN_NV04(push, NV10_3D(CULL_FACE), 1);
+	PUSH_DATA (push, (mode == GL_FRONT ? NV10_3D_CULL_FACE_FRONT :
+			mode == GL_BACK ? NV10_3D_CULL_FACE_BACK :
+			NV10_3D_CULL_FACE_FRONT_AND_BACK));
 }
 
 void
 nv10_emit_front_face(struct gl_context *ctx, int emit)
 {
-	struct nouveau_channel *chan = context_chan(ctx);
-	struct nouveau_grobj *celsius = context_eng3d(ctx);
+	struct nouveau_pushbuf *push = context_push(ctx);
 
-	BEGIN_RING(chan, celsius, NV10TCL_FRONT_FACE, 1);
-	OUT_RING(chan, ctx->Polygon.FrontFace == GL_CW ?
-		 NV10TCL_FRONT_FACE_CW : NV10TCL_FRONT_FACE_CCW);
+	BEGIN_NV04(push, NV10_3D(FRONT_FACE), 1);
+	PUSH_DATA (push, ctx->Polygon.FrontFace == GL_CW ?
+		 NV10_3D_FRONT_FACE_CW : NV10_3D_FRONT_FACE_CCW);
 }
 
 void
 nv10_emit_line_mode(struct gl_context *ctx, int emit)
 {
-	struct nouveau_channel *chan = context_chan(ctx);
-	struct nouveau_grobj *celsius = context_eng3d(ctx);
+	struct nouveau_pushbuf *push = context_push(ctx);
 	GLboolean smooth = ctx->Line.SmoothFlag &&
 		ctx->Hint.LineSmooth == GL_NICEST;
 
-	BEGIN_RING(chan, celsius, NV10TCL_LINE_WIDTH, 1);
-	OUT_RING(chan, MAX2(smooth ? 0 : 1,
+	BEGIN_NV04(push, NV10_3D(LINE_WIDTH), 1);
+	PUSH_DATA (push, MAX2(smooth ? 0 : 1,
 			    ctx->Line.Width) * 8);
-	BEGIN_RING(chan, celsius, NV10TCL_LINE_SMOOTH_ENABLE, 1);
-	OUT_RING(chan, smooth ? 1 : 0);
+	BEGIN_NV04(push, NV10_3D(LINE_SMOOTH_ENABLE), 1);
+	PUSH_DATAb(push, smooth);
 }
 
 void
@@ -80,44 +78,41 @@ nv10_emit_line_stipple(struct gl_context *ctx, int emit)
 void
 nv10_emit_point_mode(struct gl_context *ctx, int emit)
 {
-	struct nouveau_channel *chan = context_chan(ctx);
-	struct nouveau_grobj *celsius = context_eng3d(ctx);
+	struct nouveau_pushbuf *push = context_push(ctx);
 
-	BEGIN_RING(chan, celsius, NV10TCL_POINT_SIZE, 1);
-	OUT_RING(chan, (uint32_t)(ctx->Point.Size * 8));
+	BEGIN_NV04(push, NV10_3D(POINT_SIZE), 1);
+	PUSH_DATA (push, (uint32_t)(ctx->Point.Size * 8));
 
-	BEGIN_RING(chan, celsius, NV10TCL_POINT_SMOOTH_ENABLE, 1);
-	OUT_RING(chan, ctx->Point.SmoothFlag ? 1 : 0);
+	BEGIN_NV04(push, NV10_3D(POINT_SMOOTH_ENABLE), 1);
+	PUSH_DATAb(push, ctx->Point.SmoothFlag);
 }
 
 void
 nv10_emit_polygon_mode(struct gl_context *ctx, int emit)
 {
-	struct nouveau_channel *chan = context_chan(ctx);
-	struct nouveau_grobj *celsius = context_eng3d(ctx);
+	struct nouveau_pushbuf *push = context_push(ctx);
 
-	BEGIN_RING(chan, celsius, NV10TCL_POLYGON_MODE_FRONT, 2);
-	OUT_RING(chan, nvgl_polygon_mode(ctx->Polygon.FrontMode));
-	OUT_RING(chan, nvgl_polygon_mode(ctx->Polygon.BackMode));
+	BEGIN_NV04(push, NV10_3D(POLYGON_MODE_FRONT), 2);
+	PUSH_DATA (push, nvgl_polygon_mode(ctx->Polygon.FrontMode));
+	PUSH_DATA (push, nvgl_polygon_mode(ctx->Polygon.BackMode));
 
-	BEGIN_RING(chan, celsius, NV10TCL_POLYGON_SMOOTH_ENABLE, 1);
-	OUT_RING(chan, ctx->Polygon.SmoothFlag ? 1 : 0);
+	BEGIN_NV04(push, NV10_3D(POLYGON_SMOOTH_ENABLE), 1);
+	PUSH_DATAb(push, ctx->Polygon.SmoothFlag);
 }
 
 void
 nv10_emit_polygon_offset(struct gl_context *ctx, int emit)
 {
-	struct nouveau_channel *chan = context_chan(ctx);
-	struct nouveau_grobj *celsius = context_eng3d(ctx);
+	struct nouveau_pushbuf *push = context_push(ctx);
 
-	BEGIN_RING(chan, celsius, NV10TCL_POLYGON_OFFSET_POINT_ENABLE, 3);
-	OUT_RING(chan, ctx->Polygon.OffsetPoint ? 1 : 0);
-	OUT_RING(chan, ctx->Polygon.OffsetLine ? 1 : 0);
-	OUT_RING(chan, ctx->Polygon.OffsetFill ? 1 : 0);
+	BEGIN_NV04(push, NV10_3D(POLYGON_OFFSET_POINT_ENABLE), 3);
+	PUSH_DATAb(push, ctx->Polygon.OffsetPoint);
+	PUSH_DATAb(push, ctx->Polygon.OffsetLine);
+	PUSH_DATAb(push, ctx->Polygon.OffsetFill);
 
-	BEGIN_RING(chan, celsius, NV10TCL_POLYGON_OFFSET_FACTOR, 2);
-	OUT_RINGf(chan, ctx->Polygon.OffsetFactor);
-	OUT_RINGf(chan, ctx->Polygon.OffsetUnits);
+	BEGIN_NV04(push, NV10_3D(POLYGON_OFFSET_FACTOR), 2);
+	PUSH_DATAf(push, ctx->Polygon.OffsetFactor);
+	PUSH_DATAf(push, ctx->Polygon.OffsetUnits);
 }
 
 void