X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fnouveau%2Fnv20_context.c;h=14329a2326c6f752360fe0954f4483de22c075f8;hb=b8d2263c83d29f4626ac0fe0316978aa6262aefb;hp=789dcaa6b46383bfc51857a56564655e62664fb8;hpb=c7f5c9a3dc6350252e73b541bb85ab3ed9e64a9c;p=mesa.git

diff --git a/src/mesa/drivers/dri/nouveau/nv20_context.c b/src/mesa/drivers/dri/nouveau/nv20_context.c
index 789dcaa6b46..14329a2326c 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_context.c
@@ -24,369 +24,426 @@
  *
  */
 
+#include <stdbool.h>
 #include "nouveau_driver.h"
 #include "nouveau_context.h"
-#include "nouveau_class.h"
+#include "nouveau_fbo.h"
+#include "nouveau_util.h"
+#include "nv_object.xml.h"
+#include "nv20_3d.xml.h"
 #include "nv04_driver.h"
 #include "nv10_driver.h"
 #include "nv20_driver.h"
 
-static const struct dri_extension nv20_extensions[] = {
-	{ "GL_EXT_texture_rectangle",	NULL },
-	{ NULL,				NULL }
-};
+static void
+nv20_clear(struct gl_context *ctx, GLbitfield buffers)
+{
+	struct nouveau_context *nctx = to_nouveau_context(ctx);
+	struct nouveau_pushbuf *push = context_push(ctx);
+	struct gl_framebuffer *fb = ctx->DrawBuffer;
+	uint32_t clear = 0;
+
+	nouveau_validate_framebuffer(ctx);
+
+	nouveau_pushbuf_bufctx(push, nctx->hw.bufctx);
+	if (nouveau_pushbuf_validate(push)) {
+		nouveau_pushbuf_bufctx(push, NULL);
+		return;
+	}
+
+	if (buffers & BUFFER_BITS_COLOR) {
+		struct nouveau_surface *s = &to_nouveau_renderbuffer(
+			fb->_ColorDrawBuffers[0])->surface;
+
+		if (ctx->Color.ColorMask[0][RCOMP])
+			clear |= NV20_3D_CLEAR_BUFFERS_COLOR_R;
+		if (ctx->Color.ColorMask[0][GCOMP])
+			clear |= NV20_3D_CLEAR_BUFFERS_COLOR_G;
+		if (ctx->Color.ColorMask[0][BCOMP])
+			clear |= NV20_3D_CLEAR_BUFFERS_COLOR_B;
+		if (ctx->Color.ColorMask[0][ACOMP])
+			clear |= NV20_3D_CLEAR_BUFFERS_COLOR_A;
+
+		BEGIN_NV04(push, NV20_3D(CLEAR_VALUE), 1);
+		PUSH_DATA (push, pack_rgba_clamp_f(s->format, ctx->Color.ClearColor.f));
+
+		buffers &= ~BUFFER_BITS_COLOR;
+	}
+
+	if (buffers & (BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL)) {
+		struct nouveau_surface *s = &to_nouveau_renderbuffer(
+			fb->Attachment[BUFFER_DEPTH].Renderbuffer)->surface;
+
+		if (buffers & BUFFER_BIT_DEPTH && ctx->Depth.Mask)
+			clear |= NV20_3D_CLEAR_BUFFERS_DEPTH;
+		if (buffers & BUFFER_BIT_STENCIL && ctx->Stencil.WriteMask[0])
+			clear |= NV20_3D_CLEAR_BUFFERS_STENCIL;
+
+		BEGIN_NV04(push, NV20_3D(CLEAR_DEPTH_VALUE), 1);
+		PUSH_DATA (push, pack_zs_f(s->format, ctx->Depth.Clear,
+					 ctx->Stencil.Clear));
+
+		buffers &= ~(BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL);
+	}
+
+	BEGIN_NV04(push, NV20_3D(CLEAR_BUFFERS), 1);
+	PUSH_DATA (push, clear);
+
+	nouveau_pushbuf_bufctx(push, NULL);
+	nouveau_clear(ctx, buffers);
+}
 
 static void
