From ea98df2a65ef356907ee7c5db9c4b352f6740031 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 28 Jun 2022 10:45:52 -0400 Subject: [PATCH] gallium: pipe_rasterizer_state::point_tri_clip -> point_line_tri_clip this is just a rename, no functional changes Reviewed-by: Erik Faye-Lund Reviewed-by: Roland Scheidegger Part-of: --- src/gallium/auxiliary/draw/draw_context.c | 2 +- src/gallium/auxiliary/util/u_dump_state.c | 2 +- src/gallium/drivers/llvmpipe/lp_setup.c | 6 +++--- src/gallium/drivers/llvmpipe/lp_setup_context.h | 2 +- src/gallium/frontends/d3d10umd/Rasterizer.cpp | 2 +- src/gallium/frontends/lavapipe/lvp_execute.c | 2 +- src/gallium/include/pipe/p_state.h | 2 +- src/mesa/state_tracker/st_atom_rasterizer.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c index 81ceefc..1f691ff 100644 --- a/src/gallium/auxiliary/draw/draw_context.c +++ b/src/gallium/auxiliary/draw/draw_context.c @@ -285,7 +285,7 @@ draw_update_clip_flags(struct draw_context *draw) draw->guard_band_points_xy = draw->guard_band_xy || (draw->driver.bypass_clip_points && (draw->rasterizer && - draw->rasterizer->point_tri_clip)); + draw->rasterizer->point_line_tri_clip)); } diff --git a/src/gallium/auxiliary/util/u_dump_state.c b/src/gallium/auxiliary/util/u_dump_state.c index 67446dc..b408005 100644 --- a/src/gallium/auxiliary/util/u_dump_state.c +++ b/src/gallium/auxiliary/util/u_dump_state.c @@ -356,7 +356,7 @@ util_dump_rasterizer_state(FILE *stream, const struct pipe_rasterizer_state *sta util_dump_member(stream, uint, state, sprite_coord_enable); util_dump_member(stream, bool, state, sprite_coord_mode); util_dump_member(stream, bool, state, point_quad_rasterization); - util_dump_member(stream, bool, state, point_tri_clip); + util_dump_member(stream, bool, state, point_line_tri_clip); util_dump_member(stream, bool, state, point_size_per_vertex); util_dump_member(stream, bool, state, multisample); util_dump_member(stream, bool, state, line_smooth); diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c index 0dec767..5c5b11e 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup.c +++ b/src/gallium/drivers/llvmpipe/lp_setup.c @@ -599,7 +599,7 @@ lp_setup_bind_rasterizer(struct lp_setup_context *setup, setup->point_size = rast->point_size; setup->sprite_coord_enable = rast->sprite_coord_enable; setup->sprite_coord_origin = rast->sprite_coord_mode; - setup->point_tri_clip = rast->point_tri_clip; + setup->point_line_tri_clip = rast->point_line_tri_clip; setup->point_size_per_vertex = rast->point_size_per_vertex; setup->legacy_points = !rast->point_quad_rasterization && !setup->multisample; } @@ -1386,7 +1386,7 @@ try_update_scene_state(struct lp_setup_context *setup) u_rect_possible_intersection(&setup->vpwh, &setup->draw_regions[0]); } - } else if (setup->point_tri_clip) { + } else if (setup->point_line_tri_clip) { /* * for d3d-style point clipping, we're going to need * the fake vp scissor too. Hence do the intersection with vp, @@ -1396,7 +1396,7 @@ try_update_scene_state(struct lp_setup_context *setup) * points are always single pixel). * (Also note that if we have permit_linear_rasterizer this will * cause large points to always get vp scissored, regardless the - * point_tri_clip setting.) + * point_line_tri_clip setting.) */ boolean need_vp_scissoring = !!memcmp(&setup->vpwh, &setup->framebuffer, diff --git a/src/gallium/drivers/llvmpipe/lp_setup_context.h b/src/gallium/drivers/llvmpipe/lp_setup_context.h index 8e4ae39..6bf8202 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup_context.h +++ b/src/gallium/drivers/llvmpipe/lp_setup_context.h @@ -102,7 +102,7 @@ struct lp_setup_context unsigned flatshade_first:1; unsigned ccw_is_frontface:1; unsigned scissor_test:1; - unsigned point_tri_clip:1; + unsigned point_line_tri_clip:1; unsigned point_size_per_vertex:1; unsigned legacy_points:1; unsigned rasterizer_discard:1; diff --git a/src/gallium/frontends/d3d10umd/Rasterizer.cpp b/src/gallium/frontends/d3d10umd/Rasterizer.cpp index 48c9f75..a0262da 100644 --- a/src/gallium/frontends/d3d10umd/Rasterizer.cpp +++ b/src/gallium/frontends/d3d10umd/Rasterizer.cpp @@ -230,7 +230,7 @@ CreateRasterizerState( state.point_quad_rasterization = 1; state.point_size = 1.0f; - state.point_tri_clip = 1; + state.point_line_tri_clip = 1; state.line_width = 1.0f; state.line_rectangular = 0; diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index fd10a4d..3c549ea 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -4545,7 +4545,7 @@ VkResult lvp_execute_cmds(struct lvp_device *device, state->dsa_dirty = true; state->rs_dirty = true; state->vp_dirty = true; - state->rs_state.point_tri_clip = true; + state->rs_state.point_line_tri_clip = true; state->rs_state.unclamped_fragment_depth_values = device->vk.enabled_extensions.EXT_depth_range_unrestricted; state->sample_mask_dirty = true; state->min_samples_dirty = true; diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 04a60f8..531a16b 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -109,7 +109,7 @@ struct pipe_rasterizer_state unsigned point_smooth:1; unsigned sprite_coord_mode:1; /**< PIPE_SPRITE_COORD_ */ unsigned point_quad_rasterization:1; /** points rasterized as quads or points */ - unsigned point_tri_clip:1; /** large points clipped as tris or points */ + unsigned point_line_tri_clip:1; /** large points/lines clipped as tris or points/lines */ unsigned point_size_per_vertex:1; /**< size computed in vertex shader */ unsigned multisample:1; /* XXX maybe more ms state in future */ unsigned no_ms_sample_mask_out:1; diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c index 497d118..f76991e 100644 --- a/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/src/mesa/state_tracker/st_atom_rasterizer.c @@ -222,7 +222,7 @@ st_update_rasterizer(struct st_context *st) raster->point_quad_rasterization = 1; - raster->point_tri_clip = _mesa_is_gles2(st->ctx); + raster->point_line_tri_clip = _mesa_is_gles2(st->ctx); } /* ST_NEW_VERTEX_PROGRAM -- 2.7.4