This gets rid of a couple of compiler warnings when building without GLAMOR_TRAPEZOID_SHADER defined.
Signed-off-by: Keith Packard <kei...@keithp.com> --- glamor/glamor_trapezoid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_trapezoid.c b/glamor/glamor_trapezoid.c index d61d11f..5b0e26d 100644 --- a/glamor/glamor_trapezoid.c +++ b/glamor/glamor_trapezoid.c @@ -48,6 +48,8 @@ _glamor_linefixedX(xLineFixed *l, xFixed y, Bool ceil) return l->p1.x + (xFixed) (ex / dy); } +#ifdef GLAMOR_TRAPEZOID_SHADER + static xFixed _glamor_linefixedY(xLineFixed *l, xFixed x, Bool ceil) { @@ -60,8 +62,6 @@ _glamor_linefixedY(xLineFixed *l, xFixed x, Bool ceil) return l->p1.y + (xFixed) (ey / dx); } -#ifdef GLAMOR_TRAPEZOID_SHADER - #define GLAMOR_VERTEX_TOP_BOTTOM (GLAMOR_VERTEX_SOURCE + 1) #define GLAMOR_VERTEX_LEFT_PARAM (GLAMOR_VERTEX_SOURCE + 2) #define GLAMOR_VERTEX_RIGHT_PARAM (GLAMOR_VERTEX_SOURCE + 3) @@ -1674,6 +1674,7 @@ _glamor_trapezoids(CARD8 op, } has_large_trapezoid = _glamor_trapezoid_bounds(ntrap, traps, &bounds); + (void) has_large_trapezoid; DEBUGF("The bounds for all traps is: bounds.x1 = %d, bounds.x2 = %d, " "bounds.y1 = %d, bounds.y2 = %d, ---- ntrap = %d\n", bounds.x1, bounds.x2, bounds.y1, bounds.y2, ntrap); -- 2.0.1 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel