diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2022-12-06 16:16:08 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2022-12-14 20:47:01 +0000 |
| commit | 1fa232af41ac1bc42b830266cd427aeabda3c0f2 (patch) | |
| tree | c2f0aaac4bf111f648dbe8f3e1051730cbc1d109 | |
| parent | 0aecc2089005e842c3e01328224715a406a5b15d (diff) | |
| download | mesa-1fa232af41ac1bc42b830266cd427aeabda3c0f2.tar.gz | |
zink: don't use defunct custom-flag
We're no longer respecting this flag, so there's no need in setting it.
Fixes: 00dc0036bb6 ("zink: flatten out buffer creation usage flags codepath")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20183>
(cherry picked from commit 2ccf481c17ccded161b9eecb63a257d81056e3ec)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.pick_status.json b/.pick_status.json index 881bd689a50..b9ab3ff72d8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3190,7 +3190,7 @@ "description": "zink: don't use defunct custom-flag", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "00dc0036bb6d0c6de1ec3dc395e1d9e63d05ed83" }, diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 57da7503d86..650717c374c 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -3958,11 +3958,7 @@ zink_create_stream_output_target(struct pipe_context *pctx, if (!t) return NULL; - /* using PIPE_BIND_CUSTOM here lets us create a custom pipe buffer resource, - * which allows us to differentiate and use VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT - * as we must for this case - */ - t->counter_buffer = pipe_buffer_create(pctx->screen, PIPE_BIND_STREAM_OUTPUT | PIPE_BIND_CUSTOM, PIPE_USAGE_DEFAULT, 4); + t->counter_buffer = pipe_buffer_create(pctx->screen, PIPE_BIND_STREAM_OUTPUT, PIPE_USAGE_DEFAULT, 4); if (!t->counter_buffer) { FREE(t); return NULL; |