-nv20_hwctx_init(GLcontext *ctx)
+nv20_hwctx_init(struct gl_context *ctx)
 {
-	struct nouveau_channel *chan = context_chan(ctx);
-	struct nouveau_grobj *kelvin = context_eng3d(ctx);
+	struct nouveau_pushbuf *push = context_push(ctx);
 	struct nouveau_hw_state *hw = &to_nouveau_context(ctx)->hw;
+	struct nv04_fifo *fifo = hw->chan->data;
 	int i;
 
-	BEGIN_RING(chan, kelvin, NV20TCL_DMA_NOTIFY, 1);
-	OUT_RING  (chan, hw->ntfy->handle);
-	BEGIN_RING(chan, kelvin, NV20TCL_DMA_TEXTURE0, 2);
-	OUT_RING  (chan, chan->vram->handle);
-	OUT_RING  (chan, chan->gart->handle);
-	BEGIN_RING(chan, kelvin, NV20TCL_DMA_COLOR, 2);
-	OUT_RING  (chan, chan->vram->handle);
-	OUT_RING  (chan, chan->vram->handle);
-	BEGIN_RING(chan, kelvin, NV20TCL_DMA_VTXBUF0, 2);
-	OUT_RING(chan, chan->vram->handle);
-	OUT_RING(chan, chan->gart->handle);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_DMA_QUERY, 1);
-	OUT_RING  (chan, 0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_RT_HORIZ, 2);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_CLIP_HORIZ(0), 1);
-	OUT_RING  (chan, 0xfff << 16 | 0x0);
-	BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_CLIP_VERT(0), 1);
-	OUT_RING  (chan, 0xfff << 16 | 0x0);
-
-	for (i = 1; i < NV20TCL_VIEWPORT_CLIP_HORIZ__SIZE; i++) {
-		BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_CLIP_HORIZ(i), 1);
-		OUT_RING  (chan, 0);
-		BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_CLIP_VERT(i), 1);
-		OUT_RING  (chan, 0);
+	BEGIN_NV04(push, NV01_SUBC(3D, OBJECT), 1);
+	PUSH_DATA (push, hw->eng3d->handle);
+	BEGIN_NV04(push, NV20_3D(DMA_NOTIFY), 1);
+	PUSH_DATA (push, hw->ntfy->handle);
+	BEGIN_NV04(push, NV20_3D(DMA_TEXTURE0), 2);
+	PUSH_DATA (push, fifo->vram);
+	PUSH_DATA (push, fifo->gart);
+	BEGIN_NV04(push, NV20_3D(DMA_COLOR), 2);
+	PUSH_DATA (push, fifo->vram);
+	PUSH_DATA (push, fifo->vram);
+	BEGIN_NV04(push, NV20_3D(DMA_VTXBUF0), 2);
+	PUSH_DATA (push, fifo->vram);
+	PUSH_DATA (push, fifo->gart);
+
+	BEGIN_NV04(push, NV20_3D(DMA_QUERY), 1);
+	PUSH_DATA (push, 0);
+
+	BEGIN_NV04(push, NV20_3D(RT_HORIZ), 2);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+
+	BEGIN_NV04(push, NV20_3D(VIEWPORT_CLIP_HORIZ(0)), 1);
+	PUSH_DATA (push, 0xfff << 16 | 0x0);
+	BEGIN_NV04(push, NV20_3D(VIEWPORT_CLIP_VERT(0)), 1);
+	PUSH_DATA (push, 0xfff << 16 | 0x0);
+
+	for (i = 1; i < NV20_3D_VIEWPORT_CLIP_HORIZ__LEN; i++) {
+		BEGIN_NV04(push, NV20_3D(VIEWPORT_CLIP_HORIZ(i)), 1);
+		PUSH_DATA (push, 0);
+		BEGIN_NV04(push, NV20_3D(VIEWPORT_CLIP_VERT(i)), 1);
+		PUSH_DATA (push, 0);
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_CLIP_MODE, 1);
-	OUT_RING  (chan, 0);
+	BEGIN_NV04(push, NV20_3D(VIEWPORT_CLIP_MODE), 1);
+	PUSH_DATA (push, 0);
 
-	BEGIN_RING(chan, kelvin, 0x17e0, 3);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 1.0);
+	BEGIN_NV04(push, SUBC_3D(0x17e0), 3);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 1.0);
 
 	if (context_chipset(ctx) >= 0x25) {
-		BEGIN_RING(chan, kelvin, NV20TCL_TX_RCOMP, 1);
-		OUT_RING  (chan, NV20TCL_TX_RCOMP_LEQUAL | 0xdb0);
+		BEGIN_NV04(push, NV20_3D(TEX_RCOMP), 1);
+		PUSH_DATA (push, NV20_3D_TEX_RCOMP_LEQUAL | 0xdb0);
 	} else {
-		BEGIN_RING(chan, kelvin, 0x1e68, 1);
-		OUT_RING  (chan, 0x4b800000); /* 16777216.000000 */
-		BEGIN_RING(chan, kelvin, NV20TCL_TX_RCOMP, 1);
-		OUT_RING  (chan, NV20TCL_TX_RCOMP_LEQUAL);
+		BEGIN_NV04(push, SUBC_3D(0x1e68), 1);
+		PUSH_DATA (push, 0x4b800000); /* 16777216.000000 */
+		BEGIN_NV04(push, NV20_3D(TEX_RCOMP), 1);
+		PUSH_DATA (push, NV20_3D_TEX_RCOMP_LEQUAL);
 	}
 
