From: Ian Romanick Date: Fri, 26 Aug 2011 16:54:40 +0000 (-0700) Subject: intel: Silence "warning: unused parameter ‘fb’" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=17fa6772d7e223f940dd8ec4e4f6cf8cab9a03c7;p=mesa.git intel: Silence "warning: unused parameter ‘fb’" The gl_framebuffer was not used in intel_draw_buffer, so remove it. Reviewed-by: Eric Anholt --- diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c index fccdcbd7303..8341cbf41e2 100644 --- a/src/mesa/drivers/dri/intel/intel_buffers.c +++ b/src/mesa/drivers/dri/intel/intel_buffers.c @@ -97,7 +97,7 @@ intelDrawBuffer(struct gl_context * ctx, GLenum mode) dri2InvalidateDrawable(intel->driContext->driDrawablePriv); } - intel_draw_buffer(ctx, ctx->DrawBuffer); + intel_draw_buffer(ctx); } diff --git a/src/mesa/drivers/dri/intel/intel_buffers.h b/src/mesa/drivers/dri/intel/intel_buffers.h index a7e77976497..896ec5ae9a0 100644 --- a/src/mesa/drivers/dri/intel/intel_buffers.h +++ b/src/mesa/drivers/dri/intel/intel_buffers.h @@ -43,7 +43,7 @@ extern struct intel_region *intel_drawbuf_region(struct intel_context *intel); extern void intel_check_front_buffer_rendering(struct intel_context *intel); static inline void -intel_draw_buffer(struct gl_context * ctx, struct gl_framebuffer *fb) +intel_draw_buffer(struct gl_context * ctx) { struct intel_context *intel = intel_context(ctx); diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index a05a9c3665a..165720fa107 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -409,7 +409,7 @@ intel_prepare_render(struct intel_context *intel) if (drawable && drawable->dri2.stamp != driContext->dri2.draw_stamp) { if (drawable->lastStamp != drawable->dri2.stamp) intel_update_renderbuffers(driContext, drawable); - intel_draw_buffer(&intel->ctx, intel->ctx.DrawBuffer); + intel_draw_buffer(&intel->ctx); driContext->dri2.draw_stamp = drawable->dri2.stamp; } @@ -980,7 +980,7 @@ intelMakeCurrent(__DRIcontext * driContextPriv, * is NULL at that point. We can't call _mesa_makecurrent() * first, since we need the buffer size for the initial * viewport. So just call intel_draw_buffer() again here. */ - intel_draw_buffer(&intel->ctx, intel->ctx.DrawBuffer); + intel_draw_buffer(&intel->ctx); } else { _mesa_make_current(NULL, NULL, NULL); diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index 22c5ac2d2fc..bd35ac5c1e7 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -448,7 +448,7 @@ intel_bind_framebuffer(struct gl_context * ctx, GLenum target, struct gl_framebuffer *fb, struct gl_framebuffer *fbread) { if (target == GL_FRAMEBUFFER_EXT || target == GL_DRAW_FRAMEBUFFER_EXT) { - intel_draw_buffer(ctx, fb); + intel_draw_buffer(ctx); } else { /* don't need to do anything if target == GL_READ_FRAMEBUFFER_EXT */ @@ -469,7 +469,7 @@ intel_framebuffer_renderbuffer(struct gl_context * ctx, intel_flush(ctx); _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb); - intel_draw_buffer(ctx, fb); + intel_draw_buffer(ctx); } static bool @@ -760,7 +760,7 @@ intel_render_texture(struct gl_context * ctx, } #endif /* update drawing region, etc */ - intel_draw_buffer(ctx, fb); + intel_draw_buffer(ctx); }