draw: disable point/line smoothing for multisample (v2)

[mesa.git] / src / gallium / auxiliary / draw / draw_pipe_validate.c

diff --git a/src/gallium/auxiliary/draw/draw_pipe_validate.c b/src/gallium/auxiliary/draw/draw_pipe_validate.c
index 940ca5644deb3dd401353fde25a9f70e6975f0fc..3c5afaf29a809987a042b79f44d0e0067661e588 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pipe_validate.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_validate.c
@@ -77,7 +77,7 @@ draw_need_pipeline(const struct draw_context *draw,
          return TRUE;
 
       /* AA lines */
-      if (rasterizer->line_smooth && draw->pipeline.aaline)
+      if ((!rasterizer->multisample && rasterizer->line_smooth) && draw->pipeline.aaline)
          return TRUE;
 
       if (draw_current_shader_num_written_culldistances(draw))
@@ -94,7 +94,7 @@ draw_need_pipeline(const struct draw_context *draw,
          return TRUE;
 
       /* AA points */
-      if (rasterizer->point_smooth && draw->pipeline.aapoint)
+      if ((!rasterizer->multisample && rasterizer->point_smooth) && draw->pipeline.aapoint)
          return TRUE;
 
       /* point sprites */
@@ -162,12 +162,12 @@ static struct draw_stage *validate_pipeline( struct draw_stage *stage )
    /* drawing wide, non-AA lines? */
    wide_lines = rast->line_width != 1.0f &&
                 roundf(rast->line_width) > draw->pipeline.wide_line_threshold &&
-                !rast->line_smooth;
+                (!rast->line_smooth || rast->multisample);
 
    /* drawing large/sprite points (but not AA points)? */
    if (rast->sprite_coord_enable && draw->pipeline.point_sprite)
       wide_points = TRUE;
-   else if (rast->point_smooth && draw->pipeline.aapoint)
+   else if ((!rast->multisample && rast->point_smooth) && draw->pipeline.aapoint)
       wide_points = FALSE;
    else if (rast->point_size > draw->pipeline.wide_point_threshold)
       wide_points = TRUE;
@@ -183,13 +183,13 @@ static struct draw_stage *validate_pipeline( struct draw_stage *stage )
     * shorter pipelines for lines & points.
     */
 
-   if (rast->line_smooth && draw->pipeline.aaline) {
+   if ((!rast->multisample && rast->line_smooth) && draw->pipeline.aaline) {
       draw->pipeline.aaline->next = next;
       next = draw->pipeline.aaline;
       precalc_flat = TRUE;
    }
 
-   if (rast->point_smooth && draw->pipeline.aapoint) {
+   if ((!rast->multisample && rast->point_smooth) && draw->pipeline.aapoint) {
       draw->pipeline.aapoint->next = next;
       next = draw->pipeline.aapoint;
    }