-	BEGIN_RING(chan, kelvin, 0x290, 1);
-	OUT_RING  (chan, 0x10 << 16 | 1);
-	BEGIN_RING(chan, kelvin, 0x9fc, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, 0x1d80, 1);
-	OUT_RING  (chan, 1);
-	BEGIN_RING(chan, kelvin, 0x9f8, 1);
-	OUT_RING  (chan, 4);
-	BEGIN_RING(chan, kelvin, 0x17ec, 3);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 1.0);
-	OUT_RINGf (chan, 0.0);
+	BEGIN_NV04(push, SUBC_3D(0x290), 1);
+	PUSH_DATA (push, 0x10 << 16 | 1);
+	BEGIN_NV04(push, SUBC_3D(0x9fc), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, SUBC_3D(0x1d80), 1);
+	PUSH_DATA (push, 1);
+	BEGIN_NV04(push, SUBC_3D(0x9f8), 1);
+	PUSH_DATA (push, 4);
+	BEGIN_NV04(push, SUBC_3D(0x17ec), 3);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 1.0);
+	PUSH_DATAf(push, 0.0);
 
 	if (context_chipset(ctx) >= 0x25) {
-		BEGIN_RING(chan, kelvin, 0x1d88, 1);
-		OUT_RING  (chan, 3);
+		BEGIN_NV04(push, SUBC_3D(0x1d88), 1);
+		PUSH_DATA (push, 3);
 
-		BEGIN_RING(chan, kelvin, NV25TCL_DMA_IN_MEMORY9, 1);
-		OUT_RING  (chan, chan->vram->handle);
-		BEGIN_RING(chan, kelvin, NV25TCL_DMA_IN_MEMORY8, 1);
-		OUT_RING  (chan, chan->vram->handle);
+		BEGIN_NV04(push, NV25_3D(DMA_HIERZ), 1);
+		PUSH_DATA (push, fifo->vram);
+		BEGIN_NV04(push, NV25_3D(UNK01AC), 1);
+		PUSH_DATA (push, fifo->vram);
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_DMA_FENCE, 1);
-	OUT_RING  (chan, 0);
+	BEGIN_NV04(push, NV20_3D(DMA_FENCE), 1);
+	PUSH_DATA (push, 0);
 
-	BEGIN_RING(chan, kelvin, 0x1e98, 1);
-	OUT_RING  (chan, 0);
+	BEGIN_NV04(push, SUBC_3D(0x1e98), 1);
+	PUSH_DATA (push, 0);
 
-	BEGIN_RING(chan, kelvin, NV20TCL_NOTIFY, 1);
-	OUT_RING  (chan, 0);
+	BEGIN_NV04(push, NV04_GRAPH(3D, NOTIFY), 1);
+	PUSH_DATA (push, 0);
 
-	BEGIN_RING(chan, kelvin, 0x120, 3);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 1);
-	OUT_RING  (chan, 2);
+	BEGIN_NV04(push, SUBC_3D(0x120), 3);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 1);
+	PUSH_DATA (push, 2);
 
 	if (context_chipset(ctx) >= 0x25) {
-		BEGIN_RING(chan, kelvin, 0x022c, 2);
-		OUT_RING  (chan, 0x280);
-		OUT_RING  (chan, 0x07d28000);
-
-		BEGIN_RING(chan, kelvin, 0x1da4, 1);
-		OUT_RING  (chan, 0);
+		BEGIN_NV04(push, SUBC_3D(0x1da4), 1);
+		PUSH_DATA (push, 0);
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_RT_HORIZ, 2);
-	OUT_RING  (chan, 0 << 16 | 0);
-	OUT_RING  (chan, 0 << 16 | 0);
+	BEGIN_NV04(push, NV20_3D(RT_HORIZ), 2);
+	PUSH_DATA (push, 0 << 16 | 0);
+	PUSH_DATA (push, 0 << 16 | 0);
 
