Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / mesa / swrast / s_masking.c

diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c
index d9d06b45b05b05c1fe8e6327f2201fcbddc4baf0..c95587b204ce82cf4f8e1865cca23784057e3c54 100644 (file)
--- a/src/mesa/swrast/s_masking.c
+++ b/src/mesa/swrast/s_masking.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.2
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
@@ -47,8 +46,8 @@ _swrast_mask_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,
    const GLuint n = span->end;
    void *rbPixels;
 
-   ASSERT(n < SWRAST_MAX_WIDTH);
-   ASSERT(span->arrayMask & SPAN_RGBA);
+   assert(n < SWRAST_MAX_WIDTH);
+   assert(span->arrayMask & SPAN_RGBA);
 
    rbPixels = _swrast_get_dest_rgba(ctx, rb, span);