Attachment 31638 Details for Bug 25354 – possible fix for r2xx

[patch] possible fix for r2xx

bug25354.diff (text/plain), 3.90 KB, created by Alex Deucher on 2009-12-01 13:27:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-12-01 13:27:23 UTC

Size: 3.90 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
>index e3ae839..5f985d6 100644
>--- a/src/mesa/drivers/dri/r200/r200_context.c
>+++ b/src/mesa/drivers/dri/r200/r200_context.c
>@@ -325,9 +325,9 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
>    _mesa_init_driver_functions(&functions);
>    r200InitDriverFuncs(&functions);
>    r200InitIoctlFuncs(&functions);
>-   r200InitStateFuncs(&functions, screen->kernel_mm);
>+   r200InitStateFuncs(&functions);
>    r200InitTextureFuncs(&functions);
>-   r200InitShaderFuncs(&functions); 
>+   r200InitShaderFuncs(&functions);
>    radeonInitQueryObjFunctions(&functions);
> 
>    if (!radeonInitContext(&rmesa->radeon, &functions,
>diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
>index d28e96d..6d99c03 100644
>--- a/src/mesa/drivers/dri/r200/r200_state.c
>+++ b/src/mesa/drivers/dri/r200/r200_state.c
>@@ -2476,7 +2476,7 @@ static void r200PolygonStipple( GLcontext *ctx, const GLubyte *mask )
> }
> /* Initialize the driver's state functions.
>  */
>-void r200InitStateFuncs( struct dd_function_table *functions, GLboolean dri2 )
>+void r200InitStateFuncs( struct dd_function_table *functions )
> {
>    functions->UpdateState		= r200InvalidateState;
>    functions->LightingSpaceChange	= r200LightingSpaceChange;
>@@ -2510,10 +2510,7 @@ void r200InitStateFuncs( struct dd_function_table *functions, GLboolean dri2 )
>    functions->LogicOpcode		= r200LogicOpCode;
>    functions->PolygonMode		= r200PolygonMode;
>    functions->PolygonOffset		= r200PolygonOffset;
>-   if (dri2)
>-      functions->PolygonStipple		= r200PolygonStipple;
>-   else
>-      functions->PolygonStipple		= radeonPolygonStipplePreKMS;
>+   functions->PolygonStipple		= r200PolygonStipple;
>    functions->PointParameterfv		= r200PointParameter;
>    functions->PointSize			= r200PointSize;
>    functions->RenderMode		= r200RenderMode;
>diff --git a/src/mesa/drivers/dri/r200/r200_state.h b/src/mesa/drivers/dri/r200/r200_state.h
>index 9c62f0a..7b9b0c1 100644
>--- a/src/mesa/drivers/dri/r200/r200_state.h
>+++ b/src/mesa/drivers/dri/r200/r200_state.h
>@@ -38,7 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> #include "r200_context.h"
> 
> extern void r200InitState( r200ContextPtr rmesa );
>-extern void r200InitStateFuncs( struct dd_function_table *functions, GLboolean dri2 );
>+extern void r200InitStateFuncs( struct dd_function_table *functions );
> extern void r200InitTnlFuncs( GLcontext *ctx );
> 
> extern void r200UpdateMaterial( GLcontext *ctx );
>diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c
>index e53fd72..6c5a0b7 100644
>--- a/src/mesa/drivers/dri/r200/r200_state_init.c
>+++ b/src/mesa/drivers/dri/r200/r200_state_init.c
>@@ -887,10 +887,8 @@ void r200InitState( r200ContextPtr rmesa )
>          }
>       }
>    }
>-   /* polygon stipple is done with irq for non-kms */
>-   if (rmesa->radeon.radeonScreen->kernel_mm) {
>-       ALLOC_STATE( stp, always, STP_STATE_SIZE, "STP/stp", 0 );
>-   }
>+
>+   ALLOC_STATE( stp, always, STP_STATE_SIZE, "STP/stp", 0 );
> 
>    for (i = 0; i < 6; i++)
>       if (rmesa->radeon.radeonScreen->kernel_mm)
>@@ -1122,12 +1120,11 @@ void r200InitState( r200ContextPtr rmesa )
>    rmesa->hw.sci.cmd[SCI_CMD_1] = CP_PACKET0(R200_RE_TOP_LEFT, 0);
>    rmesa->hw.sci.cmd[SCI_CMD_2] = CP_PACKET0(R200_RE_WIDTH_HEIGHT, 0);
> 
>-   if (rmesa->radeon.radeonScreen->kernel_mm) {
>-
>-	rmesa->hw.stp.cmd[STP_CMD_0] = CP_PACKET0(RADEON_RE_STIPPLE_ADDR, 0);
>-	rmesa->hw.stp.cmd[STP_DATA_0] = 0;
>-	rmesa->hw.stp.cmd[STP_CMD_1] = CP_PACKET0_ONE(RADEON_RE_STIPPLE_DATA, 31);
>+   rmesa->hw.stp.cmd[STP_CMD_0] = CP_PACKET0(RADEON_RE_STIPPLE_ADDR, 0);
>+   rmesa->hw.stp.cmd[STP_DATA_0] = 0;
>+   rmesa->hw.stp.cmd[STP_CMD_1] = CP_PACKET0_ONE(RADEON_RE_STIPPLE_DATA, 31);
> 
>+   if (rmesa->radeon.radeonScreen->kernel_mm) {
>         rmesa->hw.mtl[0].emit = mtl_emit;
>         rmesa->hw.mtl[1].emit = mtl_emit;
>

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.