added assertions, disable debug output

diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index 492073e8403a33fbeffba5312bbc1aab998b0dcb..d584f0cafcefecf8b774f1f46c244096ac61ec3d 100644 (file)
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -409,6 +409,8 @@ clear_depth_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 {
    struct st_renderbuffer *strb = st_renderbuffer(rb);
 
+   assert(strb->surface->format);
+
    if (!ctx->Scissor.Enabled &&
        !is_depth_stencil_format(strb->surface->format)) {
       /* clear whole depth buffer w/out masking */

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 733632733056711a2868538aaf4d181c4394cf95..2b9aa3e9d26a825a5fe57df96e4268f57d725368 100644 (file)
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -104,6 +104,7 @@ st_renderbuffer_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
       return GL_FALSE; /* out of memory, try s/w buffer? */
 
    ASSERT(strb->surface->region->buffer);
+   ASSERT(strb->surface->format);
 
    strb->Base.Width  = strb->surface->width  = width;
    strb->Base.Height = strb->surface->height = height;
@@ -319,8 +320,10 @@ st_render_texture(GLcontext *ctx,
                                          att->Zoffset);
    assert(strb->surface);
 
+   /*
    printf("RENDER TO TEXTURE obj=%p mt=%p surf=%p  %d x %d\n",
           att->Texture, mt, strb->surface, rb->Width, rb->Height);
+   */
 
    /* Invalidate buffer state so that the pipe's framebuffer state
     * gets updated.
@@ -344,7 +347,9 @@ st_finish_render_texture(GLcontext *ctx,
 
    ctx->st->pipe->flush(ctx->st->pipe, 0x0);
 
+   /*
    printf("FINISH RENDER TO TEXTURE surf=%p\n", strb->surface);
+   */
 
    pipe_surface_unreference(&strb->surface);