diff options
| author | Brian <brian@yutani.localnet.net> | 2006-12-13 15:31:14 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2006-12-13 15:31:14 -0700 |
| commit | 8dcfcad7a2598ba835930aac8f3fd6576e464c1c (patch) | |
| tree | 980a80caa5c4c2666b106285d72bcff009adde25 /src/mesa/main/polygon.c | |
| parent | 6c305c083113075a1f11d5081b8c9dd1b98a7b1e (diff) | |
Move all the code for computing ctx->_TriangleCaps into state.c.
ctx->_TriangleCaps should probably go away altogether someday...
Diffstat (limited to 'src/mesa/main/polygon.c')
| -rw-r--r-- | src/mesa/main/polygon.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index b771408cf3..814f7ec5fa 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -5,9 +5,9 @@ /* * Mesa 3-D graphics library - * Version: 6.3 + * Version: 6.5.1 * - * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -166,14 +166,6 @@ _mesa_PolygonMode( GLenum face, GLenum mode ) _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(face)" ); return; } - - ctx->_TriangleCaps &= ~DD_TRI_UNFILLED; - if (ctx->Polygon.FrontMode!=GL_FILL || ctx->Polygon.BackMode!=GL_FILL) - ctx->_TriangleCaps |= DD_TRI_UNFILLED; - - if (ctx->Driver.PolygonMode) { - (*ctx->Driver.PolygonMode)( ctx, face, mode ); - } } #if _HAVE_FULL_GL @@ -321,32 +313,6 @@ _mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias ) /**********************************************************************/ -/** \name State Management */ -/*@{*/ - -/* - * Check polygon state and set DD_TRI_CULL_FRONT_BACK and/or DD_TRI_OFFSET - * in ctx->_TriangleCaps if needed. - */ -void _mesa_update_polygon( GLcontext *ctx ) -{ - ctx->_TriangleCaps &= ~(DD_TRI_CULL_FRONT_BACK | DD_TRI_OFFSET); - - if (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) - ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK; - - /* Any Polygon offsets enabled? */ - if (ctx->Polygon.OffsetPoint || - ctx->Polygon.OffsetLine || - ctx->Polygon.OffsetFill) { - ctx->_TriangleCaps |= DD_TRI_OFFSET; - } -} - -/*@}*/ - - -/**********************************************************************/ /** \name Initialization */ /*@{*/ |