From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 5 Nov 2013 22:34:03 +0000 (-0800)
Subject: i915: Remove spurious calls to DepthRange
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4fcdb75268fe844c60d9c53f0dfd38d7460dea00;p=mesa.git

i915: Remove spurious calls to DepthRange

For both i830 and i915, the driver DepthRange function just calls
intelCalcViewport.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index f988a834ad8..f8749a53f9a 100644
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -832,16 +832,12 @@ i830_update_draw_buffer(struct intel_context *intel)
                                fb->_NumColorDrawBuffers);
    intel->NewGLState |= _NEW_BUFFERS;
 
-   /* update viewport since it depends on window size */
-   intelCalcViewport(ctx);
-
    /* Set state we know depends on drawable parameters:
     */
+   intelCalcViewport(ctx);
    ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
 		       ctx->Scissor.Width, ctx->Scissor.Height);
 
-   ctx->Driver.DepthRange(ctx, ctx->Viewport.Near, ctx->Viewport.Far);
-
    /* Update culling direction which changes depending on the
     * orientation of the buffer:
     */
diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 3368fe43f2e..755d32291ea 100644
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -806,14 +806,11 @@ i915_update_draw_buffer(struct intel_context *intel)
                                fb->_NumColorDrawBuffers);
    intel->NewGLState |= _NEW_BUFFERS;
 
-   /* update viewport since it depends on window size */
-   intelCalcViewport(ctx);
-
    /* Set state we know depends on drawable parameters:
     */
+   intelCalcViewport(ctx);
    ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
 		       ctx->Scissor.Width, ctx->Scissor.Height);
-   ctx->Driver.DepthRange(ctx, ctx->Viewport.Near, ctx->Viewport.Far);
 
    /* Update culling direction which changes depending on the
     * orientation of the buffer: