Attachment 9056 Details for Bug 10234 – Proposed patch

[patch] Proposed patch

0001-Renamed-some-of-the-unkXXX-variables-in-the-command.patch (text/plain), 20.81 KB, created by Oliver McFadden on 2007-03-09 10:47:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver McFadden

Created: 2007-03-09 10:47:15 UTC

Size: 20.81 KB

patch

obsolete

>From c1c0867f437ead03db110ce1bdce191a9d18272a Mon Sep 17 00:00:00 2001
>From: Oliver McFadden <z3ro.geek@gmail.com>
>Date: Fri, 9 Mar 2007 18:40:48 +0000
>Subject: [PATCH] Renamed some of the unkXXX variables in the command buffer initialization code.
>
>Note that there are still plenty of actual unknown variables left that should
>probably be deciphered.
>
>There are a number of things incomplete in the driver; the different polygon
>offset modes (line, point, etc), the other texture filter, texture chroma key,
>etc. These should probably be fixed in the future, or at least added to the TODO
>list.
>---
> src/mesa/drivers/dri/r300/r300_cmdbuf.c  |   54 +++++++++++-----------
> src/mesa/drivers/dri/r300/r300_context.h |   19 ++++----
> src/mesa/drivers/dri/r300/r300_state.c   |   72 +++++++++++++++---------------
> 3 files changed, 73 insertions(+), 72 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
>index 2c7b5aa..d5f4c91 100644
>--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
>+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
>@@ -291,14 +291,14 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 	/* Initialize state atoms */
> 	ALLOC_STATE( vpt, always, R300_VPT_CMDSIZE, "vpt", 0 );
> 		r300->hw.vpt.cmd[R300_VPT_CMD_0] = cmdpacket0(R300_SE_VPORT_XSCALE, 6);
>-	ALLOC_STATE( unk2080, always, 2, "unk2080", 0 );
>-		r300->hw.unk2080.cmd[0] = cmdpacket0(R300_VAP_CNTL, 1);
>+	ALLOC_STATE( vap_cntl, always, 2, "vap_cntl", 0 );
>+		r300->hw.vap_cntl.cmd[0] = cmdpacket0(R300_VAP_CNTL, 1);
> 	ALLOC_STATE( vte, always, 3, "vte", 0 );
> 		r300->hw.vte.cmd[0] = cmdpacket0(R300_SE_VTE_CNTL, 2);
> 	ALLOC_STATE( unk2134, always, 3, "unk2134", 0 );
> 		r300->hw.unk2134.cmd[0] = cmdpacket0(0x2134, 2);
>-	ALLOC_STATE( unk2140, always, 2, "unk2140", 0 );
>-		r300->hw.unk2140.cmd[0] = cmdpacket0(R300_VAP_CNTL_STATUS, 1);
>+	ALLOC_STATE( vap_cntl_status, always, 2, "vap_cntl_status", 0 );
>+		r300->hw.vap_cntl_status.cmd[0] = cmdpacket0(R300_VAP_CNTL_STATUS, 1);
> 	ALLOC_STATE( vir[0], variable, R300_VIR_CMDSIZE, "vir/0", 0 );
> 		r300->hw.vir[0].cmd[R300_VIR_CMD_0] = cmdpacket0(R300_VAP_INPUT_ROUTE_0_0, 1);
> 	ALLOC_STATE( vir[1], variable, R300_VIR_CMDSIZE, "vir/1", 1 );
>@@ -335,18 +335,18 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 		r300->hw.lcntl.cmd[0] = cmdpacket0(R300_RE_LINE_CNT, 1);
> 	ALLOC_STATE( unk4260, always, 4, "unk4260", 0 );
> 		r300->hw.unk4260.cmd[0] = cmdpacket0(0x4260, 3);
>-	ALLOC_STATE( unk4274, always, 5, "unk4274", 0 );
>-		r300->hw.unk4274.cmd[0] = cmdpacket0(R300_RE_SHADE, 4);
>-	ALLOC_STATE( unk4288, always, 4, "unk4288", 0 );
>-		r300->hw.unk4288.cmd[0] = cmdpacket0(R300_RE_POLYGON_MODE, 3);
>+	ALLOC_STATE( shade, always, 5, "shade", 0 );
>+		r300->hw.shade.cmd[0] = cmdpacket0(R300_RE_SHADE, 4);
>+	ALLOC_STATE( polygon_mode, always, 4, "unk4288", 0 );
>+		r300->hw.polygon_mode.cmd[0] = cmdpacket0(R300_RE_POLYGON_MODE, 3);
> 	ALLOC_STATE( fogp, always, 3, "fogp", 0 );
> 		r300->hw.fogp.cmd[0] = cmdpacket0(R300_RE_FOG_SCALE, 2);
> 	ALLOC_STATE( unk42A0, always, 2, "unk42A0", 0 );
> 		r300->hw.unk42A0.cmd[0] = cmdpacket0(0x42A0, 1);
> 	ALLOC_STATE( zbs, always, R300_ZBS_CMDSIZE, "zbs", 0 );
> 		r300->hw.zbs.cmd[R300_ZBS_CMD_0] = cmdpacket0(R300_RE_ZBIAS_T_FACTOR, 4);
>-	ALLOC_STATE( unk42B4, always, 2, "unk42B4", 0 );
>-		r300->hw.unk42B4.cmd[0] = cmdpacket0(R300_RE_OCCLUSION_CNTL, 1);
>+	ALLOC_STATE( occlusion_cntl, always, 2, "occlusion_cntl", 0 );
>+		r300->hw.occlusion_cntl.cmd[0] = cmdpacket0(R300_RE_OCCLUSION_CNTL, 1);
> 	ALLOC_STATE( cul, always, R300_CUL_CMDSIZE, "cul", 0 );
> 		r300->hw.cul.cmd[R300_CUL_CMD_0] = cmdpacket0(R300_RE_CULL_CNTL, 1);
> 	ALLOC_STATE( unk42C0, always, 3, "unk42C0", 0 );
>@@ -392,8 +392,8 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 		r300->hw.bld.cmd[R300_BLD_CMD_0] = cmdpacket0(R300_RB3D_CBLEND, 2);
> 	ALLOC_STATE( cmk, always, R300_CMK_CMDSIZE, "cmk", 0 );
> 		r300->hw.cmk.cmd[R300_CMK_CMD_0] = cmdpacket0(R300_RB3D_COLORMASK, 1);
>-	ALLOC_STATE( unk4E10, always, 4, "unk4E10", 0 );
>-		r300->hw.unk4E10.cmd[0] = cmdpacket0(R300_RB3D_BLEND_COLOR, 3);
>+	ALLOC_STATE( blend_color, always, 4, "blend_color", 0 );
>+		r300->hw.blend_color.cmd[0] = cmdpacket0(R300_RB3D_BLEND_COLOR, 3);
> 	ALLOC_STATE( cb, always, R300_CB_CMDSIZE, "cb", 0 );
> 		r300->hw.cb.cmd[R300_CB_CMD_0] = cmdpacket0(R300_RB3D_COLOROFFSET0, 1);
> 		r300->hw.cb.cmd[R300_CB_CMD_1] = cmdpacket0(R300_RB3D_COLORPITCH0, 1);
>@@ -405,8 +405,8 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 		r300->hw.unk4EA0.cmd[0] = cmdpacket0(0x4EA0, 2);
> 	ALLOC_STATE( zs, always, R300_ZS_CMDSIZE, "zstencil", 0 );
> 		r300->hw.zs.cmd[R300_ZS_CMD_0] = cmdpacket0(R300_RB3D_ZSTENCIL_CNTL_0, 3);
>-	ALLOC_STATE( unk4F10, always, 5, "unk4F10", 0 );
>-		r300->hw.unk4F10.cmd[0] = cmdpacket0(R300_RB3D_ZSTENCIL_FORMAT, 4);
>+	ALLOC_STATE( zstencil_format, always, 5, "zstencil_format", 0 );
>+		r300->hw.zstencil_format.cmd[0] = cmdpacket0(R300_RB3D_ZSTENCIL_FORMAT, 4);
> 	ALLOC_STATE( zb, always, R300_ZB_CMDSIZE, "zb", 0 );
> 		r300->hw.zb.cmd[R300_ZB_CMD_0] = cmdpacket0(R300_RB3D_DEPTHOFFSET, 2);
> 	ALLOC_STATE( unk4F28, always, 2, "unk4F28", 0 );
>@@ -429,8 +429,8 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 	ALLOC_STATE( tex.filter, variable, mtu+1, "tex_filter", 0 );
> 		r300->hw.tex.filter.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_FILTER_0, 0);
> 
>-	ALLOC_STATE( tex.unknown1, variable, mtu+1, "tex_unknown1", 0 );
>-		r300->hw.tex.unknown1.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_FILTER1_0, 0);
>+	ALLOC_STATE( tex.filter_1, variable, mtu+1, "tex_filter_1", 0 );
>+		r300->hw.tex.filter_1.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_FILTER1_0, 0);
> 
> 	ALLOC_STATE( tex.size, variable, mtu+1, "tex_size", 0 );
> 		r300->hw.tex.size.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_SIZE_0, 0);
>@@ -444,8 +444,8 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 	ALLOC_STATE( tex.offset, variable, mtu+1, "tex_offset", 0 );
> 		r300->hw.tex.offset.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_OFFSET_0, 0);
> 
>-	ALLOC_STATE( tex.unknown4, variable, mtu+1, "tex_unknown4", 0 );
>-		r300->hw.tex.unknown4.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_CHROMA_KEY_0, 0);
>+	ALLOC_STATE( tex.chroma_key, variable, mtu+1, "tex_chroma_key", 0 );
>+		r300->hw.tex.chroma_key.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_CHROMA_KEY_0, 0);
> 
> 	ALLOC_STATE( tex.border_color, variable, mtu+1, "tex_border_color", 0 );
> 		r300->hw.tex.border_color.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_BORDER_COLOR_0, 0);
>@@ -456,10 +456,10 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 	r300->hw.atomlist.name = "atom-list";
> 
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.vpt);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk2080);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.vap_cntl);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.vte);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk2134);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk2140);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.vap_cntl_status);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.vir[0]);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.vir[1]);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.vic);
>@@ -478,12 +478,12 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4230);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.lcntl);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4260);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4274);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4288);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.shade);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.polygon_mode);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.fogp);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk42A0);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.zbs);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk42B4);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.occlusion_cntl);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.cul);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk42C0);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.rc);
>@@ -506,13 +506,13 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4E00);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.bld);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.cmk);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4E10);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.blend_color);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.cb);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4E50);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4E88);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4EA0);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.zs);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4F10);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.zstencil_format);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.zb);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4F28);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.unk4F30);
>@@ -524,12 +524,12 @@ void r300InitCmdBuf(r300ContextPtr r300)
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.vps);
> 
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.filter);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.unknown1);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.filter_1);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.size);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.format);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.pitch);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.offset);
>-	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.unknown4);
>+	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.chroma_key);
> 	insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.border_color);
> 
> 	r300->hw.is_dirty = GL_TRUE;
>diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
>index a339b2f..43de5df 100644
>--- a/src/mesa/drivers/dri/r300/r300_context.h
>+++ b/src/mesa/drivers/dri/r300/r300_context.h
>@@ -180,6 +180,7 @@ struct r300_tex_obj {
> 	/* hardware register values */
> 	/* Note that R200 has 8 registers per texture and R300 only 7 */
> 	GLuint filter;
>+	GLuint filter_1;
> 	GLuint pitch_reg;
> 	GLuint size;	/* npot only */
> 	GLuint format;
>@@ -432,11 +433,11 @@ struct r300_hw_state {
> 	int		max_state_size;	/* in dwords */
> 
> 	struct r300_state_atom vpt;	/* viewport (1D98) */
>-	struct r300_state_atom unk2080;	/* (2080) */
>+	struct r300_state_atom vap_cntl;
> 	struct r300_state_atom vof;     /* VAP output format register 0x2090 */
> 	struct r300_state_atom vte;	/* (20B0) */
> 	struct r300_state_atom unk2134;	/* (2134) */
>-	struct r300_state_atom unk2140;	/* (2140) */
>+	struct r300_state_atom vap_cntl_status;
> 	struct r300_state_atom vir[2];	/* vap input route (2150/21E0) */
> 	struct r300_state_atom vic;	/* vap input control (2180) */
> 	struct r300_state_atom unk21DC; /* (21DC) */
>@@ -452,13 +453,13 @@ struct r300_hw_state {
> 	struct r300_state_atom unk4230; /* (4230) */
> 	struct r300_state_atom lcntl;	/* line control */
> 	struct r300_state_atom unk4260; /* (4260) */
>-	struct r300_state_atom unk4274; /* (4274) */
>-	struct r300_state_atom unk4288; /* (4288) */
>+	struct r300_state_atom shade;
>+	struct r300_state_atom polygon_mode;
> 	struct r300_state_atom fogp;	/* fog parameters (4294) */
> 	struct r300_state_atom unk429C; /* (429C) */
> 	struct r300_state_atom unk42A0;	/* (42A0) */
> 	struct r300_state_atom zbs;	/* zbias (42A4) */
>-	struct r300_state_atom unk42B4; /* (42B4) */
>+	struct r300_state_atom occlusion_cntl;
> 	struct r300_state_atom cul;	/* cull cntl (42B8) */
> 	struct r300_state_atom unk42C0; /* (42C0) */
> 	struct r300_state_atom rc;	/* rs control (4300) */
>@@ -478,13 +479,13 @@ struct r300_hw_state {
> 	struct r300_state_atom unk4E00;	/* (4E00) */
> 	struct r300_state_atom bld;	/* blending (4E04) */
> 	struct r300_state_atom cmk;	/* colormask (4E0C) */
>-	struct r300_state_atom unk4E10;	/* constant blend color + ??? (4E10) */
>+	struct r300_state_atom blend_color;	/* constant blend color */
> 	struct r300_state_atom cb;	/* colorbuffer (4E28) */
> 	struct r300_state_atom unk4E50;	/* (4E50) */
> 	struct r300_state_atom unk4E88;	/* (4E88) */
> 	struct r300_state_atom unk4EA0;	/* (4E88) I saw it only written on RV350 hardware..  */
> 	struct r300_state_atom zs;	/* zstencil control (4F00) */
>-	struct r300_state_atom unk4F10;	/* (4F10) */
>+	struct r300_state_atom zstencil_format;
> 	struct r300_state_atom zb;	/* z buffer (4F20) */
> 	struct r300_state_atom unk4F28;	/* (4F28) */
> 	struct r300_state_atom unk4F30;	/* (4F30) */
>@@ -501,12 +502,12 @@ struct r300_hw_state {
> 		   updating the whole thing at once */
> 	struct {
> 		struct r300_state_atom filter;
>-		struct r300_state_atom unknown1;
>+		struct r300_state_atom filter_1;
> 		struct r300_state_atom size;
> 		struct r300_state_atom format;
> 		struct r300_state_atom pitch;
> 		struct r300_state_atom offset;
>-		struct r300_state_atom unknown4;
>+		struct r300_state_atom chroma_key;
> 		struct r300_state_atom border_color;
> 		} tex;
> 	struct r300_state_atom txe;	/* tex enable (4104) */
>diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
>index 0e33e51..402f750 100644
>--- a/src/mesa/drivers/dri/r300/r300_state.c
>+++ b/src/mesa/drivers/dri/r300/r300_state.c
>@@ -69,14 +69,14 @@ static void r300BlendColor(GLcontext * ctx, const GLfloat cf[4])
> 	GLubyte color[4];
> 	r300ContextPtr rmesa = R300_CONTEXT(ctx);
> 
>-	R300_STATECHANGE(rmesa, unk4E10);
>+	R300_STATECHANGE(rmesa, blend_color);
> 
> 	CLAMPED_FLOAT_TO_UBYTE(color[0], cf[0]);
> 	CLAMPED_FLOAT_TO_UBYTE(color[1], cf[1]);
> 	CLAMPED_FLOAT_TO_UBYTE(color[2], cf[2]);
> 	CLAMPED_FLOAT_TO_UBYTE(color[3], cf[3]);
> 
>-	rmesa->hw.unk4E10.cmd[1] = r300PackColor(4, color[3], color[0],
>+	rmesa->hw.blend_color.cmd[1] = r300PackColor(4, color[3], color[0],
> 						 color[1], color[2]);
> }
> 
>@@ -335,17 +335,17 @@ static void update_early_z(GLcontext *ctx)
> 	*/
> 	r300ContextPtr r300 = R300_CONTEXT(ctx);
> 
>-	R300_STATECHANGE(r300, unk4F10);
>+	R300_STATECHANGE(r300, zstencil_format);
> 	if (ctx->Color.AlphaEnabled && ctx->Color.AlphaFunc != GL_ALWAYS)
> 		/* disable early Z */
>-		r300->hw.unk4F10.cmd[2] = R300_EARLY_Z_DISABLE;
>+		r300->hw.zstencil_format.cmd[2] = R300_EARLY_Z_DISABLE;
> 	else {
> 		if (ctx->Depth.Test && ctx->Depth.Func != GL_NEVER)
> 			/* enable early Z */
>-			r300->hw.unk4F10.cmd[2] = R300_EARLY_Z_ENABLE;
>+			r300->hw.zstencil_format.cmd[2] = R300_EARLY_Z_ENABLE;
> 		else
> 			/* disable early Z */
>-			r300->hw.unk4F10.cmd[2] = R300_EARLY_Z_DISABLE;
>+			r300->hw.zstencil_format.cmd[2] = R300_EARLY_Z_DISABLE;
> 	}
> }
> 
>@@ -531,11 +531,11 @@ static void r300Enable(GLcontext* ctx, GLenum cap, GLboolean state)
> 		break;
> 
> 	case GL_POLYGON_OFFSET_FILL:
>-		R300_STATECHANGE(r300, unk42B4);
>+		R300_STATECHANGE(r300, occlusion_cntl);
> 		if(state){
>-			r300->hw.unk42B4.cmd[1] |= (3<<0);
>+			r300->hw.occlusion_cntl.cmd[1] |= (3<<0);
> 		} else {
>-			r300->hw.unk42B4.cmd[1] &= ~(3<<0);
>+			r300->hw.occlusion_cntl.cmd[1] &= ~(3<<0);
> 		}
> 		break;
> 	default:
>@@ -589,9 +589,9 @@ static void r300UpdatePolygonMode(GLcontext *ctx)
> 		}
> 	}
> 
>-	if (r300->hw.unk4288.cmd[1] != hw_mode) {
>-		R300_STATECHANGE(r300, unk4288);
>-		r300->hw.unk4288.cmd[1] = hw_mode;
>+	if (r300->hw.polygon_mode.cmd[1] != hw_mode) {
>+		R300_STATECHANGE(r300, polygon_mode);
>+		r300->hw.polygon_mode.cmd[1] = hw_mode;
> 	}
> }
> 
>@@ -830,13 +830,13 @@ static void r300ShadeModel(GLcontext * ctx, GLenum mode)
> {
> 	r300ContextPtr rmesa = R300_CONTEXT(ctx);
> 	
>-	R300_STATECHANGE(rmesa, unk4274);
>+	R300_STATECHANGE(rmesa, shade);
> 	switch (mode) {
> 	case GL_FLAT:
>-		rmesa->hw.unk4274.cmd[2] = R300_RE_SHADE_MODEL_FLAT;
>+		rmesa->hw.shade.cmd[2] = R300_RE_SHADE_MODEL_FLAT;
> 		break;
> 	case GL_SMOOTH:
>-		rmesa->hw.unk4274.cmd[2] = R300_RE_SHADE_MODEL_SMOOTH;
>+		rmesa->hw.shade.cmd[2] = R300_RE_SHADE_MODEL_SMOOTH;
> 		break;
> 	default:
> 		return;
>@@ -1217,12 +1217,12 @@ void r300_setup_textures(GLcontext *ctx)
> 
> 	R300_STATECHANGE(r300, txe);
> 	R300_STATECHANGE(r300, tex.filter);
>-	R300_STATECHANGE(r300, tex.unknown1);
>+	R300_STATECHANGE(r300, tex.filter_1);
> 	R300_STATECHANGE(r300, tex.size);
> 	R300_STATECHANGE(r300, tex.format);
> 	R300_STATECHANGE(r300, tex.pitch);
> 	R300_STATECHANGE(r300, tex.offset);
>-	R300_STATECHANGE(r300, tex.unknown4);
>+	R300_STATECHANGE(r300, tex.chroma_key);
> 	R300_STATECHANGE(r300, tex.border_color);
> 	
> 	r300->hw.txe.cmd[R300_TXE_ENABLE]=0x0;
>@@ -1259,7 +1259,7 @@ void r300_setup_textures(GLcontext *ctx)
> 			
> 			r300->hw.tex.filter.cmd[R300_TEX_VALUE_0 + hw_tmu] = gen_fixed_filter(t->filter) | (hw_tmu << 28);
> 			/* Currently disabled! */
>-			r300->hw.tex.unknown1.cmd[R300_TEX_VALUE_0 + hw_tmu] = 0x0; //0x20501f80;
>+			r300->hw.tex.filter_1.cmd[R300_TEX_VALUE_0 + hw_tmu] = 0x0; //0x20501f80;
> 			r300->hw.tex.size.cmd[R300_TEX_VALUE_0 + hw_tmu] = t->size;
> 			r300->hw.tex.format.cmd[R300_TEX_VALUE_0 + hw_tmu] = t->format;
> 			r300->hw.tex.pitch.cmd[R300_TEX_VALUE_0 + hw_tmu] = t->pitch_reg;
>@@ -1273,7 +1273,7 @@ void r300_setup_textures(GLcontext *ctx)
> 				WARN_ONCE("micro tiling enabled!\n");
> 			}
> 			
>-			r300->hw.tex.unknown4.cmd[R300_TEX_VALUE_0 + hw_tmu] = 0x0;
>+			r300->hw.tex.chroma_key.cmd[R300_TEX_VALUE_0 + hw_tmu] = 0x0;
> 			r300->hw.tex.border_color.cmd[R300_TEX_VALUE_0 + hw_tmu] = t->pp_border_color;
> 			
> 			last_hw_tmu = hw_tmu;
>@@ -1283,12 +1283,12 @@ void r300_setup_textures(GLcontext *ctx)
> 	}
> 	
> 	r300->hw.tex.filter.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_FILTER_0, last_hw_tmu + 1);
>-	r300->hw.tex.unknown1.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_FILTER1_0, last_hw_tmu + 1);
>+	r300->hw.tex.filter_1.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_FILTER1_0, last_hw_tmu + 1);
> 	r300->hw.tex.size.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_SIZE_0, last_hw_tmu + 1);
> 	r300->hw.tex.format.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_FORMAT_0, last_hw_tmu + 1);
> 	r300->hw.tex.pitch.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_PITCH_0, last_hw_tmu + 1);
> 	r300->hw.tex.offset.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_OFFSET_0, last_hw_tmu + 1);
>-	r300->hw.tex.unknown4.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_CHROMA_KEY_0, last_hw_tmu + 1);
>+	r300->hw.tex.chroma_key.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_CHROMA_KEY_0, last_hw_tmu + 1);
> 	r300->hw.tex.border_color.cmd[R300_TEX_CMD_0] = cmdpacket0(R300_TX_BORDER_COLOR_0, last_hw_tmu + 1);
> 	
> 	
>@@ -1973,7 +1973,7 @@ void r300ResetHwState(r300ContextPtr r300)
> 		/* Initialize magic registers
> 		 TODO : learn what they really do, or get rid of
> 		 those we don't have to touch */
>-	r300->hw.unk2080.cmd[1] = 0x0030045A; //0x0030065a /* Dangerous */
>+	r300->hw.vap_cntl.cmd[1] = 0x0030045A; //0x0030065a /* Dangerous */
> 
> 	r300->hw.vte.cmd[1] = R300_VPORT_X_SCALE_ENA
> 				| R300_VPORT_X_OFFSET_ENA
>@@ -1987,9 +1987,9 @@ void r300ResetHwState(r300ContextPtr r300)
> 	r300->hw.unk2134.cmd[1] = 0x00FFFFFF;
> 	r300->hw.unk2134.cmd[2] = 0x00000000;
> 	if (_mesa_little_endian())
>-		r300->hw.unk2140.cmd[1] = 0x00000000;
>+		r300->hw.vap_cntl_status.cmd[1] = 0x00000000;
> 	else
>-		r300->hw.unk2140.cmd[1] = 0x00000002;
>+		r300->hw.vap_cntl_status.cmd[1] = 0x00000002;
> 
> #if 0 /* Done in setup routing */
> 	((drm_r300_cmd_header_t*)r300->hw.vir[0].cmd)->packet0.count = 1;
>@@ -2080,15 +2080,15 @@ void r300ResetHwState(r300ContextPtr r300)
> 	r300->hw.unk4260.cmd[2] = r300PackFloat32(0.0);
> 	r300->hw.unk4260.cmd[3] = r300PackFloat32(1.0);
> 
>-	r300->hw.unk4274.cmd[1] = 0x00000002;
>+	r300->hw.shade.cmd[1] = 0x00000002;
> 	r300ShadeModel(ctx, ctx->Light.ShadeModel);
>-	r300->hw.unk4274.cmd[3] = 0x00000000;
>-	r300->hw.unk4274.cmd[4] = 0x00000000;
>+	r300->hw.shade.cmd[3] = 0x00000000;
>+	r300->hw.shade.cmd[4] = 0x00000000;
> 
> 	r300PolygonMode(ctx, GL_FRONT, ctx->Polygon.FrontMode);
> 	r300PolygonMode(ctx, GL_BACK, ctx->Polygon.BackMode);
>-	r300->hw.unk4288.cmd[2] = 0x00000001;
>-	r300->hw.unk4288.cmd[3] = 0x00000000;
>+	r300->hw.polygon_mode.cmd[2] = 0x00000001;
>+	r300->hw.polygon_mode.cmd[3] = 0x00000000;
> 	r300->hw.unk42A0.cmd[1] = 0x00000000;
> 
> 	r300PolygonOffset(ctx, ctx->Polygon.OffsetFactor, ctx->Polygon.OffsetUnits);
>@@ -2147,8 +2147,8 @@ void r300ResetHwState(r300ContextPtr r300)
> #endif
> 
> 	r300BlendColor(ctx, ctx->Color.BlendColor);
>-	r300->hw.unk4E10.cmd[2] = 0;
>-	r300->hw.unk4E10.cmd[3] = 0;
>+	r300->hw.blend_color.cmd[2] = 0;
>+	r300->hw.blend_color.cmd[3] = 0;
> 	
> 	/* Again, r300ClearBuffer uses this */
> 	r300->hw.cb.cmd[R300_CB_OFFSET] = r300->radeon.state.color.drawOffset +
>@@ -2180,10 +2180,10 @@ void r300ResetHwState(r300ContextPtr r300)
> 
> 	switch (ctx->Visual.depthBits) {
> 	case 16:
>-		r300->hw.unk4F10.cmd[1] = R300_DEPTH_FORMAT_16BIT_INT_Z;
>+		r300->hw.zstencil_format.cmd[1] = R300_DEPTH_FORMAT_16BIT_INT_Z;
> 	break;
> 	case 24:
>-		r300->hw.unk4F10.cmd[1] = R300_DEPTH_FORMAT_24BIT_INT_Z;
>+		r300->hw.zstencil_format.cmd[1] = R300_DEPTH_FORMAT_24BIT_INT_Z;
> 	break;
> 	default:
> 		fprintf(stderr, "Error: Unsupported depth %d... exiting\n",
>@@ -2192,10 +2192,10 @@ void r300ResetHwState(r300ContextPtr r300)
> 			
> 	}
> 	/* z compress? */
>-	//r300->hw.unk4F10.cmd[1] |= R300_DEPTH_FORMAT_UNK32;
>+	//r300->hw.zstencil_format.cmd[1] |= R300_DEPTH_FORMAT_UNK32;
> 	
>-	r300->hw.unk4F10.cmd[3] = 0x00000003;
>-	r300->hw.unk4F10.cmd[4] = 0x00000000;
>+	r300->hw.zstencil_format.cmd[3] = 0x00000003;
>+	r300->hw.zstencil_format.cmd[4] = 0x00000000;
> 
> 	r300->hw.zb.cmd[R300_ZB_OFFSET] =
> 		r300->radeon.radeonScreen->depthOffset +
>-- 
>1.5.0.2
>

Actions: View | Splinter Review

Attachments on bug 10234: 9056

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.