-	BEGIN_RING(chan, kelvin, NV20TCL_ALPHA_FUNC_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_ALPHA_FUNC_FUNC, 2);
-	OUT_RING  (chan, NV20TCL_ALPHA_FUNC_FUNC_ALWAYS);
-	OUT_RING  (chan, 0);
+	BEGIN_NV04(push, NV20_3D(ALPHA_FUNC_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(ALPHA_FUNC_FUNC), 2);
+	PUSH_DATA (push, NV20_3D_ALPHA_FUNC_FUNC_ALWAYS);
+	PUSH_DATA (push, 0);
 
-	for (i = 0; i < NV20TCL_TX_ENABLE__SIZE; i++) {
-		BEGIN_RING(chan, kelvin, NV20TCL_TX_ENABLE(i), 1);
-		OUT_RING  (chan, 0);
+	for (i = 0; i < NV20_3D_TEX__LEN; i++) {
+		BEGIN_NV04(push, NV20_3D(TEX_ENABLE(i)), 1);
+		PUSH_DATA (push, 0);
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_TX_SHADER_OP, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_TX_SHADER_CULL_MODE, 1);
-	OUT_RING  (chan, 0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_RC_IN_ALPHA(0), 4);
-	OUT_RING  (chan, 0x30d410d0);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_RC_OUT_RGB(0), 4);
-	OUT_RING  (chan, 0x00000c00);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_RC_ENABLE, 1);
-	OUT_RING  (chan, 0x00011101);
-	BEGIN_RING(chan, kelvin, NV20TCL_RC_FINAL0, 2);
-	OUT_RING  (chan, 0x130e0300);
-	OUT_RING  (chan, 0x0c091c80);
-	BEGIN_RING(chan, kelvin, NV20TCL_RC_OUT_ALPHA(0), 4);
-	OUT_RING  (chan, 0x00000c00);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_RC_IN_RGB(0), 4);
-	OUT_RING  (chan, 0x20c400c0);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_RC_COLOR0, 2);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_RC_CONSTANT_COLOR0(0), 4);
-	OUT_RING  (chan, 0x035125a0);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0x40002000);
-	OUT_RING  (chan, 0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_MULTISAMPLE_CONTROL, 1);
-	OUT_RING  (chan, 0xffff0000);
-	BEGIN_RING(chan, kelvin, NV20TCL_BLEND_FUNC_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_DITHER_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_STENCIL_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_BLEND_FUNC_SRC, 4);
-	OUT_RING  (chan, NV20TCL_BLEND_FUNC_SRC_ONE);
-	OUT_RING  (chan, NV20TCL_BLEND_FUNC_DST_ZERO);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, NV20TCL_BLEND_EQUATION_FUNC_ADD);
-	BEGIN_RING(chan, kelvin, NV20TCL_STENCIL_MASK, 7);
-	OUT_RING  (chan, 0xff);
-	OUT_RING  (chan, NV20TCL_STENCIL_FUNC_FUNC_ALWAYS);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0xff);
-	OUT_RING  (chan, NV20TCL_STENCIL_OP_FAIL_KEEP);
-	OUT_RING  (chan, NV20TCL_STENCIL_OP_ZFAIL_KEEP);
-	OUT_RING  (chan, NV20TCL_STENCIL_OP_ZPASS_KEEP);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_COLOR_LOGIC_OP_ENABLE, 2);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, NV20TCL_COLOR_LOGIC_OP_OP_COPY);
-	BEGIN_RING(chan, kelvin, 0x17cc, 1);
-	OUT_RING  (chan, 0);
+	BEGIN_NV04(push, NV20_3D(TEX_SHADER_OP), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(TEX_SHADER_CULL_MODE), 1);
+	PUSH_DATA (push, 0);
+
+	BEGIN_NV04(push, NV20_3D(RC_IN_ALPHA(0)), 4);
+	PUSH_DATA (push, 0x30d410d0);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(RC_OUT_RGB(0)), 4);
+	PUSH_DATA (push, 0x00000c00);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(RC_ENABLE), 1);
+	PUSH_DATA (push, 0x00011101);
+	BEGIN_NV04(push, NV20_3D(RC_FINAL0), 2);
+	PUSH_DATA (push, 0x130e0300);
+	PUSH_DATA (push, 0x0c091c80);
+	BEGIN_NV04(push, NV20_3D(RC_OUT_ALPHA(0)), 4);
+	PUSH_DATA (push, 0x00000c00);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(RC_IN_RGB(0)), 4);
+	PUSH_DATA (push, 0x20c400c0);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(RC_COLOR0), 2);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(RC_CONSTANT_COLOR0(0)), 4);
+	PUSH_DATA (push, 0x035125a0);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0x40002000);
+	PUSH_DATA (push, 0);
+
+	BEGIN_NV04(push, NV20_3D(MULTISAMPLE_CONTROL), 1);
+	PUSH_DATA (push, 0xffff0000);
+	BEGIN_NV04(push, NV20_3D(BLEND_FUNC_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(DITHER_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(STENCIL_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(BLEND_FUNC_SRC), 4);
+	PUSH_DATA (push, NV20_3D_BLEND_FUNC_SRC_ONE);
+	PUSH_DATA (push, NV20_3D_BLEND_FUNC_DST_ZERO);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, NV20_3D_BLEND_EQUATION_FUNC_ADD);
+	BEGIN_NV04(push, NV20_3D(STENCIL_MASK), 7);
+	PUSH_DATA (push, 0xff);
+	PUSH_DATA (push, NV20_3D_STENCIL_FUNC_FUNC_ALWAYS);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0xff);
+	PUSH_DATA (push, NV20_3D_STENCIL_OP_FAIL_KEEP);
+	PUSH_DATA (push, NV20_3D_STENCIL_OP_ZFAIL_KEEP);
+	PUSH_DATA (push, NV20_3D_STENCIL_OP_ZPASS_KEEP);
+
+	BEGIN_NV04(push, NV20_3D(COLOR_LOGIC_OP_ENABLE), 2);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, NV20_3D_COLOR_LOGIC_OP_OP_COPY);
+	BEGIN_NV04(push, SUBC_3D(0x17cc), 1);
+	PUSH_DATA (push, 0);
 	if (context_chipset(ctx) >= 0x25) {
-		BEGIN_RING(chan, kelvin, 0x1d84, 1);
-		OUT_RING  (chan, 1);
+		BEGIN_NV04(push, SUBC_3D(0x1d84), 1);
+		PUSH_DATA (push, 1);
 	}
