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

pipe-loader: fix driinfo for software and non-radeonsi drivers

Browse Source 
Fixes: 678dadf123 ("gallium: move driinfo XML to pipe_loader")
Reviewed-by: Thomas Hellström <thellstrom@vmware.com>
This commit is contained in:
Nicolai Hähnle
2017-08-02 11:38:32 +02:00
parent eceb671002
commit f45efb8129
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/pipe-loader/pipe_loader.c
View File

@@ -51,7 +51,9 @@ static int (*backends[])(struct pipe_loader_device **, int) = {
}; };
const char gallium_driinfo_xml[] = const char gallium_driinfo_xml[] =
DRI_CONF_BEGIN
#include "driinfo_gallium.h" #include "driinfo_gallium.h"
DRI_CONF_END
; ;
int int

8
src/gallium/state_trackers/dri/drisw.c
View File

@@ -400,12 +400,12 @@ drisw_init_screen(__DRIscreen * sPriv)
sPriv->driverPrivate = (void *)screen; sPriv->driverPrivate = (void *)screen;
sPriv->extensions = drisw_screen_extensions; sPriv->extensions = drisw_screen_extensions;
struct pipe_screen_config config; if (pipe_loader_sw_probe_dri(&screen->dev, &drisw_lf)) {
struct pipe_screen_config config;
config.flags = dri_init_options_get_screen_flags(screen);
config.flags = dri_init_options_get_screen_flags(screen);
if (pipe_loader_sw_probe_dri(&screen->dev, &drisw_lf))
pscreen = pipe_loader_create_screen(screen->dev, &config); pscreen = pipe_loader_create_screen(screen->dev, &config);
}
if (!pscreen) if (!pscreen)
goto fail; goto fail;