fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 02:10:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gallium: fix unused symbols warnings

Browse source 
fixes: d760a915

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15840>
(cherry picked from commit 4c1cb62999)
This commit is contained in:
Michel Zou 2022-04-10 09:51:52 +02:00 • committed by Dylan Baker
parent f48a3cffe7
commit ff76add805
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1579,7 +1579,7 @@
"description": "gallium: fix unused symbols warnings",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d760a9151b73d1998fceff38fb1c642e4d77bf67"
},

12
src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
View file

@ -58,7 +58,7 @@ struct pipe_loader_sw_device {
#define pipe_loader_sw_device(dev) ((struct pipe_loader_sw_device *)dev)
static const struct pipe_loader_ops pipe_loader_sw_ops;
#ifdef HAVE_ZINK
#if defined(HAVE_PIPE_LOADER_DRI) && defined(HAVE_ZINK)
static const struct pipe_loader_ops pipe_loader_vk_ops;
#endif
@ -93,16 +93,14 @@ static const struct sw_driver_descriptor driver_descriptors = {
};
#endif
#if defined(GALLIUM_STATIC_TARGETS) && defined(HAVE_ZINK)
#if defined(GALLIUM_STATIC_TARGETS) && defined(HAVE_ZINK) && defined(HAVE_PIPE_LOADER_DRI)
static const struct sw_driver_descriptor kopper_driver_descriptors = {
.create_screen = sw_screen_create_zink,
.winsys = {
#ifdef HAVE_PIPE_LOADER_DRI
{
.name = "dri",
.create_winsys = dri_create_sw_winsys,
},
#endif
#ifdef HAVE_PIPE_LOADER_KMS
{
.name = "kms_dri",
@ -158,7 +156,7 @@ pipe_loader_sw_probe_init_common(struct pipe_loader_sw_device *sdev)
return true;
}
#ifdef HAVE_ZINK
#if defined(HAVE_PIPE_LOADER_DRI) && defined(HAVE_ZINK)
static bool
pipe_loader_vk_probe_init_common(struct pipe_loader_sw_device *sdev)
{
@ -404,7 +402,7 @@ pipe_loader_sw_get_driconf(struct pipe_loader_device *dev, unsigned *count)
return NULL;
}
#ifdef HAVE_ZINK
#if defined(HAVE_PIPE_LOADER_DRI) && defined(HAVE_ZINK)
static const driOptionDescription zink_driconf[] = {
#include "zink/driinfo_zink.h"
};
@ -437,7 +435,7 @@ static const struct pipe_loader_ops pipe_loader_sw_ops = {
.release = pipe_loader_sw_release
};
#ifdef HAVE_ZINK
#if defined(HAVE_PIPE_LOADER_DRI) && defined(HAVE_ZINK)
static const struct pipe_loader_ops pipe_loader_vk_ops = {
.create_screen = pipe_loader_sw_create_screen,
.get_driconf = pipe_loader_vk_get_driconf,