summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl_dd
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2015-09-14 11:46:50 -0700
committerIan Romanick <ian.d.romanick@intel.com>2015-09-23 09:56:34 -0700
commitfad8d54de7e7f908cb0d06f0b54af8440e689928 (patch)
treecc75f70833fe0a81aff629caee7e41df42e861f6 /src/mesa/tnl_dd
parentd7bf7969b90f66ee614f2d2225f3a821d5396a89 (diff)
downloadexternal_mesa3d-fad8d54de7e7f908cb0d06f0b54af8440e689928.zip
external_mesa3d-fad8d54de7e7f908cb0d06f0b54af8440e689928.tar.gz
external_mesa3d-fad8d54de7e7f908cb0d06f0b54af8440e689928.tar.bz2
t_dd_dmatmp: Clean up improper code formatting from previous patch
No piglit regressions on i915 (G33) or radeon (Radeon 7500). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Cc: "10.6 11.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/tnl_dd')
-rw-r--r--src/mesa/tnl_dd/t_dd_dmatmp.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h
index 443ada4..b6f6e84 100644
--- a/src/mesa/tnl_dd/t_dd_dmatmp.h
+++ b/src/mesa/tnl_dd/t_dd_dmatmp.h
@@ -214,10 +214,7 @@ static void TAG(render_line_loop_verts)( struct gl_context *ctx,
INIT( GL_LINE_STRIP );
- if (flags & PRIM_BEGIN)
- j = 0;
- else
- j = 1;
+ j = (flags & PRIM_BEGIN) ? 0 : 1;
/* Ensure last vertex won't wrap buffers:
*/
@@ -234,7 +231,7 @@ static void TAG(render_line_loop_verts)( struct gl_context *ctx,
nr = MIN2( currentsz, count - j );
if (j + nr >= count &&
- 0 < count - 1 &&
+ count > 1 &&
(flags & PRIM_END))
{
void *tmp;
@@ -250,7 +247,7 @@ static void TAG(render_line_loop_verts)( struct gl_context *ctx,
}
}
- else if (1 < count && (flags & PRIM_END)) {
+ else if (count > 1 && (flags & PRIM_END)) {
void *tmp;
tmp = ALLOC_VERTS(2);
tmp = TAG(emit_verts)( ctx, start+1, 1, tmp );
@@ -798,10 +795,7 @@ static void TAG(render_line_loop_elts)( struct gl_context *ctx,
FLUSH();
ELT_INIT( GL_LINE_STRIP );
- if (flags & PRIM_BEGIN)
- j = 0;
- else
- j = 1;
+ j = (flags & PRIM_BEGIN) ? 0 : 1;
currentsz = GET_CURRENT_VB_MAX_ELTS();
if (currentsz < 8) {
@@ -818,7 +812,7 @@ static void TAG(render_line_loop_elts)( struct gl_context *ctx,
nr = MIN2( currentsz, count - j );
if (j + nr >= count &&
- 0 < count - 1 &&
+ count > 1 &&
(flags & PRIM_END))
{
void *tmp;
@@ -834,7 +828,7 @@ static void TAG(render_line_loop_elts)( struct gl_context *ctx,
}
}
- else if (1 < count && (flags & PRIM_END)) {
+ else if (count > 1 && (flags & PRIM_END)) {
void *tmp;
tmp = ALLOC_ELTS(2);
tmp = TAG(emit_elts)( ctx, elts+start+1, 1, tmp );