From 4dcb1fff19383ae451f3228e55d3fc987a7ab46d Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 24 Apr 2019 16:42:25 +0100 Subject: [PATCH] anv: add support for driconf No option is supported yet, this is just the boilerplate. Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Eric Engestrom Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Lionel Landwerlin --- src/intel/vulkan/anv_device.c | 12 ++++++++++++ src/intel/vulkan/anv_private.h | 4 ++++ src/intel/vulkan/anv_wsi.c | 2 +- src/intel/vulkan/meson.build | 4 ++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 3497a01f900..3363c8fa791 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -40,6 +40,7 @@ #include "util/os_file.h" #include "util/u_atomic.h" #include "util/u_string.h" +#include "util/xmlpool.h" #include "git_sha1.h" #include "vk_util.h" #include "common/gen_defines.h" @@ -47,6 +48,10 @@ #include "genxml/gen7_pack.h" +static const char anv_dri_options_xml[] = +DRI_CONF_BEGIN +DRI_CONF_END; + /* This is probably far to big but it reflects the max size used for messages * in OpenGLs KHR_debug. */ @@ -770,6 +775,10 @@ VkResult anv_CreateInstance( VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false)); + driParseOptionInfo(&instance->available_dri_options, anv_dri_options_xml); + driParseConfigFiles(&instance->dri_options, &instance->available_dri_options, + 0, "anv", NULL); + *pInstance = anv_instance_to_handle(instance); return VK_SUCCESS; @@ -800,6 +809,9 @@ void anv_DestroyInstance( glsl_type_singleton_decref(); _mesa_locale_fini(); + driDestroyOptionCache(&instance->dri_options); + driDestroyOptionInfo(&instance->available_dri_options); + vk_free(&instance->alloc, instance); } diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 26ce4aa6ddf..fa40c71839a 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -57,6 +57,7 @@ #include "util/u_vector.h" #include "util/u_math.h" #include "util/vma.h" +#include "util/xmlconfig.h" #include "vk_alloc.h" #include "vk_debug_report.h" @@ -1009,6 +1010,9 @@ struct anv_instance { bool pipeline_cache_enabled; struct vk_debug_report_instance debug_report_callbacks; + + struct driOptionCache dri_options; + struct driOptionCache available_dri_options; }; VkResult anv_init_wsi(struct anv_physical_device *physical_device); diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index ba07bcef8b3..9edadb13d2d 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -50,7 +50,7 @@ anv_init_wsi(struct anv_physical_device *physical_device) anv_wsi_proc_addr, &physical_device->instance->alloc, physical_device->master_fd, - NULL); + &physical_device->instance->dri_options); if (result != VK_SUCCESS) return result; diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 87280d17318..86325beabea 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -179,7 +179,7 @@ libanv_common = static_library( ], include_directories : [ inc_common, inc_intel, inc_compiler, inc_include, - inc_vulkan_wsi, + inc_vulkan_wsi, inc_util, ], c_args : anv_flags, dependencies : anv_deps, @@ -197,7 +197,7 @@ libvulkan_intel = shared_library( ], dependencies : [ dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common, - idep_nir, idep_genxml, idep_vulkan_util, idep_mesautil, + idep_nir, idep_genxml, idep_vulkan_util, idep_mesautil, idep_xmlconfig, ], c_args : anv_flags, link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections], -- 2.30.2