-	BEGIN_RING(chan, kelvin, NV20TCL_LIGHTING_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_LIGHT_MODEL, 1);
-	OUT_RING  (chan, NV20TCL_LIGHT_MODEL_VIEWER_NONLOCAL);
-	BEGIN_RING(chan, kelvin, NV20TCL_SEPARATE_SPECULAR_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_LIGHT_MODEL_TWO_SIDE_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_ENABLED_LIGHTS, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_NORMALIZE_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_POLYGON_STIPPLE_PATTERN(0),
-		   NV20TCL_POLYGON_STIPPLE_PATTERN__SIZE);
-	for (i = 0; i < NV20TCL_POLYGON_STIPPLE_PATTERN__SIZE; i++) {
-		OUT_RING(chan, 0xffffffff);
+	BEGIN_NV04(push, NV20_3D(LIGHTING_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(LIGHT_MODEL), 1);
+	PUSH_DATA (push, NV20_3D_LIGHT_MODEL_VIEWER_NONLOCAL);
+	BEGIN_NV04(push, NV20_3D(SEPARATE_SPECULAR_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(LIGHT_MODEL_TWO_SIDE_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(ENABLED_LIGHTS), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(NORMALIZE_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(POLYGON_STIPPLE_PATTERN(0)),
+		   NV20_3D_POLYGON_STIPPLE_PATTERN__LEN);
+	for (i = 0; i < NV20_3D_POLYGON_STIPPLE_PATTERN__LEN; i++) {
+		PUSH_DATA (push, 0xffffffff);
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_POLYGON_OFFSET_POINT_ENABLE, 3);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_DEPTH_FUNC, 1);
-	OUT_RING  (chan, NV20TCL_DEPTH_FUNC_LESS);
-	BEGIN_RING(chan, kelvin, NV20TCL_DEPTH_WRITE_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_DEPTH_TEST_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_POLYGON_OFFSET_FACTOR, 2);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 0.0);
-	BEGIN_RING(chan, kelvin, NV20TCL_DEPTH_UNK17D8, 1);
-	OUT_RING  (chan, 1);
+	BEGIN_NV04(push, NV20_3D(POLYGON_OFFSET_POINT_ENABLE), 3);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(DEPTH_FUNC), 1);
+	PUSH_DATA (push, NV20_3D_DEPTH_FUNC_LESS);
+	BEGIN_NV04(push, NV20_3D(DEPTH_WRITE_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(DEPTH_TEST_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(POLYGON_OFFSET_FACTOR), 2);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 0.0);
+	BEGIN_NV04(push, NV20_3D(DEPTH_CLAMP), 1);
+	PUSH_DATA (push, 1);
 	if (context_chipset(ctx) < 0x25) {
-		BEGIN_RING(chan, kelvin, 0x1d84, 1);
-		OUT_RING  (chan, 3);
+		BEGIN_NV04(push, SUBC_3D(0x1d84), 1);
+		PUSH_DATA (push, 3);
 	}
-	BEGIN_RING(chan, kelvin, NV20TCL_POINT_SIZE, 1);
+	BEGIN_NV04(push, NV20_3D(POINT_SIZE), 1);
 	if (context_chipset(ctx) >= 0x25)
-		OUT_RINGf (chan, 1.0);
+		PUSH_DATAf(push, 1.0);
 	else
-		OUT_RING  (chan, 8);
+		PUSH_DATA (push, 8);
 
 	if (context_chipset(ctx) >= 0x25) {
-		BEGIN_RING(chan, kelvin, NV20TCL_POINT_PARAMETERS_ENABLE, 1);
-		OUT_RING  (chan, 0);
-		BEGIN_RING(chan, kelvin, 0x0a1c, 1);
-		OUT_RING  (chan, 0x800);
+		BEGIN_NV04(push, NV20_3D(POINT_PARAMETERS_ENABLE), 1);
+		PUSH_DATA (push, 0);
+		BEGIN_NV04(push, SUBC_3D(0x0a1c), 1);
+		PUSH_DATA (push, 0x800);
 	} else {
-		BEGIN_RING(chan, kelvin, NV20TCL_POINT_PARAMETERS_ENABLE, 2);
-		OUT_RING  (chan, 0);
-		OUT_RING  (chan, 0);
+		BEGIN_NV04(push, NV20_3D(POINT_PARAMETERS_ENABLE), 2);
+		PUSH_DATA (push, 0);
+		PUSH_DATA (push, 0);
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_LINE_WIDTH, 1);
-	OUT_RING  (chan, 8);
-	BEGIN_RING(chan, kelvin, NV20TCL_LINE_SMOOTH_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_POLYGON_MODE_FRONT, 2);
-	OUT_RING  (chan, NV20TCL_POLYGON_MODE_FRONT_FILL);
-	OUT_RING  (chan, NV20TCL_POLYGON_MODE_BACK_FILL);
-	BEGIN_RING(chan, kelvin, NV20TCL_CULL_FACE, 2);
-	OUT_RING  (chan, NV20TCL_CULL_FACE_BACK);
-	OUT_RING  (chan, NV20TCL_FRONT_FACE_CCW);
-	BEGIN_RING(chan, kelvin, NV20TCL_POLYGON_SMOOTH_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_CULL_FACE_ENABLE, 1);
-	OUT_RING  (chan, 0);
-	BEGIN_RING(chan, kelvin, NV20TCL_SHADE_MODEL, 1);
-	OUT_RING  (chan, NV20TCL_SHADE_MODEL_SMOOTH);
-	BEGIN_RING(chan, kelvin, NV20TCL_POLYGON_STIPPLE_ENABLE, 1);
-	OUT_RING  (chan, 0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_TX_GEN_MODE_S(0),
-		   4 * NV20TCL_TX_GEN_MODE_S__SIZE);
-	for (i=0; i < 4 * NV20TCL_TX_GEN_MODE_S__SIZE; i++)
-		OUT_RING(chan, 0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_FOG_EQUATION_CONSTANT, 3);
-	OUT_RINGf (chan, 1.5);
-	OUT_RINGf (chan, -0.090168);
-	OUT_RINGf (chan, 0.0);
-	BEGIN_RING(chan, kelvin, NV20TCL_FOG_MODE, 2);
-	OUT_RING  (chan, NV20TCL_FOG_MODE_EXP_SIGNED);
-	OUT_RING  (chan, NV20TCL_FOG_COORD_FOG);
-	BEGIN_RING(chan, kelvin, NV20TCL_FOG_ENABLE, 2);
-	OUT_RING  (chan, 0);
-	OUT_RING  (chan, 0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_ENGINE, 1);
-	OUT_RING  (chan, NV20TCL_ENGINE_FIXED);
-
-	for (i = 0; i < NV20TCL_TX_MATRIX_ENABLE__SIZE; i++) {
-		BEGIN_RING(chan, kelvin, NV20TCL_TX_MATRIX_ENABLE(i), 1);
-		OUT_RING  (chan, 0);
+	BEGIN_NV04(push, NV20_3D(LINE_WIDTH), 1);
+	PUSH_DATA (push, 8);
+	BEGIN_NV04(push, NV20_3D(LINE_SMOOTH_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(POLYGON_MODE_FRONT), 2);
+	PUSH_DATA (push, NV20_3D_POLYGON_MODE_FRONT_FILL);
+	PUSH_DATA (push, NV20_3D_POLYGON_MODE_BACK_FILL);
+	BEGIN_NV04(push, NV20_3D(CULL_FACE), 2);
+	PUSH_DATA (push, NV20_3D_CULL_FACE_BACK);
+	PUSH_DATA (push, NV20_3D_FRONT_FACE_CCW);
+	BEGIN_NV04(push, NV20_3D(POLYGON_SMOOTH_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(CULL_FACE_ENABLE), 1);
+	PUSH_DATA (push, 0);
+	BEGIN_NV04(push, NV20_3D(SHADE_MODEL), 1);
+	PUSH_DATA (push, NV20_3D_SHADE_MODEL_SMOOTH);
+	BEGIN_NV04(push, NV20_3D(POLYGON_STIPPLE_ENABLE), 1);
+	PUSH_DATA (push, 0);
+
+	BEGIN_NV04(push, NV20_3D(TEX_GEN_MODE(0,0)),
+		   4 * NV20_3D_TEX_GEN_MODE__ESIZE);
+	for (i=0; i < 4 * NV20_3D_TEX_GEN_MODE__LEN; i++)
+		PUSH_DATA (push, 0);
+
+	BEGIN_NV04(push, NV20_3D(FOG_COEFF(0)), 3);
+	PUSH_DATAf(push, 1.5);
+	PUSH_DATAf(push, -0.090168);
+	PUSH_DATAf(push, 0.0);
+	BEGIN_NV04(push, NV20_3D(FOG_MODE), 2);
+	PUSH_DATA (push, NV20_3D_FOG_MODE_EXP_SIGNED);
+	PUSH_DATA (push, NV20_3D_FOG_COORD_FOG);
+	BEGIN_NV04(push, NV20_3D(FOG_ENABLE), 2);
+	PUSH_DATA (push, 0);
+	PUSH_DATA (push, 0);
+
+	BEGIN_NV04(push, NV20_3D(ENGINE), 1);
+	PUSH_DATA (push, NV20_3D_ENGINE_FIXED);
+
+	for (i = 0; i < NV20_3D_TEX_MATRIX_ENABLE__LEN; i++) {
+		BEGIN_NV04(push, NV20_3D(TEX_MATRIX_ENABLE(i)), 1);
+		PUSH_DATA (push, 0);
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_VTX_ATTR_4F_X(1), 4 * 15);
-	OUT_RINGf(chan, 1.0);
-	OUT_RINGf(chan, 0.0);
-	OUT_RINGf(chan, 0.0);
-	OUT_RINGf(chan, 1.0);
-	OUT_RINGf(chan, 0.0);
-	OUT_RINGf(chan, 0.0);
-	OUT_RINGf(chan, 1.0);
-	OUT_RINGf(chan, 1.0);
-	OUT_RINGf(chan, 1.0);
-	OUT_RINGf(chan, 1.0);
-	OUT_RINGf(chan, 1.0);
-	OUT_RINGf(chan, 1.0);
+	BEGIN_NV04(push, NV20_3D(VERTEX_ATTR_4F_X(1)), 4 * 15);
+	PUSH_DATAf(push, 1.0);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 1.0);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 1.0);
+	PUSH_DATAf(push, 1.0);
+	PUSH_DATAf(push, 1.0);
+	PUSH_DATAf(push, 1.0);
+	PUSH_DATAf(push, 1.0);
+	PUSH_DATAf(push, 1.0);
 	for (i = 0; i < 12; i++) {
-		OUT_RINGf(chan, 0.0);
-		OUT_RINGf(chan, 0.0);
-		OUT_RINGf(chan, 0.0);
-		OUT_RINGf(chan, 1.0);
+		PUSH_DATAf(push, 0.0);
+		PUSH_DATAf(push, 0.0);
+		PUSH_DATAf(push, 0.0);
+		PUSH_DATAf(push, 1.0);
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_EDGEFLAG_ENABLE, 1);
-	OUT_RING  (chan, 1);
-	BEGIN_RING(chan, kelvin, NV20TCL_COLOR_MASK, 1);
-	OUT_RING (chan, 0x00010101);
-	BEGIN_RING(chan, kelvin, NV20TCL_CLEAR_VALUE, 1);
-	OUT_RING (chan, 0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_DEPTH_RANGE_NEAR, 2);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 16777216.0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_TRANSLATE_X, 4);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 16777215.0);
-
-	BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_SCALE_X, 4);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 0.0);
-	OUT_RINGf (chan, 16777215.0 * 0.5);
-	OUT_RINGf (chan, 65535.0);
-
-	FIRE_RING(chan);
+	BEGIN_NV04(push, NV20_3D(EDGEFLAG_ENABLE), 1);
+	PUSH_DATA (push, 1);
+	BEGIN_NV04(push, NV20_3D(COLOR_MASK), 1);
+	PUSH_DATA (push, 0x00010101);
+	BEGIN_NV04(push, NV20_3D(CLEAR_VALUE), 1);
+	PUSH_DATA (push, 0);
+
+	BEGIN_NV04(push, NV20_3D(DEPTH_RANGE_NEAR), 2);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 16777216.0);
+
+	BEGIN_NV04(push, NV20_3D(VIEWPORT_TRANSLATE_X), 4);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 16777215.0);
+
+	BEGIN_NV04(push, NV20_3D(VIEWPORT_SCALE_X), 4);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 0.0);
+	PUSH_DATAf(push, 16777215.0 * 0.5);
+	PUSH_DATAf(push, 65535.0);
+
+	PUSH_KICK (push);
 }
 
 static void
