summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-11-09 16:49:44 +1000
committerMarge Bot <eric+marge@anholt.net>2020-11-11 08:14:44 +0000
commitd186766c08867d5447e32c427ff092612bd4ba92 (patch)
tree64edd91230685d80a9dfefd801434b11ba60d1ed
parent01c4bac36e767dc96aef87fa7445a34c7c8f9132 (diff)
llvmpipe: just use draw_regions in draw/line setup.
This fixes: dEQP-VK.draw.scissor* Cc: 20.3 <mesa-stable> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7499>
-rw-r--r--src/gallium/drivers/llvmpipe/lp_setup_line.c13
-rw-r--r--src/gallium/drivers/llvmpipe/lp_setup_tri.c13
2 files changed, 6 insertions, 20 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_line.c b/src/gallium/drivers/llvmpipe/lp_setup_line.c
index cc44b20c86c..d552e9519ce 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_line.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_line.c
@@ -597,16 +597,9 @@ try_setup_line( struct lp_setup_context *setup,
* Determine how many scissor planes we need, that is drop scissor
* edges if the bounding box of the tri is fully inside that edge.
*/
- if (setup->scissor_test) {
- /* why not just use draw_regions */
- scissor = &setup->scissors[viewport_index];
- scissor_planes_needed(s_planes, &bboxpos, scissor);
- nr_planes += s_planes[0] + s_planes[1] + s_planes[2] + s_planes[3];
- } else {
- scissor = &setup->draw_regions[viewport_index];
- scissor_planes_needed(s_planes, &bboxpos, scissor);
- nr_planes += s_planes[0] + s_planes[1] + s_planes[2] + s_planes[3];
- }
+ scissor = &setup->draw_regions[viewport_index];
+ scissor_planes_needed(s_planes, &bboxpos, scissor);
+ nr_planes += s_planes[0] + s_planes[1] + s_planes[2] + s_planes[3];
line = lp_setup_alloc_triangle(scene,
key->num_inputs,
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_tri.c b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
index 90a4ee3b364..68fece55ca7 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_tri.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
@@ -359,16 +359,9 @@ do_triangle_ccw(struct lp_setup_context *setup,
* Determine how many scissor planes we need, that is drop scissor
* edges if the bounding box of the tri is fully inside that edge.
*/
- if (setup->scissor_test) {
- /* why not just use draw_regions */
- scissor = &setup->scissors[viewport_index];
- scissor_planes_needed(s_planes, &bboxpos, scissor);
- nr_planes += s_planes[0] + s_planes[1] + s_planes[2] + s_planes[3];
- } else {
- scissor = &setup->draw_regions[viewport_index];
- scissor_planes_needed(s_planes, &bboxpos, scissor);
- nr_planes += s_planes[0] + s_planes[1] + s_planes[2] + s_planes[3];
- }
+ scissor = &setup->draw_regions[viewport_index];
+ scissor_planes_needed(s_planes, &bboxpos, scissor);
+ nr_planes += s_planes[0] + s_planes[1] + s_planes[2] + s_planes[3];
tri = lp_setup_alloc_triangle(scene,
key->num_inputs,