Attachment 72051 Details for Bug 57842 – attachment 72047 as patch for r200/radeon

[patch] attachment 72047 as patch for r200/radeon

radeon-culling.patch (text/plain), 2.43 KB, created by Rafał Mużyło on 2012-12-24 03:02:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafał Mużyło

Created: 2012-12-24 03:02:43 UTC

Size: 2.43 KB

patch

obsolete

>--- src/mesa/drivers/dri/r200/r200_state.c	2012-09-01 01:33:41.000000000 +0200
>+++ src/mesa/drivers/dri/r200/r200_state.c	2012-12-24 02:49:18.126013460 +0100
>@@ -529,6 +529,7 @@ static void r200CullFace( struct gl_cont
> static void r200FrontFace( struct gl_context *ctx, GLenum mode )
> {
>    r200ContextPtr rmesa = R200_CONTEXT(ctx);
>+   int cull_face = (mode == GL_CW) ? R200_FFACE_CULL_CW : R200_FFACE_CULL_CCW;
> 
>    R200_STATECHANGE( rmesa, set );
>    rmesa->hw.set.cmd[SET_SE_CNTL] &= ~R200_FFACE_CULL_DIR_MASK;
>@@ -538,17 +539,11 @@ static void r200FrontFace( struct gl_con
> 
>    /* Winding is inverted when rendering to FBO */
>    if (ctx->DrawBuffer && _mesa_is_user_fbo(ctx->DrawBuffer))
>-      mode = (mode == GL_CW) ? GL_CCW : GL_CW;
>+      cull_face = (mode == GL_CCW) ? R200_FFACE_CULL_CW : R200_FFACE_CULL_CCW;
>+   rmesa->hw.set.cmd[SET_SE_CNTL] |= cull_face;
> 
>-   switch ( mode ) {
>-   case GL_CW:
>-      rmesa->hw.set.cmd[SET_SE_CNTL] |= R200_FFACE_CULL_CW;
>-      break;
>-   case GL_CCW:
>-      rmesa->hw.set.cmd[SET_SE_CNTL] |= R200_FFACE_CULL_CCW;
>+   if ( mode == GL_CCW ) 
>       rmesa->hw.tcl.cmd[TCL_UCP_VERT_BLEND_CTL] |= R200_CULL_FRONT_IS_CCW;
>-      break;
>-   }
> }
> 
> /* =============================================================
>--- src/mesa/drivers/dri/radeon/radeon_state.c	2012-11-09 19:16:31.000000000 +0100
>+++ src/mesa/drivers/dri/radeon/radeon_state.c	2012-12-24 02:53:58.253740952 +0100
>@@ -437,6 +437,7 @@ static void radeonCullFace( struct gl_co
> static void radeonFrontFace( struct gl_context *ctx, GLenum mode )
> {
>    r100ContextPtr rmesa = R100_CONTEXT(ctx);
>+   int cull_face = (mode == GL_CW) ? RADEON_FFACE_CULL_CW : RADEON_FFACE_CULL_CCW;
> 
>    RADEON_STATECHANGE( rmesa, set );
>    rmesa->hw.set.cmd[SET_SE_CNTL] &= ~RADEON_FFACE_CULL_DIR_MASK;
>@@ -446,17 +447,11 @@ static void radeonFrontFace( struct gl_c
> 
>    /* Winding is inverted when rendering to FBO */
>    if (ctx->DrawBuffer && _mesa_is_user_fbo(ctx->DrawBuffer))
>-      mode = (mode == GL_CW) ? GL_CCW : GL_CW;
>+      cull_face = (mode == GL_CCW) ? RADEON_FFACE_CULL_CW : RADEON_FFACE_CULL_CCW;
>+   rmesa->hw.set.cmd[SET_SE_CNTL] |= cull_face;
> 
>-   switch ( mode ) {
>-   case GL_CW:
>-      rmesa->hw.set.cmd[SET_SE_CNTL] |= RADEON_FFACE_CULL_CW;
>-      break;
>-   case GL_CCW:
>-      rmesa->hw.set.cmd[SET_SE_CNTL] |= RADEON_FFACE_CULL_CCW;
>+   if ( mode == GL_CCW )
>       rmesa->hw.tcl.cmd[TCL_UCP_VERT_BLEND_CTL] |= RADEON_CULL_FRONT_IS_CCW;
>-      break;
>-   }
> }
> 
>

Actions: View | Splinter Review

Attachments on bug 57842: 70972 | 71014 | 71022 | 72047 | 72050 | 72051

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.