diff options
| author | Brian Paul <[email protected]> | 2013-04-16 19:06:22 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-04-17 11:59:41 -0600 |
| commit | c9bb052e31b7952272e60d28969e90eafb6b3e1f (patch) | |
| tree | a30c87f75f8019051f6ccb9085309028e2f29f40 /src/mesa/tnl | |
| parent | 56dc53ed5bae2751eeadbfc1d163dfec72e8cfc8 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_vertex.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c index ce3e32165ab..a42f46053fd 100644 --- a/src/mesa/tnl/t_vertex.c +++ b/src/mesa/tnl/t_vertex.c @@ -156,9 +156,11 @@ static void choose_interp_func( struct gl_context *ctx, GLboolean force_boundary ) { struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx); - + GLboolean unfilled = (ctx->Polygon.FrontMode != GL_FILL || + ctx->Polygon.BackMode != GL_FILL); if (vtx->need_extras && - (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) { + ((ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE) || + unfilled))) { vtx->interp = _tnl_generic_interp_extras; } else { vtx->interp = _tnl_generic_interp; @@ -171,9 +173,12 @@ static void choose_interp_func( struct gl_context *ctx, static void choose_copy_pv_func( struct gl_context *ctx, GLuint edst, GLuint esrc ) { struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx); + GLboolean unfilled = (ctx->Polygon.FrontMode != GL_FILL || + ctx->Polygon.BackMode != GL_FILL); if (vtx->need_extras && - (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) { + ((ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE) || + unfilled))) { vtx->copy_pv = _tnl_generic_copy_pv_extras; } else { vtx->copy_pv = _tnl_generic_copy_pv; |