mesa: Branch 'master'

[Brian Paul]

 src/mesa/swrast/s_depth.c   |    2 +-
 src/mesa/swrast/s_stencil.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree b5e9b0e56231065f6324bbd3c2c35ca53b46ddf8 (from b1502588c4755fa9d3d7b4eabed6332575033037)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Apr 21 13:18:06 2007 -0600

    Remove the !rb->Data check that was added a few months ago.
    
    Was changed while debugging #7205.  Broke the shadowtext demo.  Revisit this
    if the problem w/ bug 7205 returns...

diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c
index dde2b1d..408174c 100644
--- a/src/mesa/swrast/s_depth.c
+++ b/src/mesa/swrast/s_depth.c
@@ -1350,7 +1350,7 @@ _swrast_clear_depth_buffer( GLcontext *c
    GLuint clearValue;
    GLint x, y, width, height;
 
-   if (!rb || !ctx->Depth.Mask || !rb->Data) {
+   if (!rb || !ctx->Depth.Mask) {
       /* no depth buffer, or writing to it is disabled */
       return;
    }
diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c
index 2b89848..89991fa 100644
--- a/src/mesa/swrast/s_stencil.c
+++ b/src/mesa/swrast/s_stencil.c
@@ -1152,7 +1152,7 @@ _swrast_clear_stencil_buffer( GLcontext 
    const GLuint stencilMax = (1 << stencilBits) - 1;
    GLint x, y, width, height;
 
-   if (!rb || mask == 0 || !rb->Data)
+   if (!rb || mask == 0)
       return;
 
    ASSERT(rb->DataType == GL_UNSIGNED_BYTE ||