From: Eric Anholt <eric@anholt.net>
Date: Wed, 12 Jun 2013 03:24:41 +0000 (-0700)
Subject: i915: Use the current drawbuffer's depth for polygon offset scale.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dba46831b0887a3f76ad011a9653ed9d2fff570e;p=mesa.git

i915: Use the current drawbuffer's depth for polygon offset scale.

There's no reason to care about the window system visual's depth for
handling polygon offset in an FBO, and it could only lead to pain.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 7c60d8454fa..126094b591b 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -640,7 +640,7 @@ do {							\
 } while (0)
 
 
-#define DEPTH_SCALE intel->polygon_offset_scale
+#define DEPTH_SCALE (ctx->DrawBuffer->Visual.depthBits == 16 ? 1.0 : 2.0)
 #define UNFILLED_TRI unfilled_tri
 #define UNFILLED_QUAD unfilled_quad
 #define VERT_X(_v) _v->v.x