-nv20_context_destroy(GLcontext *ctx)
+nv20_context_destroy(struct gl_context *ctx)
 {
 	struct nouveau_context *nctx = to_nouveau_context(ctx);
 
 	nv04_surface_takedown(ctx);
-	nv20_render_destroy(ctx);
+	nv20_swtnl_destroy(ctx);
+	nv20_vbo_destroy(ctx);
 
-	nouveau_grobj_free(&nctx->hw.eng3d);
+	nouveau_object_del(&nctx->hw.eng3d);
 
 	nouveau_context_deinit(ctx);
-	FREE(ctx);
+	free(ctx);
 }
 
-static GLcontext *
-nv20_context_create(struct nouveau_screen *screen, const GLvisual *visual,
-		    GLcontext *share_ctx)
+static struct gl_context *
+nv20_context_create(struct nouveau_screen *screen, gl_api api,
+		    const struct gl_config *visual,
+		    struct gl_context *share_ctx)
 {
 	struct nouveau_context *nctx;
-	GLcontext *ctx;
+	struct gl_context *ctx;
 	unsigned kelvin_class;
 	int ret;
 
@@ -396,17 +453,26 @@ nv20_context_create(struct nouveau_screen *screen, const GLvisual *visual,
 
 	ctx = &nctx->base;
 
-	if (!nouveau_context_init(ctx, screen, visual, share_ctx))
+	if (!nouveau_context_init(ctx, api, screen, visual, share_ctx))
 		goto fail;
 
-	driInitExtensions(ctx, nv20_extensions, GL_FALSE);
+	ctx->Extensions.ARB_texture_env_crossbar = true;
+	ctx->Extensions.ARB_texture_env_combine = true;
+	ctx->Extensions.ARB_texture_env_dot3 = true;
+	ctx->Extensions.NV_fog_distance = true;
+	ctx->Extensions.NV_texture_rectangle = true;
+	if (ctx->Mesa_DXTn) {
+		ctx->Extensions.EXT_texture_compression_s3tc = true;
+		ctx->Extensions.ANGLE_texture_compression_dxt = true;
+	}
 
 	/* GL constants. */
 	ctx->Const.MaxTextureCoordUnits = NV20_TEXTURE_UNITS;
-	ctx->Const.MaxTextureImageUnits = NV20_TEXTURE_UNITS;
+	ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits = NV20_TEXTURE_UNITS;
 	ctx->Const.MaxTextureUnits = NV20_TEXTURE_UNITS;
 	ctx->Const.MaxTextureMaxAnisotropy = 8;
 	ctx->Const.MaxTextureLodBias = 15;
+	ctx->Driver.Clear = nv20_clear;
 
 	/* 2D engine. */
 	ret = nv04_surface_init(ctx);
@@ -415,17 +481,18 @@ nv20_context_create(struct nouveau_screen *screen, const GLvisual *visual,
 
 	/* 3D engine. */
 	if (context_chipset(ctx) >= 0x25)
-		kelvin_class = NV25TCL;
+		kelvin_class = NV25_3D_CLASS;
 	else
-		kelvin_class = NV20TCL;
+		kelvin_class = NV20_3D_CLASS;
 
-	ret = nouveau_grobj_alloc(context_chan(ctx), 0xbeef0001, kelvin_class,
-				  &nctx->hw.eng3d);
+	ret = nouveau_object_new(context_chan(ctx), 0xbeef0001, kelvin_class,
+				 NULL, 0, &nctx->hw.eng3d);
 	if (ret)
 		goto fail;
 
 	nv20_hwctx_init(ctx);
-	nv20_render_init(ctx);
+	nv20_vbo_init(ctx);
+	nv20_swtnl_init(ctx);
 
 	return ctx;