glsl: Handle continuation characters in preprocessor.

[mesa.git] / src / mesa / swrast / s_span.h

diff --git a/src/mesa/swrast/s_span.h b/src/mesa/swrast/s_span.h
index 585cce91ee97998b0f55ef1a9042b38bb23811d4..0eabae20e0344e6c5835554ded88d58b8bc6ac80 100644 (file)
--- a/src/mesa/swrast/s_span.h
+++ b/src/mesa/swrast/s_span.h
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.5
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,7 +28,6 @@
 #define S_SPAN_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 
@@ -107,6 +107,9 @@ typedef struct sw_span
    /** Number of fragments in the span */
    GLuint end;
 
+   /** for clipping left edge of spans */
+   GLuint leftClip;
+
    /** This flag indicates that mask[] array is effectively filled with ones */
    GLboolean writeAll;
 
@@ -159,15 +162,16 @@ typedef struct sw_span
 
 
 
-#define INIT_SPAN(S, PRIMITIVE, END, INTERP_MASK, ARRAY_MASK)  \
-do {                                                           \
-   (S).primitive = (PRIMITIVE);                                        \
-   (S).interpMask = (INTERP_MASK);                             \
-   (S).arrayMask = (ARRAY_MASK);                               \
-   (S).arrayAttribs = 0x0;                                     \
-   (S).end = (END);                                            \
-   (S).facing = 0;                                             \
-   (S).array = SWRAST_CONTEXT(ctx)->SpanArrays;                        \
+#define INIT_SPAN(S, PRIMITIVE)                        \
+do {                                           \
+   (S).primitive = (PRIMITIVE);                        \
+   (S).interpMask = 0x0;                       \
+   (S).arrayMask = 0x0;                                \
+   (S).arrayAttribs = 0x0;                     \
+   (S).end = 0;                                        \
+   (S).leftClip = 0;                           \
+   (S).facing = 0;                             \
+   (S).array = SWRAST_CONTEXT(ctx)->SpanArrays;        \
 } while (0)