projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/swrast: replace instances of _mesa_little_endian with preprocessor
[mesa.git]
/
src
/
mesa
/
swrast
/
s_lines.c
diff --git
a/src/mesa/swrast/s_lines.c
b/src/mesa/swrast/s_lines.c
index 72c41369bb9a139be5a990b4ca5143992c9c9ce2..ab8da7db289c9fbae9e8f3ce0b75fc40b833045b 100644
(file)
--- a/
src/mesa/swrast/s_lines.c
+++ b/
src/mesa/swrast/s_lines.c
@@
-1,6
+1,5
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 7.1
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
@@
-26,7
+25,6
@@
#include "main/glheader.h"
#include "main/context.h"
#include "main/glheader.h"
#include "main/context.h"
-#include "main/colormac.h"
#include "main/macros.h"
#include "s_aaline.h"
#include "s_context.h"
#include "main/macros.h"
#include "s_aaline.h"
#include "s_context.h"
@@
-68,7
+66,7
@@
draw_wide_line( struct gl_context *ctx, SWspan *span, GLboolean xMajor )
ctx->Const.MaxLineWidth);
GLint start;
ctx->Const.MaxLineWidth);
GLint start;
-
ASSERT
(span->end < SWRAST_MAX_WIDTH);
+
assert
(span->end < SWRAST_MAX_WIDTH);
if (width & 1)
start = width / 2;
if (width & 1)
start = width / 2;
@@
-234,7
+232,7
@@
_swrast_choose_line( struct gl_context *ctx )
if (ctx->Line.SmoothFlag) {
/* antialiased lines */
_swrast_choose_aa_line_function(ctx);
if (ctx->Line.SmoothFlag) {
/* antialiased lines */
_swrast_choose_aa_line_function(ctx);
-
ASSERT
(swrast->Line);
+
assert
(swrast->Line);
}
else if (ctx->Texture._EnabledCoordUnits
|| _swrast_use_fragment_program(ctx)
}
else if (ctx->Texture._EnabledCoordUnits
|| _swrast_use_fragment_program(ctx)
@@
-243,7
+241,7
@@
_swrast_choose_line( struct gl_context *ctx )
USE(general_line);
}
else if (ctx->Depth.Test
USE(general_line);
}
else if (ctx->Depth.Test
- || ctx->Line.Width != 1.0
+ || ctx->Line.Width != 1.0
F
|| ctx->Line.StippleFlag) {
/* no texture, but Z, fog, width>1, stipple, etc. */
#if CHAN_BITS == 32
|| ctx->Line.StippleFlag) {
/* no texture, but Z, fog, width>1, stipple, etc. */
#if CHAN_BITS == 32
@@
-253,8
+251,8
@@
_swrast_choose_line( struct gl_context *ctx )
#endif
}
else {
#endif
}
else {
-
ASSERT
(!ctx->Depth.Test);
-
ASSERT(ctx->Line.Width == 1.0
);
+
assert
(!ctx->Depth.Test);
+
assert(ctx->Line.Width == 1.0F
);
/* simple lines */
USE(simple_no_z_rgba_line);
}
/* simple lines */
USE(simple_no_z_rgba_line);
}
@@
-263,7
+261,7
@@
_swrast_choose_line( struct gl_context *ctx )
USE(_swrast_feedback_line);
}
else {
USE(_swrast_feedback_line);
}
else {
-
ASSERT
(ctx->RenderMode == GL_SELECT);
+
assert
(ctx->RenderMode == GL_SELECT);
USE(_swrast_select_line);
}
}
USE(_swrast_select_line);
}
}