Module: Mesa Branch: master Commit: 6cbc5ac1c1204e08ad802d7d3b76fe8c88004e23 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cbc5ac1c1204e08ad802d7d3b76fe8c88004e23
Author: Dave Airlie <[email protected]> Date: Mon Mar 1 13:08:46 2021 +1000 lavapipe: expose a 1.0 vulkan API for now. lavapipe doesn't have all 1.1 features yet, just return the baseline 1.0 API always. Reviewed-By: Mike Blumenkrantz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9075> --- src/gallium/frontends/lavapipe/lvp_device.c | 10 +--------- src/gallium/targets/lavapipe/meson.build | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index affab34c0a0..4bc91a8d3b3 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -119,14 +119,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateInstance( assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO); - uint32_t client_version; - if (pCreateInfo->pApplicationInfo && - pCreateInfo->pApplicationInfo->apiVersion != 0) { - client_version = pCreateInfo->pApplicationInfo->apiVersion; - } else { - client_version = VK_API_VERSION_1_0; - } - if (pAllocator == NULL) pAllocator = &default_alloc; @@ -149,7 +141,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateInstance( return vk_error(instance, result); } - instance->apiVersion = client_version; + instance->apiVersion = LVP_API_VERSION; instance->physicalDeviceCount = -1; // _mesa_locale_init(); diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build index 164811833d4..65680dc82dc 100644 --- a/src/gallium/targets/lavapipe/meson.build +++ b/src/gallium/targets/lavapipe/meson.build @@ -32,7 +32,7 @@ lvp_icd = custom_target( output : 'lvp_icd.@[email protected]'.format(host_machine.cpu()), command : [ prog_python, '@INPUT0@', - '--api-version', '1.1', '--xml', '@INPUT1@', + '--api-version', '1.0', '--xml', '@INPUT1@', '--lib-path', join_paths(module_dir, icd_file_name), '--out', '@OUTPUT@', ], _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
