summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/state_tracker/st_cb_clear.c2
-rw-r--r--src/mesa/state_tracker/st_cb_fbo.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index 492073e840..d584f0cafc 100644
--- 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 7336327330..2b9aa3e9d2 100644
--- 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);