Attachment 31709 Details for Bug 25354 – possible fix for r1xx

[patch] possible fix for r1xx

bug25354-r1xx.diff (text/plain), 3.30 KB, created by Alex Deucher on 2009-12-03 08:55:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-12-03 08:55:34 UTC

Size: 3.30 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
>index 8032cbc..5b2bcfd 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_common.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
>@@ -262,29 +262,6 @@ void radeonScissor(GLcontext* ctx, GLint x, GLint y, GLsizei w, GLsizei h)
> 	}
> }
> 
>-void radeonPolygonStipplePreKMS( GLcontext *ctx, const GLubyte *mask )
>-{
>-   radeonContextPtr radeon = RADEON_CONTEXT(ctx);
>-   GLuint i;
>-   drm_radeon_stipple_t stipple;
>-
>-   /* Must flip pattern upside down.
>-   */
>-   for ( i = 0 ; i < 32 ; i++ ) {
>-      stipple.mask[31 - i] = ((GLuint *) mask)[i];
>-   }
>-
>-   /* TODO: push this into cmd mechanism
>-   */
>-   radeon_firevertices(radeon);
>-   LOCK_HARDWARE( radeon );
>-
>-   drmCommandWrite( radeon->dri.fd, DRM_RADEON_STIPPLE,
>-	 &stipple, sizeof(stipple) );
>-   UNLOCK_HARDWARE( radeon );
>-}
>-
>-
> /* ================================================================
>  * SwapBuffers with client-side throttling
>  */
>diff --git a/src/mesa/drivers/dri/radeon/radeon_common.h b/src/mesa/drivers/dri/radeon/radeon_common.h
>index f320191..a9e1ca4 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_common.h
>+++ b/src/mesa/drivers/dri/radeon/radeon_common.h
>@@ -10,7 +10,6 @@ void radeonRecalcScissorRects(radeonContextPtr radeon);
> void radeonSetCliprects(radeonContextPtr radeon);
> void radeonUpdateScissor( GLcontext *ctx );
> void radeonScissor(GLcontext* ctx, GLint x, GLint y, GLsizei w, GLsizei h);
>-void radeonPolygonStipplePreKMS( GLcontext *ctx, const GLubyte *mask );
> 
> void radeonWaitForIdleLocked(radeonContextPtr radeon);
> extern uint32_t radeonGetAge(radeonContextPtr radeon);
>diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h
>index 4e2c52c..12ab33a 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_context.h
>+++ b/src/mesa/drivers/dri/radeon/radeon_context.h
>@@ -331,8 +331,12 @@ struct r100_hw_state {
> 	struct radeon_state_atom stp;
> };
> 
>+struct radeon_stipple_state {
>+	GLuint mask[32];
>+};
> 
> struct r100_state {
>+	struct radeon_stipple_state stipple;
> 	struct radeon_texture_state texture;
> };
> 
>diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
>index 4d0d35e..f6c733a 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_state.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
>@@ -550,6 +550,31 @@ static void radeonPolygonOffset( GLcontext *ctx,
>    rmesa->hw.zbs.cmd[ZBS_SE_ZBIAS_CONSTANT] = constant.ui32;
> }
> 
>+static void radeonPolygonStipplePreKMS( GLcontext *ctx, const GLubyte *mask )
>+{
>+   r100ContextPtr rmesa = R100_CONTEXT(ctx);
>+   GLuint i;
>+   drm_radeon_stipple_t stipple;
>+
>+   /* Must flip pattern upside down.
>+    */
>+   for ( i = 0 ; i < 32 ; i++ ) {
>+      rmesa->state.stipple.mask[31 - i] = ((GLuint *) mask)[i];
>+   }
>+
>+   /* TODO: push this into cmd mechanism
>+    */
>+   radeon_firevertices(&rmesa->radeon);
>+   LOCK_HARDWARE( &rmesa->radeon );
>+
>+   /* FIXME: Use window x,y offsets into stipple RAM.
>+    */
>+   stipple.mask = rmesa->state.stipple.mask;
>+   drmCommandWrite( rmesa->radeon.dri.fd, DRM_RADEON_STIPPLE,
>+		    &stipple, sizeof(drm_radeon_stipple_t) );
>+   UNLOCK_HARDWARE( &rmesa->radeon );
>+}
>+
> static void radeonPolygonMode( GLcontext *ctx, GLenum face, GLenum mode )
> {
>    r100ContextPtr rmesa = R100_CONTEXT(ctx);

Actions: View | Splinter Review

Attachments on bug 25354: 31568 | 31569 | 31570 | 31638 | 31709

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.