1 files changed, 9 insertions, 75 deletions

diff --git a/src/gallium/auxiliary/draw/draw_wide_prims.c b/src/gallium/auxiliary/draw/draw_wide_prims.c
index 655774b155..d6bff110b4 100644
--- a/src/gallium/auxiliary/draw/draw_wide_prims.c
+++ b/src/gallium/auxiliary/draw/draw_wide_prims.c
@@ -162,70 +162,6 @@ static void wide_line( struct draw_stage *stage,
 
 
 /**
- * Draw a wide line by drawing a quad, using geometry which will
- * fullfill GL's antialiased line requirements.
- */
-static void wide_line_aa(struct draw_stage *stage,
-                         struct prim_header *header)
-{
-   const struct wide_stage *wide = wide_stage(stage);
-   const float half_width = wide->half_line_width;
-   struct prim_header tri;
-   struct vertex_header *v[4];
-   float *pos;
-   float dx = header->v[1]->data[0][0] - header->v[0]->data[0][0];
-   float dy = header->v[1]->data[0][1] - header->v[0]->data[0][1];
-   const float len = (float) sqrt(dx * dx + dy * dy);
-   uint i;
-
-   dx = dx * half_width / len;
-   dy = dy * half_width / len;
-
-   /* allocate/dup new verts */
-   for (i = 0; i < 4; i++) {
-      v[i] = dup_vert(stage, header->v[i/2], i);
-   }
-
-   /*
-    * Quad for line from v0 to v1:
-    *
-    *  1                         3
-    *  +-------------------------+
-    *  |                         |
-    *  *v0                     v1*
-    *  |                         |
-    *  +-------------------------+
-    *  0                         2
-    */
-
-   pos = v[0]->data[0];
-   pos[0] += dy;
-   pos[1] -= dx;
-
-   pos = v[1]->data[0];
-   pos[0] -= dy;
-   pos[1] += dx;
-
-   pos = v[2]->data[0];
-   pos[0] += dy;
-   pos[1] -= dx;
-
-   pos = v[3]->data[0];
-   pos[0] -= dy;
-   pos[1] += dx;
-
-   tri.det = header->det;  /* only the sign matters */
-
-   tri.v[0] = v[2];  tri.v[1] = v[1];  tri.v[2] = v[0];
-   stage->next->tri( stage->next, &tri );
-
-   tri.v[0] = v[3];  tri.v[1] = v[1];  tri.v[2] = v[2];
-   stage->next->tri( stage->next, &tri );
-
-}
-
-
-/**
  * Set the vertex texcoords for sprite mode.
  * Coords may be left untouched or set to a right-side-up or upside-down
  * orientation.
@@ -283,8 +219,8 @@ static void wide_point( struct draw_stage *stage,
       half_size = wide->half_point_size;
    }
 
-   left_adj = -half_size + 0.25f;
-   right_adj = half_size + 0.25f;
+   left_adj = -half_size; /* + 0.25f;*/
+   right_adj = half_size; /* + 0.25f;*/
 
    pos0[0] += left_adj;
    pos0[1] -= half_size;
@@ -330,7 +266,8 @@ static void wide_first_point( struct draw_stage *stage,
 
    wide->half_point_size = 0.5f * draw->rasterizer->point_size;
 
-   if (draw->rasterizer->point_size != 1.0) {
+   /* XXX we won't know the real size if it's computed by the vertex shader! */
+   if (draw->rasterizer->point_size > draw->wide_point_threshold) {
       stage->point = wide_point;
    }
    else {
@@ -341,8 +278,8 @@ static void wide_first_point( struct draw_stage *stage,
       /* find vertex shader texcoord outputs */
       const struct draw_vertex_shader *vs = draw->vertex_shader;
       uint i, j = 0;
-      for (i = 0; i < vs->state->num_outputs; i++) {
-         if (vs->state->output_semantic_name[i] == TGSI_SEMANTIC_GENERIC) {
+      for (i = 0; i < vs->info.num_outputs; i++) {
+         if (vs->info.output_semantic_name[i] == TGSI_SEMANTIC_GENERIC) {
             wide->texcoord_slot[j] = i;
             wide->texcoord_mode[j] = draw->rasterizer->sprite_coord_mode[j];
             j++;
@@ -357,8 +294,8 @@ static void wide_first_point( struct draw_stage *stage,
       /* find PSIZ vertex output */
       const struct draw_vertex_shader *vs = draw->vertex_shader;
       uint i;
-      for (i = 0; i < vs->state->num_outputs; i++) {
-         if (vs->state->output_semantic_name[i] == TGSI_SEMANTIC_PSIZE) {
+      for (i = 0; i < vs->info.num_outputs; i++) {
+         if (vs->info.output_semantic_name[i] == TGSI_SEMANTIC_PSIZE) {
             wide->psize_slot = i;
             break;
          }
@@ -379,10 +316,7 @@ static void wide_first_line( struct draw_stage *stage,
    wide->half_line_width = 0.5f * draw->rasterizer->line_width;
 
    if (draw->rasterizer->line_width != 1.0) {
-      if (draw->rasterizer->line_smooth)
-         wide->stage.line = wide_line_aa;
-      else
-         wide->stage.line = wide_line;
+      wide->stage.line = wide_line;
    }
    else {
       wide->stage.line = passthrough_line;