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

nouveau: call glsl_type_singleton_init_or_ref earlier

Browse source 
Fixes: 91029b7e87 ("nouveau: take glsl_type ref unconditionally")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27853>
(cherry picked from commit 1a4c2cba95)
This commit is contained in:
Karol Herbst 2024-02-28 17:42:57 +01:00 • committed by Eric Engestrom
parent b106553008
commit b71cae2608
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

@ -324,7 +324,7 @@
"description": "nouveau: call glsl_type_singleton_init_or_ref earlier",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "91029b7e87bba2a28aeb202cdf920d6ec6a70fa7",
"notes": null

4
src/gallium/drivers/nouveau/nouveau_screen.c
View file

@ -291,6 +291,8 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
void *data;
union nouveau_bo_config mm_config;
glsl_type_singleton_init_or_ref();
char *nv_dbg = getenv("NOUVEAU_MESA_DEBUG");
if (nv_dbg)
nouveau_mesa_debug = atoi(nv_dbg);
@ -442,8 +444,6 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
&mm_config);
screen->mm_VRAM = nouveau_mm_create(dev, NOUVEAU_BO_VRAM, &mm_config);
glsl_type_singleton_init_or_ref();
return 0;
err: