diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-09-27 17:06:28 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-10-04 14:54:25 -0700 |
| commit | 642b4d6b6e126101c2a41956ad16db423e52c4f1 (patch) | |
| tree | 7ccf4d05a8dc2d9f0b62b3101fc78a6d5525efc4 | |
| parent | 1ff57b2c14b629e1d542abb27f8506a4736c8a67 (diff) | |
| download | mesa-642b4d6b6e126101c2a41956ad16db423e52c4f1.tar.gz | |
pipe-loader: fix zink driinfo header path
this feels like a compiler bug, but somehow just specifying the
shorter path ends up with a broken/partial header include
Fixes: d760a9151b7 ("gallium: Learn about kopper")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18858>
(cherry picked from commit 8da9e65500819b2e430028b96b1f68c99f220bdd)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index b446a865c39..8a92b46ca62 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1282,7 +1282,7 @@ "description": "pipe-loader: fix zink driinfo header path", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d760a9151b73d1998fceff38fb1c642e4d77bf67" }, diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c index 2cf5c04614d..12bc7930557 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c @@ -404,7 +404,7 @@ pipe_loader_sw_get_driconf(struct pipe_loader_device *dev, unsigned *count) #if defined(HAVE_DRI) && defined(HAVE_ZINK) static const driOptionDescription zink_driconf[] = { - #include "zink/driinfo_zink.h" + #include "gallium/drivers/zink/driinfo_zink.h" }; static const struct driOptionDescription * |