From 93ffbd4d69deb06a44fc13d89ae5f85cf40281ff Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sat, 30 Dec 2023 20:00:33 +0100 Subject: [PATCH] gallium/vl: remove stubs which are defined in mesa_util MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Signed-off-by: Karol Herbst Acked-by: Marek Olšák Reviewed-by: Christian Gmeiner Part-of: (cherry picked from commit 6c9c48a3ae16a72d02b928b4346a53c56e43d597) --- .pick_status.json | 2 +- src/gallium/auxiliary/vl/vl_stubs.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f1c2fb24f1c..6d86191187e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -934,7 +934,7 @@ "description": "gallium/vl: remove stubs which are defined in mesa_util", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/auxiliary/vl/vl_stubs.c b/src/gallium/auxiliary/vl/vl_stubs.c index 11573d33a36..cd6b73b850b 100644 --- a/src/gallium/auxiliary/vl/vl_stubs.c +++ b/src/gallium/auxiliary/vl/vl_stubs.c @@ -155,9 +155,3 @@ vl_create_mpeg12_decoder(struct pipe_context *pipe, assert(0); return NULL; } - -/* - * vl_zscan - */ -const int vl_zscan_normal[] = {0}; -const int vl_zscan_alternate[] = {0};