From 6dbab6b2bb29e3b0595762920ef17e2ae5a9bf3a Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 5 Nov 2013 14:16:05 -0800 Subject: [PATCH] mesa: Eliminate parameters to dd_function_table::DepthRange No driver uses them. They will just be annoying in future patches. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i915/i830_state.c | 2 +- src/mesa/drivers/dri/i915/i915_state.c | 2 +- src/mesa/drivers/dri/r200/r200_state.c | 3 +-- src/mesa/drivers/dri/radeon/radeon_common.c | 4 +--- src/mesa/drivers/dri/radeon/radeon_state.c | 3 +-- src/mesa/main/dd.h | 2 +- src/mesa/main/viewport.c | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/dri/i915/i830_state.c b/src/mesa/drivers/dri/i915/i830_state.c index bbf0cefe148..cf850588aad 100644 --- a/src/mesa/drivers/dri/i915/i830_state.c +++ b/src/mesa/drivers/dri/i915/i830_state.c @@ -453,7 +453,7 @@ i830DepthMask(struct gl_context * ctx, GLboolean flag) /** Called from ctx->Driver.DepthRange() */ static void -i830DepthRange(struct gl_context * ctx, GLclampd nearval, GLclampd farval) +i830DepthRange(struct gl_context *ctx) { intelCalcViewport(ctx); } diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index fedafece6af..f867f12ed69 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -426,7 +426,7 @@ intelCalcViewport(struct gl_context * ctx) /** Called from ctx->Driver.DepthRange() */ static void -i915DepthRange(struct gl_context * ctx, GLclampd nearval, GLclampd farval) +i915DepthRange(struct gl_context *ctx) { intelCalcViewport(ctx); } diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 05222876656..4a7d6942680 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1611,8 +1611,7 @@ static void r200Viewport(struct gl_context *ctx) radeon_viewport(ctx); } -static void r200DepthRange( struct gl_context *ctx, GLclampd nearval, - GLclampd farval ) +static void r200DepthRange(struct gl_context *ctx) { r200UpdateWindow( ctx ); } diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c index d083e5b0214..a5d363fc71b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.c +++ b/src/mesa/drivers/dri/radeon/radeon_common.c @@ -325,9 +325,7 @@ void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb) radeon->NewGLState |= _NEW_SCISSOR; if (ctx->Driver.DepthRange) - ctx->Driver.DepthRange(ctx, - ctx->Viewport.Near, - ctx->Viewport.Far); + ctx->Driver.DepthRange(ctx); /* Update culling direction which changes depending on the * orientation of the buffer: diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index 160f3969d75..09386d99e40 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -1394,8 +1394,7 @@ static void radeonViewport(struct gl_context *ctx) radeon_viewport(ctx); } -static void radeonDepthRange( struct gl_context *ctx, GLclampd nearval, - GLclampd farval ) +static void radeonDepthRange(struct gl_context *ctx) { radeonUpdateWindow( ctx ); } diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index e77b67ed7d7..e1e6e144340 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -485,7 +485,7 @@ struct dd_function_table { /** Enable or disable writing into the depth buffer */ void (*DepthMask)(struct gl_context *ctx, GLboolean flag); /** Specify mapping of depth values from NDC to window coordinates */ - void (*DepthRange)(struct gl_context *ctx, GLclampd nearval, GLclampd farval); + void (*DepthRange)(struct gl_context *ctx); /** Specify the current buffer for writing */ void (*DrawBuffer)( struct gl_context *ctx, GLenum buffer ); /** Specify the buffers for writing for fragment programs*/ diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c index 7ea1d5f63a5..3aaab2d4659 100644 --- a/src/mesa/main/viewport.c +++ b/src/mesa/main/viewport.c @@ -143,7 +143,7 @@ _mesa_DepthRange(GLclampd nearval, GLclampd farval) #endif if (ctx->Driver.DepthRange) { - ctx->Driver.DepthRange(ctx, nearval, farval); + ctx->Driver.DepthRange(ctx); } } -- 2.30.2