Mesa (staging/20.3): zink: make all xfb caps depend on extension

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 06fadeeda7b6d3e465959c16ae4c886319bb9aca
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=06fadeeda7b6d3e465959c16ae4c886319bb9aca

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Fri Jan 22 12:41:42 2021 +0100

zink: make all xfb caps depend on extension

Without this, we'll expose GL_ARB_transform_feedback2 and
GL_ARB_transform_feedback3 even without VK_EXT_transform_feedback,
because these caps are directly wired up without checking the pervious
extensions.

Fixes: e8ad52f7b0c ("zink: enable xfb extension in screen creation")
Reviewed-by: Hoe Hao Cheng <haochengho12907 at gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8640>
(cherry picked from commit 855370bb620663b5e451e08046e4ddb4b6429c0b)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8cccfd5d4b8..74dbd9169b6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -22,7 +22,7 @@
         "description": "zink: make all xfb caps depend on extension",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "e8ad52f7b0c603d28518b9b288a8d9d5862d2053"
     },
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 001da294c89..ff7a0d1cafe 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -152,7 +152,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       return screen->info.have_EXT_transform_feedback ? screen->info.tf_props.maxTransformFeedbackBuffers : 0;
    case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
    case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS:
-      return 1;
+      return screen->info.have_EXT_transform_feedback;
 
    case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
       return screen->info.props.limits.maxImageArrayLayers;