OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kopper: print better error message if loader not detected

Browse Source 
silently failing on release builds is annoying

Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15851>
This commit is contained in:
Mike Blumenkrantz
2022-04-11 08:34:36 -04:00
committed by Marge Bot
parent cf1390e1b8
commit 48ae404b42
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/frontends/dri/kopper.c
View File

@@ -116,7 +116,12 @@ kopper_init_screen(__DRIscreen * sPriv)
struct kopper_screen *kscreen;
struct pipe_screen *pscreen = NULL;
assert(sPriv->kopper_loader);
if (!sPriv->kopper_loader) {
fprintf(stderr, "mesa: Kopper interface not found!\n"
" Ensure the versions of %s built with this version of Zink are\n"
" in your library path!\n", KOPPER_LIB_NAMES);
return NULL;
}
kscreen = CALLOC_STRUCT(kopper_screen);
if (!kscreen)
return NULL;

7
src/gallium/frontends/dri/meson.build
View File

@@ -45,11 +45,16 @@ if with_dri2
files_libdri += files('dri2.c')
endif
libdri_c_args = []
if with_gallium_zink
if get_option('glvnd')
libdri_c_args += '-DKOPPER_LIB_NAMES="libEGL_@0@ and libGLX_@0@"'.format(get_option('glvnd-vendor-name'))
else
libdri_c_args += '-DKOPPER_LIB_NAMES="libEGL and libGLX"'
endif
files_libdri += files('kopper.c')
endif
libdri_c_args = []
if with_gallium_softpipe
libdri_c_args += '-DGALLIUM_SOFTPIPE'
endif