From 32c55448602f8ed764005e72682f5f3979763321 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 13 Jun 2014 21:37:18 -0700 Subject: [PATCH] mesa/drivers: Fix clang constant-logical-operand warnings. This patch fixes several clang constant-logical-operand warnings such as the following. ../../../../../src/mesa/tnl_dd/t_dd_tritmp.h:130:32: warning: use of logical '||' with constant operand [-Wconstant-logical-operand] if (DO_TWOSIDE || DO_OFFSET || DO_UNFILLED || DO_TWOSTENCIL) ^ ~~~~~~~~~~~ ../../../../../src/mesa/tnl_dd/t_dd_tritmp.h:130:32: note: use '|' for a bitwise operation if (DO_TWOSIDE || DO_OFFSET || DO_UNFILLED || DO_TWOSTENCIL) ^~ | Signed-off-by: Vinson Lee Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i915/intel_tris.c | 8 ++++---- src/mesa/drivers/dri/r200/r200_swtcl.c | 4 ++-- src/mesa/drivers/dri/radeon/radeon_maos_verts.c | 10 +++++----- src/mesa/drivers/dri/radeon/radeon_swtcl.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c index 97dbcbdec95..94d85ce68c1 100644 --- a/src/mesa/drivers/dri/i915/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c @@ -602,10 +602,10 @@ static struct } rast_tab[INTEL_MAX_TRIFUNC]; -#define DO_FALLBACK (IND & INTEL_FALLBACK_BIT) -#define DO_OFFSET (IND & INTEL_OFFSET_BIT) -#define DO_UNFILLED (IND & INTEL_UNFILLED_BIT) -#define DO_TWOSIDE (IND & INTEL_TWOSIDE_BIT) +#define DO_FALLBACK ((IND & INTEL_FALLBACK_BIT) != 0) +#define DO_OFFSET ((IND & INTEL_OFFSET_BIT) != 0) +#define DO_UNFILLED ((IND & INTEL_UNFILLED_BIT) != 0) +#define DO_TWOSIDE ((IND & INTEL_TWOSIDE_BIT) != 0) #define DO_FLAT 0 #define DO_TRI 1 #define DO_QUAD 1 diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c index 28604ea0d4b..07c64f83800 100644 --- a/src/mesa/drivers/dri/r200/r200_swtcl.c +++ b/src/mesa/drivers/dri/r200/r200_swtcl.c @@ -411,8 +411,8 @@ static struct { #define DO_FALLBACK 0 -#define DO_UNFILLED (IND & R200_UNFILLED_BIT) -#define DO_TWOSIDE (IND & R200_TWOSIDE_BIT) +#define DO_UNFILLED ((IND & R200_UNFILLED_BIT) != 0) +#define DO_TWOSIDE ((IND & R200_TWOSIDE_BIT) != 0) #define DO_FLAT 0 #define DO_OFFSET 0 #define DO_TRI 1 diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c index cb8c7b3a6ec..9a778506205 100644 --- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c +++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c @@ -67,11 +67,11 @@ static struct { _mesa_need_secondary_color(ctx)) #define DO_FOG ((IND & RADEON_CP_VC_FRMT_PKSPEC) && ctx->Fog.Enabled && \ (ctx->Fog.FogCoordinateSource == GL_FOG_COORD)) -#define DO_TEX0 (IND & RADEON_CP_VC_FRMT_ST0) -#define DO_TEX1 (IND & RADEON_CP_VC_FRMT_ST1) -#define DO_TEX2 (IND & RADEON_CP_VC_FRMT_ST2) -#define DO_PTEX (IND & RADEON_CP_VC_FRMT_Q0) -#define DO_NORM (IND & RADEON_CP_VC_FRMT_N0) +#define DO_TEX0 ((IND & RADEON_CP_VC_FRMT_ST0) != 0) +#define DO_TEX1 ((IND & RADEON_CP_VC_FRMT_ST1) != 0) +#define DO_TEX2 ((IND & RADEON_CP_VC_FRMT_ST2) != 0) +#define DO_PTEX ((IND & RADEON_CP_VC_FRMT_Q0) != 0) +#define DO_NORM ((IND & RADEON_CP_VC_FRMT_N0) != 0) #define DO_TEX3 0 diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c b/src/mesa/drivers/dri/radeon/radeon_swtcl.c index fae151a4eb8..abed7daab0d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c +++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.c @@ -536,8 +536,8 @@ static struct { #define DO_FALLBACK 0 #define DO_OFFSET 0 -#define DO_UNFILLED (IND & RADEON_UNFILLED_BIT) -#define DO_TWOSIDE (IND & RADEON_TWOSIDE_BIT) +#define DO_UNFILLED ((IND & RADEON_UNFILLED_BIT) != 0) +#define DO_TWOSIDE ((IND & RADEON_TWOSIDE_BIT) != 0) #define DO_FLAT 0 #define DO_TRI 1 #define DO_QUAD 1 -- 2.30.2