From 49593205b980e95314b430e29d053056baad1d84 Mon Sep 17 00:00:00 2001 From: Sagar Ghuge Date: Mon, 14 Sep 2020 12:21:41 -0700 Subject: [PATCH] anv: Factor out dri option initialization code in separate function Signed-off-by: Sagar Ghuge Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_device.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 2b30f4c1177..c019703cd63 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -650,6 +650,19 @@ VkResult anv_EnumerateInstanceExtensionProperties( return vk_outarray_status(&out); } +static void +anv_init_dri_options(struct anv_instance *instance) +{ + driParseOptionInfo(&instance->available_dri_options, anv_dri_options, + ARRAY_SIZE(anv_dri_options)); + driParseConfigFiles(&instance->dri_options, + &instance->available_dri_options, 0, "anv", NULL, + instance->app_info.app_name, + instance->app_info.app_version, + instance->app_info.engine_name, + instance->app_info.engine_version); +} + VkResult anv_CreateInstance( const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, @@ -767,14 +780,7 @@ VkResult anv_CreateInstance( VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false)); - driParseOptionInfo(&instance->available_dri_options, anv_dri_options, - ARRAY_SIZE(anv_dri_options)); - driParseConfigFiles(&instance->dri_options, &instance->available_dri_options, - 0, "anv", NULL, - instance->app_info.app_name, - instance->app_info.app_version, - instance->app_info.engine_name, - instance->app_info.engine_version); + anv_init_dri_options(instance); *pInstance = anv_instance_to_handle(instance);