From d1868166102f9d45e4aab10f64a832ff5b96a737 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 27 May 2022 17:28:02 -0400 Subject: zink: drop largePoints requirement this is not required by any version of GL, so don't pretend it's needed cc: mesa-stable Reviewed-by: Emma Anholt Part-of: (cherry picked from commit 4b5bb2131866d5ee24d2ee5bb3f890eb11bee6bd) --- .pick_status.json | 2 +- docs/drivers/zink.rst | 1 - src/gallium/drivers/zink/zink_screen.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e44f78b4d39..e5b2f6c47ca 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -604,7 +604,7 @@ "description": "zink: drop largePoints requirement", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "because_sha": null }, { diff --git a/docs/drivers/zink.rst b/docs/drivers/zink.rst index fa6849c219c..d6f73c1ef02 100644 --- a/docs/drivers/zink.rst +++ b/docs/drivers/zink.rst @@ -29,7 +29,6 @@ Here's a list of those requirements: * ``logicOp`` * ``fillModeNonSolid`` - * ``largePoints`` * ``alphaToOne`` * ``shaderClipDistance`` diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 910a22478b6..c5e6087d02f 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2015,7 +2015,6 @@ check_base_requirements(struct zink_screen *screen) { if (!screen->info.feats.features.logicOp || !screen->info.feats.features.fillModeNonSolid || - !screen->info.feats.features.largePoints || !screen->info.feats.features.shaderClipDistance || !(screen->info.feats12.scalarBlockLayout || screen->info.have_EXT_scalar_block_layout) || @@ -2030,7 +2029,6 @@ check_base_requirements(struct zink_screen *screen) fprintf(stderr, "%s ", #X) CHECK_OR_PRINT(feats.features.logicOp); CHECK_OR_PRINT(feats.features.fillModeNonSolid); - CHECK_OR_PRINT(feats.features.largePoints); CHECK_OR_PRINT(feats.features.shaderClipDistance); if (!screen->info.feats12.scalarBlockLayout && !screen->info.have_EXT_scalar_block_layout) printf("scalarBlockLayout OR EXT_scalar_block_layout "); -- cgit v1.2.1