diff options
author | Eric Anholt <[email protected]> | 2013-05-10 12:17:52 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2013-05-17 13:04:05 -0700 |
commit | a5b0452400dd6c2fd2a0921584f6fcee915a8b62 (patch) | |
tree | c5fcb6595066e70304bd2c32349947b0bbe7b5c8 /src/mesa/main | |
parent | e98c39c109f9b38d6bb97e3890382fdf66c25176 (diff) |
mesa: Make FinishRenderTexture just take the renderbuffer being finished.
Now that the rb has a reference to the teximage, we didn't need anything
else out of the attachment.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/dd.h | 2 | ||||
-rw-r--r-- | src/mesa/main/fbobject.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index adace3b70a9..13c7a83d4bb 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -625,7 +625,7 @@ struct dd_function_table { struct gl_framebuffer *fb, struct gl_renderbuffer_attachment *att); void (*FinishRenderTexture)(struct gl_context *ctx, - struct gl_renderbuffer_attachment *att); + struct gl_renderbuffer *rb); void (*ValidateFramebuffer)(struct gl_context *ctx, struct gl_framebuffer *fb); /*@}*/ diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 070fb8c5356..7c134212c91 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -327,7 +327,7 @@ _mesa_remove_attachment(struct gl_context *ctx, /* tell driver that we're done rendering to this texture. */ if (rb && rb->NeedsFinishRenderTexture) - ctx->Driver.FinishRenderTexture(ctx, att); + ctx->Driver.FinishRenderTexture(ctx, rb); if (att->Type == GL_TEXTURE) { ASSERT(att->Texture); @@ -410,7 +410,7 @@ _mesa_set_texture_attachment(struct gl_context *ctx, struct gl_renderbuffer *rb = att->Renderbuffer; if (rb && rb->NeedsFinishRenderTexture) - ctx->Driver.FinishRenderTexture(ctx, att); + ctx->Driver.FinishRenderTexture(ctx, rb); if (att->Texture == texObj) { /* re-attaching same texture */ @@ -1886,7 +1886,7 @@ check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb) struct gl_renderbuffer_attachment *att = fb->Attachment + i; struct gl_renderbuffer *rb = att->Renderbuffer; if (rb && rb->NeedsFinishRenderTexture) { - ctx->Driver.FinishRenderTexture(ctx, att); + ctx->Driver.FinishRenderTexture(ctx, rb); } } } |