added missing \'s

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

diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index 63596083bcc752d6cb032f8222ffa761ba14e13c..03f6961001a7ce1cab87d26ece76eb23a600e971 100644 (file)
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -1,4 +1,4 @@
-/* $Id: s_context.h,v 1.6 2001/03/07 04:50:49 brianp Exp $ */
+/* $Id: s_context.h,v 1.10 2001/05/17 09:32:17 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -100,6 +100,10 @@ typedef void (*swrast_tri_func)( GLcontext *ctx, const SWvertex *,
 
 typedef struct
 {
+   /* Driver interface:
+    */
+   struct swrast_device_driver Driver;
+
    /* Configuration mechanisms to make software rasterizer match
     * characteristics of the hardware rasterizer (if present):
     */
@@ -110,7 +114,6 @@ typedef struct
     * _swrast_validate_derived():
     */
    GLuint _RasterMask;
-   GLboolean _MultiTextureEnabled;
    GLfloat _MinMagThresh[MAX_TEXTURE_UNITS];
    GLfloat _backface_sign;
    GLboolean _PreferPixelFog;
@@ -148,8 +151,8 @@ typedef struct
    swrast_line_func Line;
    swrast_tri_func Triangle;
 
-   /* Placeholders for when seperate specular (or secondary color) is
-    * enabled but texturing is not.  
+   /* Placeholders for when separate specular (or secondary color) is
+    * enabled but texturing is not.
     */
    swrast_point_func SpecPoint;
    swrast_line_func SpecLine;
@@ -170,6 +173,19 @@ _swrast_validate_derived( GLcontext *ctx );
 
 #define SWRAST_CONTEXT(ctx) ((SWcontext *)ctx->swrast_context)
 
+#define RENDER_START(SWctx, GLctx)                     \
+   do {                                                \
+      if ((SWctx)->Driver.SpanRenderStart) {           \
+         (*(SWctx)->Driver.SpanRenderStart)(GLctx);    \
+      }                                                \
+   } while (0)
+
+#define RENDER_FINISH(SWctx, GLctx)                    \
+   do {                                                \
+      if ((SWctx)->Driver.SpanRenderFinish) {          \
+         (*(SWctx)->Driver.SpanRenderFinish)(GLctx);   \
+      }                                                \
+   } while (0)
 
 
 #endif