diff options
| author | Brian Paul <brianp@vmware.com> | 2013-04-16 19:06:22 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-04-17 11:59:41 -0600 |
| commit | c9bb052e31b7952272e60d28969e90eafb6b3e1f (patch) | |
| tree | a30c87f75f8019051f6ccb9085309028e2f29f40 /src/mesa/drivers/dri/r200/r200_swtcl.c | |
| parent | 56dc53ed5bae2751eeadbfc1d163dfec72e8cfc8 (diff) | |
| download | external_mesa3d-c9bb052e31b7952272e60d28969e90eafb6b3e1f.zip external_mesa3d-c9bb052e31b7952272e60d28969e90eafb6b3e1f.tar.gz external_mesa3d-c9bb052e31b7952272e60d28969e90eafb6b3e1f.tar.bz2 | |
mesa: remove DD_TRI_UNFILLED flag
Use alternate code in intel, r200, radeon drivers.
v2: use conditional operator instead of bit shifting
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_swtcl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_swtcl.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c index 5c6e276..fb92e75 100644 --- a/src/mesa/drivers/dri/r200/r200_swtcl.c +++ b/src/mesa/drivers/dri/r200/r200_swtcl.c @@ -239,6 +239,8 @@ void r200ChooseVertexState( struct gl_context *ctx ) TNLcontext *tnl = TNL_CONTEXT(ctx); GLuint vte; GLuint vap; + GLboolean unfilled = (ctx->Polygon.FrontMode != GL_FILL || + ctx->Polygon.BackMode != GL_FILL); /* We must ensure that we don't do _tnl_need_projected_coords while in a * rasterization fallback. As this function will be called again when we @@ -254,7 +256,8 @@ void r200ChooseVertexState( struct gl_context *ctx ) * bigger one. */ if ((0 == (tnl->render_inputs_bitset & BITFIELD64_RANGE(_TNL_ATTRIB_TEX0, _TNL_NUM_TEX))) - || (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) { + || (ctx->_TriangleCaps & DD_TRI_LIGHT_TWOSIDE) + || unfilled) { rmesa->swtcl.needproj = GL_TRUE; vte |= R200_VTX_XY_FMT | R200_VTX_Z_FMT; vte &= ~R200_VTX_W0_FMT; @@ -571,12 +574,14 @@ void r200ChooseRenderState( struct gl_context *ctx ) r200ContextPtr rmesa = R200_CONTEXT(ctx); GLuint index = 0; GLuint flags = ctx->_TriangleCaps; + GLboolean unfilled = (ctx->Polygon.FrontMode != GL_FILL || + ctx->Polygon.BackMode != GL_FILL); if (!rmesa->radeon.TclFallback || rmesa->radeon.Fallback) return; if (flags & DD_TRI_LIGHT_TWOSIDE) index |= R200_TWOSIDE_BIT; - if (flags & DD_TRI_UNFILLED) index |= R200_UNFILLED_BIT; + if (unfilled) index |= R200_UNFILLED_BIT; if (index != rmesa->radeon.swtcl.RenderIndex) { tnl->Driver.Render.Points = rast_tab[index].points; @@ -634,8 +639,11 @@ static void r200RasterPrimitive( struct gl_context *ctx, GLuint hwprim ) static void r200RenderPrimitive( struct gl_context *ctx, GLenum prim ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); + GLboolean unfilled = (ctx->Polygon.FrontMode != GL_FILL || + ctx->Polygon.BackMode != GL_FILL); + rmesa->radeon.swtcl.render_primitive = prim; - if (prim < GL_TRIANGLES || !(ctx->_TriangleCaps & DD_TRI_UNFILLED)) + if (prim < GL_TRIANGLES || !unfilled) r200RasterPrimitive( ctx, reduced_hw_prim(ctx, prim) ); } |