fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: ZINK_USE_LAVAPIPE -> LIBGL_ALWAYS_SOFTWARE

Browse source 
this is a documented variable, so reuse it

Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15857>
This commit is contained in:
Mike Blumenkrantz 2022-04-11 10:39:05 -04:00 • committed by Marge Bot
parent 42ff02de14
commit d5ff82df38
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/zink/ci/gitlab-ci.yml
View file

@ -3,7 +3,7 @@
- .zink-rules
variables:
MESA_LOADER_DRIVER_OVERRIDE: "zink"
ZINK_USE_LAVAPIPE: "true"
LIBGL_ALWAYS_SOFTWARE: "true"
LVP_POISON_MEMORY: "1"
GPU_VERSION: zink-lvp
FLAKES_CHANNEL: "#zink-ci"

11
src/gallium/drivers/zink/zink_screen.c
View file

@ -1280,11 +1280,11 @@ choose_pdev(struct zink_screen *screen)
assert(pdev_count > 0);
VkPhysicalDeviceProperties *props = &screen->info.props;
bool cpu = debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
for (i = 0; i < pdev_count; ++i) {
vkGetPhysicalDeviceProperties(pdevs[i], props);
char *use_lavapipe = getenv("ZINK_USE_LAVAPIPE");
if (use_lavapipe) {
if (cpu) {
if (props->deviceType == VK_PHYSICAL_DEVICE_TYPE_CPU) {
screen->pdev = pdevs[i];
screen->info.device_version = props->apiVersion;
@ -1301,6 +1301,8 @@ choose_pdev(struct zink_screen *screen)
}
}
free(pdevs);
if (cpu && !screen->pdev)
return true;
/* runtime version is the lesser of the instance version and device version */
screen->vk_version = MIN2(screen->info.device_version, screen->instance_info.loader_version);
@ -2092,6 +2094,11 @@ init_driver_workarounds(struct zink_screen *screen)
static struct zink_screen *
zink_internal_create_screen(const struct pipe_screen_config *config)
{
if (getenv("ZINK_USE_LAVAPIPE")) {
mesa_loge("ZINK_USE_LAVAPIPE is obsolete. Use LIBGL_ALWAYS_SOFTWARE\n");
return NULL;
}
struct zink_screen *screen = rzalloc(NULL, struct zink_screen);
if (!screen)
return NULL;