diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-05 09:16:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-05 09:16:39 +0100 |
| commit | 52fc95bab22331376f6a7351fdc07f805bd67610 (patch) | |
| tree | d93c6fce43dab496004a97a4dfc8bb38e5da6f5a /mesalib/src/mesa/state_tracker | |
| parent | 6e1f3114a922dc8ac7c1ae0c20d64b8f7a0f5ef7 (diff) | |
| parent | e82692e521240c5f8592f9ce56c9d5b3d68870ec (diff) | |
| download | vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.tar.gz vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.tar.bz2 vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 5 dec 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_fbo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c index 04907c9f7..ae280bfa9 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c +++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c @@ -228,10 +228,10 @@ static void st_renderbuffer_delete(struct gl_context *ctx, struct gl_renderbuffer *rb) { struct st_renderbuffer *strb = st_renderbuffer(rb); - struct st_context *st = st_context(ctx); - struct pipe_context *pipe = st->pipe; - - pipe_surface_release(pipe, &strb->surface); + if (ctx) { + struct st_context *st = st_context(ctx); + pipe_surface_release(st->pipe, &strb->surface); + } pipe_resource_reference(&strb->texture, NULL); free(strb->data); _mesa_delete_renderbuffer(ctx, rb); |