Mesa (staging/22.0): zink: drop wideLines requirement
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jun 1 20:58:20 UTC 2022
Module: Mesa
Branch: staging/22.0
Commit: 2d881b9907ec260d7ae2734c63b70806184a3a5d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d881b9907ec260d7ae2734c63b70806184a3a5d
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Fri May 27 17:26:13 2022 -0400
zink: drop wideLines requirement
this is not a requirement for any version of GL, so don't pretend it's
a requirement
cc: mesa-stable
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16758>
(cherry picked from commit 63a9e0a98610199f6dc1f38cc6e44cbdeda62694)
---
.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 abad7ebb97e..e44f78b4d39 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -612,7 +612,7 @@
"description": "zink: drop wideLines 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 fea88bafda1..fa6849c219c 100644
--- a/docs/drivers/zink.rst
+++ b/docs/drivers/zink.rst
@@ -29,7 +29,6 @@ Here's a list of those requirements:
* ``logicOp``
* ``fillModeNonSolid``
- * ``wideLines``
* ``largePoints``
* ``alphaToOne``
* ``shaderClipDistance``
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 420869e17c9..910a22478b6 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.wideLines ||
!screen->info.feats.features.largePoints ||
!screen->info.feats.features.shaderClipDistance ||
!(screen->info.feats12.scalarBlockLayout ||
@@ -2031,7 +2030,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.wideLines);
CHECK_OR_PRINT(feats.features.largePoints);
CHECK_OR_PRINT(feats.features.shaderClipDistance);
if (!screen->info.feats12.scalarBlockLayout && !screen->info.have_EXT_scalar_block_layout)
More information about the mesa-commit
mailing list