Added few more stubs so that control reaches to DestroyDevice().

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

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c b/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
index 3f807904835467f5f405850e3be19f6a979cc0c9..28e2dce3edf7f12ddc0d02424b67fa6cc0cc2844 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
@@ -34,15 +34,14 @@
 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, NV10_3D_CULL_FACE_ENABLE, 1);
-       OUT_RINGb(chan, ctx->Polygon.CullFlag);
+       BEGIN_NV04(push, NV10_3D(CULL_FACE_ENABLE), 1);
+       PUSH_DATAb(push, ctx->Polygon.CullFlag);
 
-       BEGIN_RING(chan, celsius, NV10_3D_CULL_FACE, 1);
-       OUT_RING(chan, (mode == GL_FRONT ? NV10_3D_CULL_FACE_FRONT :
+       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));
 }
@@ -50,27 +49,25 @@ nv10_emit_cull_face(struct gl_context *ctx, int emit)
 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, NV10_3D_FRONT_FACE, 1);
-       OUT_RING(chan, ctx->Polygon.FrontFace == GL_CW ?
+       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, NV10_3D_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, NV10_3D_LINE_SMOOTH_ENABLE, 1);
-       OUT_RINGb(chan, smooth);
+       BEGIN_NV04(push, NV10_3D(LINE_SMOOTH_ENABLE), 1);
+       PUSH_DATAb(push, smooth);
 }
 
 void
@@ -81,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, NV10_3D_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, NV10_3D_POINT_SMOOTH_ENABLE, 1);
-       OUT_RINGb(chan, ctx->Point.SmoothFlag);
+       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, NV10_3D_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, NV10_3D_POLYGON_SMOOTH_ENABLE, 1);
-       OUT_RINGb(chan, ctx->Polygon.SmoothFlag);
+       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, NV10_3D_POLYGON_OFFSET_POINT_ENABLE, 3);
-       OUT_RINGb(chan, ctx->Polygon.OffsetPoint);
-       OUT_RINGb(chan, ctx->Polygon.OffsetLine);
-       OUT_RINGb(chan, ctx->Polygon.OffsetFill);
+       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, NV10_3D_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