summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/softpipe/sp_quad_stipple.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2007-08-13 17:02:27 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2007-08-14 15:57:30 +0100
commit70af238b494ed1b6da4841c2065c33ee0f0f37c9 (patch)
treeeef1943724488fb620802718c21cfc6ae7c48d13 /src/mesa/pipe/softpipe/sp_quad_stipple.c
parentd16b4bc32a731cb6ae320e8c187af3bc751d4138 (diff)
Continue reducing dependencies on core mesa include files.
Mainly down to the support for legacy TNL processing now.
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_quad_stipple.c')
-rw-r--r--src/mesa/pipe/softpipe/sp_quad_stipple.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/pipe/softpipe/sp_quad_stipple.c b/src/mesa/pipe/softpipe/sp_quad_stipple.c
index 6e93bf81f1..cb127095d7 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stipple.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stipple.c
@@ -3,12 +3,11 @@
* quad polygon stipple stage
*/
-#include "glheader.h"
-#include "imports.h"
#include "sp_context.h"
#include "sp_headers.h"
#include "sp_quad.h"
#include "pipe/p_defines.h"
+#include "pipe/p_util.h"
/**
@@ -19,10 +18,10 @@ stipple_quad(struct quad_stage *qs, struct quad_header *quad)
{
if (quad->prim == PRIM_TRI) {
struct softpipe_context *softpipe = qs->softpipe;
- const GLint col0 = quad->x0 % 32;
- const GLint row0 = quad->y0 % 32;
- const GLuint stipple0 = softpipe->poly_stipple.stipple[row0];
- const GLuint stipple1 = softpipe->poly_stipple.stipple[row0 + 1];
+ const int col0 = quad->x0 % 32;
+ const int row0 = quad->y0 % 32;
+ const unsigned stipple0 = softpipe->poly_stipple.stipple[row0];
+ const unsigned stipple1 = softpipe->poly_stipple.stipple[row0 + 1];
/* XXX there may be a better way to lay out the stored stipple
* values to further simplify this computation.