aux/draw: guard_band_points_xy -> guard_band_points_lines_xy

just a rename, no functional changes

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17284>

diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
index 1f691ff..6993574 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_context.c
+++ b/src/gallium/auxiliary/draw/draw_context.c
@@ -282,8 +282,8 @@ draw_update_clip_flags(struct draw_context *draw)
    draw->clip_user = draw->rasterizer &&
                      draw->rasterizer->clip_plane_enable != 0 &&
                      !window_space;
-   draw->guard_band_points_xy = draw->guard_band_xy ||
-                                (draw->driver.bypass_clip_points &&
+   draw->guard_band_points_lines_xy = draw->guard_band_xy ||
+                                (draw->driver.bypass_clip_points_lines &&
                                 (draw->rasterizer &&
                                  draw->rasterizer->point_line_tri_clip));
 }
@@ -322,24 +322,24 @@ void draw_set_rasterizer_state(struct draw_context *draw,
  * Some hardware can turn off clipping altogether - in particular any
  * hardware with a TNL unit can do its own clipping, even if it is
  * relying on the draw module for some other reason.
- * Setting bypass_clip_points to achieve d3d-style point clipping (the driver
+ * Setting bypass_clip_points_lines to achieve d3d-style point clipping (the driver
  * will need to do the "vp scissoring") _requires_ the driver to implement
  * wide points / point sprites itself (points will still be clipped if rasterizer
- * point_tri_clip isn't set). Only relevant if bypass_clip_xy isn't set.
+ * point_line_tri_clip isn't set). Only relevant if bypass_clip_xy isn't set.
  */
 void
 draw_set_driver_clipping(struct draw_context *draw,
                          boolean bypass_clip_xy,
                          boolean bypass_clip_z,
                          boolean guard_band_xy,
-                         boolean bypass_clip_points)
+                         boolean bypass_clip_points_lines)
 {
    draw_do_flush(draw, DRAW_FLUSH_STATE_CHANGE);
 
    draw->driver.bypass_clip_xy = bypass_clip_xy;
    draw->driver.bypass_clip_z = bypass_clip_z;
    draw->driver.guard_band_xy = guard_band_xy;
-   draw->driver.bypass_clip_points = bypass_clip_points;
+   draw->driver.bypass_clip_points_lines = bypass_clip_points_lines;
    draw_update_clip_flags(draw);
 }
 

diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h
index 44acf01..c5a76e7 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_context.h
+++ b/src/gallium/auxiliary/draw/draw_context.h
@@ -348,7 +348,7 @@ draw_set_driver_clipping(struct draw_context *draw,
                          boolean bypass_clip_xy,
                          boolean bypass_clip_z,
                          boolean guard_band_xy,
-                         boolean bypass_clip_points);
+                         boolean bypass_clip_points_lines);
 
 /*******************************************************************************
  * Draw statistics

diff --git a/src/gallium/auxiliary/draw/draw_pipe_clip.c b/src/gallium/auxiliary/draw/draw_pipe_clip.c
index b6b7b4f..dec59f8 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pipe_clip.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_clip.c
@@ -688,7 +688,7 @@ clip_point_guard_xy(struct draw_stage *stage, struct prim_header *header)
 static void
 clip_first_point(struct draw_stage *stage, struct prim_header *header)
 {
-   stage->point = stage->draw->guard_band_points_xy ? clip_point_guard_xy : clip_point;
+   stage->point = stage->draw->guard_band_points_lines_xy ? clip_point_guard_xy : clip_point;
    stage->point(stage, header);
 }
 

diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h
index 1780070..e69ae6f 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_private.h
+++ b/src/gallium/auxiliary/draw/draw_private.h
@@ -262,7 +262,7 @@ struct draw_context
       boolean bypass_clip_xy;
       boolean bypass_clip_z;
       boolean guard_band_xy;
-      boolean bypass_clip_points;
+      boolean bypass_clip_points_lines;
    } driver;
 
    boolean quads_always_flatshade_last;
@@ -277,7 +277,7 @@ struct draw_context
    boolean clip_z;
    boolean clip_user;
    boolean guard_band_xy;
-   boolean guard_band_points_xy;
+   boolean guard_band_points_lines_xy;
 
    boolean dump_vs;
 

diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
index 1fcddad..4991951 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
@@ -114,7 +114,7 @@ fetch_pipeline_prepare(struct draw_pt_middle_end *middle,
                            draw->clip_xy,
                            draw->clip_z,
                            draw->clip_user,
-                           point_clip ? draw->guard_band_points_xy :
+                           point_clip ? draw->guard_band_points_lines_xy :
                                         draw->guard_band_xy,
                            draw->bypass_viewport,
                            draw->rasterizer->clip_halfz,

diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
index 7cbb2e2..78777dc 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
@@ -299,7 +299,7 @@ llvm_middle_end_prepare(struct draw_pt_middle_end *middle,
                            draw->clip_xy,
                            draw->clip_z,
                            draw->clip_user,
-                           point_clip ? draw->guard_band_points_xy :
+                           point_clip ? draw->guard_band_points_lines_xy :
                                         draw->guard_band_xy,
                            draw->bypass_viewport,
                            draw->rasterizer->clip_halfz,