diff options
author | Brian Paul <[email protected]> | 2012-11-30 10:04:48 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2012-11-30 12:08:06 -0700 |
commit | c73245882c7ff1277b190b97f093f7b423a22f10 (patch) | |
tree | cc42fc6cc7cd175407d511e845f75c49383936fc /src/mesa/swrast | |
parent | ca3ed3e024864e91ca3cccc59fb96950e1d079b5 (diff) |
mesa: pass context parameter to gl_renderbuffer::Delete()
We sometimes need a rendering context when deleting renderbuffers.
Pass it explicitly instead of trying to grab a current context
(which might be NULL). The next patch will make use of this.
Note: this is a candidate for the stable branches.
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r-- | src/mesa/swrast/s_renderbuffer.c | 4 | ||||
-rw-r--r-- | src/mesa/swrast/s_texrender.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_renderbuffer.c b/src/mesa/swrast/s_renderbuffer.c index b1fb57823f4..282b2c482b1 100644 --- a/src/mesa/swrast/s_renderbuffer.c +++ b/src/mesa/swrast/s_renderbuffer.c @@ -164,13 +164,13 @@ soft_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, * Called via gl_renderbuffer::Delete() */ static void -soft_renderbuffer_delete(struct gl_renderbuffer *rb) +soft_renderbuffer_delete(struct gl_context *ctx, struct gl_renderbuffer *rb) { struct swrast_renderbuffer *srb = swrast_renderbuffer(rb); free(srb->Buffer); srb->Buffer = NULL; - _mesa_delete_renderbuffer(rb); + _mesa_delete_renderbuffer(ctx, rb); } diff --git a/src/mesa/swrast/s_texrender.c b/src/mesa/swrast/s_texrender.c index 140e4b50f71..7b25a7b7d81 100644 --- a/src/mesa/swrast/s_texrender.c +++ b/src/mesa/swrast/s_texrender.c @@ -16,7 +16,7 @@ static void -delete_texture_wrapper(struct gl_renderbuffer *rb) +delete_texture_wrapper(struct gl_context *ctx, struct gl_renderbuffer *rb) { ASSERT(rb->RefCount == 0); free(rb); |