From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 14 Sep 2015 19:46:21 +0000 (-0700)
Subject: t_dd_dmatmp: Require HAVE_LINES
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8461e03f01167a8bafe7fa9f12ff0ec246533b4;p=mesa.git

t_dd_dmatmp: Require HAVE_LINES

Two drivers use this file, and both support lines.

No piglit regressions on i915 (G33) or radeon (Radeon 7500).

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h
index dadbf21d54a..14dfa1d5659 100644
--- a/src/mesa/tnl_dd/t_dd_dmatmp.h
+++ b/src/mesa/tnl_dd/t_dd_dmatmp.h
@@ -39,8 +39,8 @@
  * tristrips, lineloops to linestrips), or to indexed vertices.
  */
 
-#if !defined(HAVE_TRIANGLES)
-#error "must have at least triangles to use render template"
+#if !defined(HAVE_TRIANGLES) || !HAVE_LINES
+#error "must have lines and triangles to use render template"
 #endif
 
 #if HAVE_QUAD_STRIPS || HAVE_QUADS
@@ -142,7 +142,6 @@ static void TAG(render_lines_verts)( struct gl_context *ctx,
 				     GLuint count,
 				     GLuint flags )
 {
-   if (HAVE_LINES) {
       LOCAL_VARS;
       int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
       int currentsz;
@@ -165,11 +164,6 @@ static void TAG(render_lines_verts)( struct gl_context *ctx,
          TAG(emit_verts)(ctx, start + j, nr, ALLOC_VERTS(nr));
 	 currentsz = dmasz;
       }
-
-   } else {
-      fprintf(stderr, "%s - cannot draw primitive\n", __func__);
-      return;
-   }
 }
 
 
@@ -673,7 +667,6 @@ static void TAG(render_lines_elts)( struct gl_context *ctx,
 				    GLuint count,
 				    GLuint flags )
 {
-   if (HAVE_LINES) {
       LOCAL_VARS;
       int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
       int currentsz;
@@ -698,10 +691,6 @@ static void TAG(render_lines_elts)( struct gl_context *ctx,
 	 FLUSH();
 	 currentsz = dmasz;
       }
-   } else {
-      fprintf(stderr, "%s - cannot draw primitive\n", __func__);
-      return;
-   }
 }
 
 
@@ -1122,7 +1111,7 @@ static GLboolean TAG(validate_render)( struct gl_context *ctx,
 	 ok = HAVE_POINTS;
 	 break;
       case GL_LINES:
-	 ok = HAVE_LINES && !ctx->Line.StippleFlag;
+	 ok = !ctx->Line.StippleFlag;
 	 break;
       case GL_LINE_STRIP:
 	 ok = HAVE_LINE_STRIPS && !ctx->Line.StippleFlag;