fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 05:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

virgl: link VA driver with build-id

Browse source 
Without a build-id the virgl VAAPI driver segfaults trying to access the
NULL returned by the build-id header retriever used for disk caches

Fixes: d6db4d2e08 ("virgl: Add simple disk cache")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19885>
(cherry picked from commit 16a66a67ef)
This commit is contained in:
Alex Denes 2022-11-20 19:33:50 +00:00 • committed by Dylan Baker
parent d44c08ce89
commit 7b4d0bdf37
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -22804,7 +22804,7 @@
"description": "virgl: link VA driver with build-id",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d6db4d2e08100b12fe6ac539f419768b3b412643",
"notes": null

4
src/gallium/targets/va/meson.build
View file

@ -62,7 +62,7 @@ if host_machine.system() == 'windows'
libva_gallium = shared_library(
'vaon12_drv_video',
'target.c',
link_args : [va_link_args, ld_args_gc_sections],
link_args : [va_link_args, ld_args_gc_sections, ld_args_build_id],
vs_module_defs : vaon12_def,
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_winsys_sw
@ -80,7 +80,7 @@ else
'gallium_drv_video',
'target.c',
gnu_symbol_visibility : 'hidden',
link_args : [va_link_args, ld_args_gc_sections],
link_args : [va_link_args, ld_args_gc_sections, ld_args_build_id],
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
],