Attachment 4784 Details for Bug 6046 – Fix aliasing bug

[patch] Fix aliasing bug

r300-dri-aliasing-fix.diff (text/plain), 2.08 KB, created by Benjamin Herrenschmidt on 2006-03-01 09:41:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Herrenschmidt

Created: 2006-03-01 09:41:40 UTC

Size: 2.08 KB

patch

obsolete

>diff -urN r300_state.orig.c r300_state.c
>--- r300_state.orig.c	2006-03-01 09:34:30.000000000 +1100
>+++ r300_state.c	2006-03-01 09:37:21.000000000 +1100
>@@ -617,7 +617,6 @@
>  */
> static void r300DepthMask(GLcontext* ctx, GLboolean mask)
> {
>-	r300ContextPtr r300 = R300_CONTEXT(ctx);
> 	r300Enable(ctx, GL_DEPTH_TEST, ctx->Depth.Test);
> }
> 
>@@ -856,7 +855,6 @@
> 	 * setting below.  Could apply deltas to rescue pipelined viewport
> 	 * values, or keep the originals hanging around.
> 	 */
>-	R300_FIREVERTICES(R300_CONTEXT(ctx));
> 	r300UpdateWindow(ctx);
> }
> 
>@@ -876,14 +874,14 @@
> 	GLfloat tx = v[MAT_TX] + xoffset + SUBPIXEL_X;
> 	GLfloat ty = (- v[MAT_TY]) + yoffset + SUBPIXEL_Y;
> 
>-	if ( rmesa->hw.vpt.cmd[VPT_SE_VPORT_XOFFSET] != *(GLuint *)&tx ||
>-		rmesa->hw.vpt.cmd[VPT_SE_VPORT_YOFFSET] != *(GLuint *)&ty )
>+	if ( rmesa->hw.vpt.cmd[VPT_SE_VPORT_XOFFSET] != r300PackFloat32(tx) ||
>+		rmesa->hw.vpt.cmd[VPT_SE_VPORT_YOFFSET] != r300PackFloat32(ty))
> 	{
> 	/* Note: this should also modify whatever data the context reset
> 	 * code uses...
> 	 */
>-	rmesa->hw.vpt.cmd[VPT_SE_VPORT_XOFFSET] = *(GLuint *)&tx;
>-	rmesa->hw.vpt.cmd[VPT_SE_VPORT_YOFFSET] = *(GLuint *)&ty;
>+	rmesa->hw.vpt.cmd[VPT_SE_VPORT_XOFFSET] = r300PackFloat32(tx);
>+	rmesa->hw.vpt.cmd[VPT_SE_VPORT_YOFFSET] = r300PackFloat32(ty);
>       
> 	}
> 
>@@ -1090,7 +1088,9 @@
> 	int hw_tmu=0;
> 	int first_hw_tmu=0, last_hw_tmu=-1; /* -1 translates into no setup costs for fields */
> 	int tmu_mappings[R300_MAX_TEXTURE_UNITS] = { -1 };
>-	struct r300_fragment_program *rp = ctx->FragmentProgram._Current;
>+	struct r300_fragment_program *rp =
>+		(struct r300_fragment_program *)
>+		(char *)ctx->FragmentProgram._Current;
> 
> 	R300_STATECHANGE(r300, txe);
> 	R300_STATECHANGE(r300, tex.filter);
>@@ -1663,7 +1663,9 @@
> void r300SetupPixelShader(r300ContextPtr rmesa)
> {
> 	GLcontext *ctx = rmesa->radeon.glCtx;
>-	struct r300_fragment_program *rp = ctx->FragmentProgram._Current;
>+	struct r300_fragment_program *rp =
>+		(struct r300_fragment_program *)
>+		(char *)ctx->FragmentProgram._Current;
> 	int i,k;
> 
> 	if (!rp)	/* should only happenen once, just after context is created */

Actions: View | Splinter Review

Attachments on bug 6046: 4784

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.