Module: Mesa
Branch: staging/21.0
Commit: 20fd3fb938e0a5333c7af0331b0e076e878db6d9
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=20fd3fb938e0a5333c7af0331b0e076e878db6d9
Author: Erik Faye-Lund <erik.faye-l...@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 <haochengho12...@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkra...@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 999a913f421..9b36471a51d 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 8093bbe5b2f..6ce7a30e107 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -175,7 +175,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;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
