[Mesa-dev] [PATCH 09/11] mesa: remove DD_TRI_UNFILLED flag

[Eric Anholt]

Brian Paul <brianp at vmware.com> writes:

> Use alternate code in intel, r200, radeon drivers.
> v2: use conditional operator instead of bit shifting
> ---
>  src/mesa/drivers/dri/i915/intel_tris.c     |    4 +++-
>  src/mesa/drivers/dri/r200/r200_state.c     |    5 +++--
>  src/mesa/drivers/dri/r200/r200_swtcl.c     |   14 +++++++++++---
>  src/mesa/drivers/dri/radeon/radeon_state.c |    5 +++--
>  src/mesa/drivers/dri/radeon/radeon_swtcl.c |   14 +++++++++++---
>  src/mesa/main/debug.c                      |    5 ++---
>  src/mesa/main/mtypes.h                     |    1 -
>  src/mesa/main/polygon.c                    |    5 -----
>  src/mesa/main/state.c                      |    9 ---------
>  src/mesa/tnl/t_vertex.c                    |   11 ++++++++---
>  10 files changed, 41 insertions(+), 32 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
> index e62fd61..9a9c56f 100644
> --- a/src/mesa/drivers/dri/i915/intel_tris.c
> +++ b/src/mesa/drivers/dri/i915/intel_tris.c
> @@ -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;

Those two new lines probably should line up.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20130417/09740349/attachment-0001.pgp>