From a5b0452400dd6c2fd2a0921584f6fcee915a8b62 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 10 May 2013 12:17:52 -0700 Subject: 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 --- src/mesa/drivers/dri/intel/intel_fbo.c | 4 +--- src/mesa/drivers/dri/nouveau/nouveau_fbo.c | 4 ++-- src/mesa/drivers/dri/radeon/radeon_fbo.c | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index bf8e48d779b..69f862930d6 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -617,11 +617,9 @@ intel_render_texture(struct gl_context * ctx, * Called by Mesa when rendering to a texture is done. */ static void -intel_finish_render_texture(struct gl_context * ctx, - struct gl_renderbuffer_attachment *att) +intel_finish_render_texture(struct gl_context * ctx, struct gl_renderbuffer *rb) { struct intel_context *intel = intel_context(ctx); - struct gl_renderbuffer *rb = att->Renderbuffer; DBG("Finish render %s texture\n", _mesa_get_format_name(rb->Format)); diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c index f997ac888f9..25543e458b4 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c @@ -263,9 +263,9 @@ nouveau_render_texture(struct gl_context *ctx, struct gl_framebuffer *fb, static void nouveau_finish_render_texture(struct gl_context *ctx, - struct gl_renderbuffer_attachment *att) + struct gl_renderbuffer *rb) { - texture_dirty(att->Texture); + texture_dirty(rb->TexImage->TexObject); } void diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c index 1fdcf056562..63bc7e8ab64 100644 --- a/src/mesa/drivers/dri/radeon/radeon_fbo.c +++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c @@ -850,10 +850,9 @@ radeon_render_texture(struct gl_context * ctx, } static void -radeon_finish_render_texture(struct gl_context * ctx, - struct gl_renderbuffer_attachment *att) +radeon_finish_render_texture(struct gl_context *ctx, struct gl_renderbuffer *rb) { - struct gl_texture_image *image = att->Renderbuffer->TexImage; + struct gl_texture_image *image = rb->TexImage; radeon_texture_image *radeon_image = (radeon_texture_image *)image; if (radeon_image) -- cgit v1.2.3