Module: Mesa Branch: master Commit: 410f901beed8f6f041716396b1f27fd61518e231 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=410f901beed8f6f041716396b1f27fd61518e231
Author: Timothy Arceri <[email protected]> Date: Fri Apr 27 10:03:56 2018 +1000 mesa: drop the buffer mode param from the DrawBuffer driver function No drivers used it. Reviewed-by: Brian Paul <[email protected]> --- src/mesa/drivers/common/driverfuncs.c | 2 +- src/mesa/drivers/dri/i915/intel_buffers.c | 2 +- src/mesa/drivers/dri/i965/intel_buffers.c | 2 +- src/mesa/drivers/dri/nouveau/nouveau_state.c | 2 +- src/mesa/drivers/dri/radeon/radeon_common.c | 5 ++--- src/mesa/drivers/dri/radeon/radeon_common.h | 2 +- src/mesa/main/buffers.c | 4 ++-- src/mesa/main/dd.h | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index b7ac2b5b43..e783262773 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -306,5 +306,5 @@ _mesa_init_driver_state(struct gl_context *ctx) ctx->Stencil.ZPassFunc[1]); - ctx->Driver.DrawBuffer(ctx, ctx->Color.DrawBuffer[0]); + ctx->Driver.DrawBuffer(ctx); } diff --git a/src/mesa/drivers/dri/i915/intel_buffers.c b/src/mesa/drivers/dri/i915/intel_buffers.c index 386e032443..83d59edb6f 100644 --- a/src/mesa/drivers/dri/i915/intel_buffers.c +++ b/src/mesa/drivers/dri/i915/intel_buffers.c @@ -53,7 +53,7 @@ intel_check_front_buffer_rendering(struct intel_context *intel) } static void -intelDrawBuffer(struct gl_context * ctx, GLenum mode) +intelDrawBuffer(struct gl_context * ctx) { if (_mesa_is_front_buffer_drawing(ctx->DrawBuffer)) { struct intel_context *const intel = intel_context(ctx); diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c index fd522cc4f4..dae56e3362 100644 --- a/src/mesa/drivers/dri/i965/intel_buffers.c +++ b/src/mesa/drivers/dri/i965/intel_buffers.c @@ -33,7 +33,7 @@ #include "main/renderbuffer.h" static void -intelDrawBuffer(struct gl_context * ctx, GLenum mode) +intelDrawBuffer(struct gl_context *ctx) { if (_mesa_is_front_buffer_drawing(ctx->DrawBuffer)) { struct brw_context *const brw = brw_context(ctx); diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c index debbd38080..a05c8be854 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_state.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c @@ -115,7 +115,7 @@ nouveau_read_buffer(struct gl_context *ctx, GLenum buffer) } static void -nouveau_draw_buffer(struct gl_context *ctx, GLenum buffer) +nouveau_draw_buffer(struct gl_context *ctx) { nouveau_validate_framebuffer(ctx); context_dirty(ctx, FRAMEBUFFER); diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c index 61cbf599f8..a3bf00b09f 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.c +++ b/src/mesa/drivers/dri/radeon/radeon_common.c @@ -317,11 +317,10 @@ void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb) /** * Called via glDrawBuffer. */ -void radeonDrawBuffer( struct gl_context *ctx, GLenum mode ) +void radeonDrawBuffer(struct gl_context *ctx) { if (RADEON_DEBUG & RADEON_DRI) - fprintf(stderr, "%s %s\n", __func__, - _mesa_enum_to_string( mode )); + fprintf(stderr, "%s\n", __func__); if (_mesa_is_front_buffer_drawing(ctx->DrawBuffer)) { radeonContextPtr radeon = RADEON_CONTEXT(ctx); diff --git a/src/mesa/drivers/dri/radeon/radeon_common.h b/src/mesa/drivers/dri/radeon/radeon_common.h index ada4956066..a39b9360ef 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.h +++ b/src/mesa/drivers/dri/radeon/radeon_common.h @@ -21,7 +21,7 @@ void radeon_clear_tris(struct gl_context *ctx, GLbitfield mask); void radeon_window_moved(radeonContextPtr radeon); void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb); -void radeonDrawBuffer( struct gl_context *ctx, GLenum mode ); +void radeonDrawBuffer(struct gl_context *ctx); void radeonReadBuffer( struct gl_context *ctx, GLenum mode ); void radeon_viewport(struct gl_context *ctx); void radeon_fbo_init(struct radeon_context *radeon); diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index ba970d87da..bb856882da 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -305,7 +305,7 @@ draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, /* Call device driver function only if fb is the bound draw buffer */ if (fb == ctx->DrawBuffer) { if (ctx->Driver.DrawBuffer) - ctx->Driver.DrawBuffer(ctx, buffer); + ctx->Driver.DrawBuffer(ctx); if (ctx->Driver.DrawBufferAllocate) ctx->Driver.DrawBufferAllocate(ctx); } @@ -588,7 +588,7 @@ draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, GLsizei n, */ if (fb == ctx->DrawBuffer) { if (ctx->Driver.DrawBuffer) - ctx->Driver.DrawBuffer(ctx, n > 0 ? buffers[0] : GL_NONE); + ctx->Driver.DrawBuffer(ctx); if (ctx->Driver.DrawBufferAllocate) ctx->Driver.DrawBufferAllocate(ctx); } diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 5ee6902d3f..9f9606ac6b 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -611,7 +611,7 @@ struct dd_function_table { /** Specify mapping of depth values from NDC to window coordinates */ void (*DepthRange)(struct gl_context *ctx); /** Specify the current buffer for writing */ - void (*DrawBuffer)(struct gl_context *ctx, GLenum buffer); + void (*DrawBuffer)(struct gl_context *ctx); /** Used to allocated any buffers with on-demand creation */ void (*DrawBufferAllocate)(struct gl_context *ctx); /** Enable or disable server-side gl capabilities */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
