st/python: Always use softpipe as reference driver.
This commit is contained in:
parent
38afd1e445
commit
e011272fa3
|
@ -85,7 +85,7 @@ st_device_create(boolean hardware)
|
|||
if (hardware)
|
||||
screen = st_hardware_screen_create();
|
||||
else
|
||||
screen = st_software_screen_create();
|
||||
screen = st_software_screen_create("softpipe");
|
||||
|
||||
screen = trace_screen_create(screen);
|
||||
if (!screen)
|
||||
|
|
|
@ -208,5 +208,5 @@ st_hardware_screen_create(void)
|
|||
if(st_hardpipe_load())
|
||||
return pfnGetGalliumScreenMESA();
|
||||
else
|
||||
return st_software_screen_create();
|
||||
return st_software_screen_create(NULL);
|
||||
}
|
||||
|
|
|
@ -35,13 +35,14 @@
|
|||
|
||||
|
||||
struct pipe_screen *
|
||||
st_software_screen_create(void)
|
||||
st_software_screen_create(const char *driver)
|
||||
{
|
||||
struct sw_winsys *ws;
|
||||
const char *default_driver;
|
||||
const char *driver;
|
||||
struct pipe_screen *screen = NULL;
|
||||
|
||||
if (!driver) {
|
||||
const char *default_driver;
|
||||
|
||||
#if defined(HAVE_LLVMPIPE)
|
||||
default_driver = "llvmpipe";
|
||||
#elif defined(HAVE_SOFTPIPE)
|
||||
|
@ -50,12 +51,13 @@ st_software_screen_create(void)
|
|||
default_driver = "";
|
||||
#endif
|
||||
|
||||
driver = debug_get_option("GALLIUM_DRIVER", default_driver);
|
||||
}
|
||||
|
||||
ws = null_sw_create();
|
||||
if(!ws)
|
||||
return NULL;
|
||||
|
||||
driver = debug_get_option("GALLIUM_DRIVER", default_driver);
|
||||
|
||||
#ifdef HAVE_LLVMPIPE
|
||||
if (strcmp(driver, "llvmpipe") == 0) {
|
||||
screen = llvmpipe_create_screen(ws);
|
||||
|
@ -68,5 +70,9 @@ st_software_screen_create(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
if (!screen) {
|
||||
ws->destroy(ws);
|
||||
}
|
||||
|
||||
return screen;
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ struct pipe_screen *
|
|||
st_hardware_screen_create(void);
|
||||
|
||||
struct pipe_screen *
|
||||
st_software_screen_create(void);
|
||||
st_software_screen_create(const char *driver);
|
||||
|
||||
|
||||
#endif /* ST_WINSYS_H_ */
|
||||
|
|
Loading…
Reference in New Issue