summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2022-05-27 17:28:02 -0400
committerDylan Baker <dylan.c.baker@intel.com>2022-06-01 13:18:42 -0700
commitd1868166102f9d45e4aab10f64a832ff5b96a737 (patch)
tree261f9af685806c2382204a412fd12b8e0b8d8ca7
parent2d881b9907ec260d7ae2734c63b70806184a3a5d (diff)
downloadmesa-d1868166102f9d45e4aab10f64a832ff5b96a737.tar.gz
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 <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16758> (cherry picked from commit 4b5bb2131866d5ee24d2ee5bb3f890eb11bee6bd)
-rw-r--r--.pick_status.json2
-rw-r--r--docs/drivers/zink.rst1
-rw-r--r--src/gallium/drivers/zink/zink_screen.c2
3 files changed, 1 insertions, 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 ");