Mesa (10.6): Revert "i965: Advertise a line width of 40.0 on Cherryview and Skylake."

[Emil Velikov]

Module: Mesa
Branch: 10.6
Commit: 0639ada6753ca23b33ee34dbc8fc92c8b68b605e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0639ada6753ca23b33ee34dbc8fc92c8b68b605e

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Jun  9 09:20:58 2015 -0700

Revert "i965: Advertise a line width of 40.0 on Cherryview and Skylake."

This reverts commit f3b709c0ac073cd0ec90a3a0d91d1ee94668e043.

The "dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_4.
interpolation.lines_wide" test appears to be broken on Cherryview when
we expose line widths greater than 12.0.  I'm not sure why.

For now, just go back to the limits we used on older platforms.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90902
Acked-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 16658f426dbd81fcbc317b21ae9a3f7c9b6448fb)
Nominated-by: Mark Janes <mark.a.janes at intel.com>

---

 src/mesa/drivers/dri/i965/brw_context.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 492b62d..781a634 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -428,11 +428,7 @@ brw_initialize_context_constants(struct brw_context *brw)
 
    ctx->Const.MinLineWidth = 1.0;
    ctx->Const.MinLineWidthAA = 1.0;
-   if (brw->gen >= 9 || brw->is_cherryview) {
-      ctx->Const.MaxLineWidth = 40.0;
-      ctx->Const.MaxLineWidthAA = 40.0;
-      ctx->Const.LineWidthGranularity = 0.125;
-   } else if (brw->gen >= 6) {
+   if (brw->gen >= 6) {
       ctx->Const.MaxLineWidth = 7.375;
       ctx->Const.MaxLineWidthAA = 7.375;
       ctx->Const.LineWidthGranularity = 0.125;