1 files changed, 15 insertions, 15 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
index 854392f9ff..cbde74e4fc 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
@@ -29,7 +29,7 @@
 #include "nouveau_fbo.h"
 #include "nouveau_gldefs.h"
 #include "nouveau_util.h"
-#include "nouveau_class.h"
+#include "nv20_3d.xml.h"
 #include "nv20_driver.h"
 
 static inline unsigned
@@ -37,15 +37,15 @@ get_rt_format(gl_format format)
 {
 	switch (format) {
 	case MESA_FORMAT_XRGB8888:
-		return 0x05;
+		return NV20_3D_RT_FORMAT_COLOR_X8R8G8B8;
 	case MESA_FORMAT_ARGB8888:
-		return 0x08;
+		return NV20_3D_RT_FORMAT_COLOR_A8R8G8B8;
 	case MESA_FORMAT_RGB565:
-		return 0x03;
+		return NV20_3D_RT_FORMAT_COLOR_R5G6B5;
 	case MESA_FORMAT_Z16:
-		return 0x10;
+		return NV20_3D_RT_FORMAT_DEPTH_Z16;
 	case MESA_FORMAT_Z24_S8:
-		return 0x20;
+		return NV20_3D_RT_FORMAT_DEPTH_Z24S8;
 	default:
 		assert(0);
 	}
@@ -69,10 +69,10 @@ setup_hierz_buffer(struct gl_context *ctx)
 			       &nfb->hierz.bo);
 	}
 
-	BEGIN_RING(chan, kelvin, NV25TCL_HIERZ_PITCH, 1);
+	BEGIN_RING(chan, kelvin, NV25_3D_HIERZ_PITCH, 1);
 	OUT_RING(chan, pitch);
 
-	nouveau_bo_markl(bctx, kelvin, NV25TCL_HIERZ_OFFSET, nfb->hierz.bo,
+	nouveau_bo_markl(bctx, kelvin, NV25_3D_HIERZ_OFFSET, nfb->hierz.bo,
 			 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_RDWR);
 }
 
@@ -84,7 +84,7 @@ nv20_emit_framebuffer(struct gl_context *ctx, int emit)
 	struct nouveau_bo_context *bctx = context_bctx(ctx, FRAMEBUFFER);
 	struct gl_framebuffer *fb = ctx->DrawBuffer;
 	struct nouveau_surface *s;
-	unsigned rt_format = NV20TCL_RT_FORMAT_TYPE_LINEAR;
+	unsigned rt_format = NV20_3D_RT_FORMAT_TYPE_LINEAR;
 	unsigned rt_pitch = 0, zeta_pitch = 0;
 	unsigned bo_flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_RDWR;
 
@@ -99,7 +99,7 @@ nv20_emit_framebuffer(struct gl_context *ctx, int emit)
 		rt_format |= get_rt_format(s->format);
 		rt_pitch = s->pitch;
 
-		nouveau_bo_markl(bctx, kelvin, NV20TCL_COLOR_OFFSET,
+		nouveau_bo_markl(bctx, kelvin, NV20_3D_COLOR_OFFSET,
 				 s->bo, 0, bo_flags);
 	}
 
@@ -111,7 +111,7 @@ nv20_emit_framebuffer(struct gl_context *ctx, int emit)
 		rt_format |= get_rt_format(s->format);
 		zeta_pitch = s->pitch;
 
-		nouveau_bo_markl(bctx, kelvin, NV20TCL_ZETA_OFFSET,
+		nouveau_bo_markl(bctx, kelvin, NV20_3D_ZETA_OFFSET,
 				 s->bo, 0, bo_flags);
 
 		if (context_chipset(ctx) >= 0x25)
@@ -121,7 +121,7 @@ nv20_emit_framebuffer(struct gl_context *ctx, int emit)
 		zeta_pitch = rt_pitch;
 	}
 
-	BEGIN_RING(chan, kelvin, NV20TCL_RT_FORMAT, 2);
+	BEGIN_RING(chan, kelvin, NV20_3D_RT_FORMAT, 2);
 	OUT_RING(chan, rt_format);
 	OUT_RING(chan, zeta_pitch << 16 | rt_pitch);
 
@@ -140,12 +140,12 @@ nv20_emit_viewport(struct gl_context *ctx, int emit)
 
 	get_viewport_translate(ctx, a);
 
-	BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_TRANSLATE_X, 4);
+	BEGIN_RING(chan, kelvin, NV20_3D_VIEWPORT_TRANSLATE_X, 4);
 	OUT_RINGp(chan, a, 4);
 
-	BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_CLIP_HORIZ(0), 1);
+	BEGIN_RING(chan, kelvin, NV20_3D_VIEWPORT_CLIP_HORIZ(0), 1);
 	OUT_RING(chan, (fb->Width - 1) << 16);
-	BEGIN_RING(chan, kelvin, NV20TCL_VIEWPORT_CLIP_VERT(0), 1);
+	BEGIN_RING(chan, kelvin, NV20_3D_VIEWPORT_CLIP_VERT(0), 1);
 	OUT_RING(chan, (fb->Height - 1) << 16);
 
 	context_dirty(ctx, PROJECTION);