summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2008-03-09 18:30:07 -0600
committerBrian <[email protected]>2008-03-09 18:30:07 -0600
commit810e0549afad45469bef532c1f2d355f3fde0bbb (patch)
treef09ec1c15b500f49669b53f4091c97f7ceb5707f
parent29fbf72dbf158d766d3cac3b2db16d9fcbef0d0b (diff)
fix botched test for clearing color buffers (should fix depth peeling regression)
-rw-r--r--src/mesa/swrast/s_buffers.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c
index b74c4ab1c8c..0d1e9bac1c9 100644
--- a/src/mesa/swrast/s_buffers.c
+++ b/src/mesa/swrast/s_buffers.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 6.5.2
+ * Version: 7.1
*
- * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2008 Brian Paul 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"),
@@ -331,7 +331,8 @@ _swrast_Clear(GLcontext *ctx, GLbitfield buffers)
/* do software clearing here */
if (buffers) {
- if (buffers & ctx->DrawBuffer->_NumColorDrawBuffers > 0) {
+ if ((buffers & BUFFER_BITS_COLOR)
+ && (ctx->DrawBuffer->_NumColorDrawBuffers > 0)) {
clear_color_buffers(ctx);
}
if (buffers & BUFFER_BIT_DEPTH) {