driconf: Support selection by Vulkan applicationName.

This adds applicationName + version through like engineName.

Rationale: A game (World War Z) includes the store name in the
executable name, so has multiple executable names.

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6120>

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index fd28343638d6409c79581ec275558f2bf94bf7c8..0f40db2cceb468ae16012a2904401e49e42b4b4a 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -628,6 +628,8 @@ static void  radv_init_dri_options(struct radv_instance *instance)
        driParseConfigFiles(&instance->dri_options,
                            &instance->available_dri_options,
                            0, "radv", NULL,
+                           instance->applicationName,
+                           instance->applicationVersion,
                            instance->engineName,
                            instance->engineVersion);
 }
@@ -655,6 +657,11 @@ VkResult radv_CreateInstance(
        if (pCreateInfo->pApplicationInfo) {
                const VkApplicationInfo *app = pCreateInfo->pApplicationInfo;
 
+               instance->applicationName =
+                       vk_strdup(&instance->alloc, app->pApplicationName,
+                                 VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
+               instance->applicationVersion = app->applicationVersion;
+
                instance->engineName =
                        vk_strdup(&instance->alloc, app->pEngineName,
                                  VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
@@ -791,6 +798,7 @@ void radv_DestroyInstance(
        }
 
        vk_free(&instance->alloc, instance->engineName);
+       vk_free(&instance->alloc, instance->applicationName);
 
        VG(VALGRIND_DESTROY_MEMPOOL(instance));
 

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index f5a38b33392c6b47e742f3a4cd5957ff30ed661a..22235e530c11593000b279afbac12f5bc8d5434f 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -334,6 +334,8 @@ struct radv_instance {
 
        uint32_t                                    apiVersion;
 
+       char *                                      applicationName;
+       uint32_t                                    applicationVersion;
        char *                                      engineName;
        uint32_t                                    engineVersion;
 

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
index cfe6faddaf1e7110896b9e493281a0114dcc7848..ede92e50263f6baa456e325f6660fe2b240c4b04 100644 (file)
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
@@ -99,7 +99,7 @@ pipe_loader_load_options(struct pipe_loader_device *dev)
 
    driParseOptionInfo(&dev->option_info, xml_options);
    driParseConfigFiles(&dev->option_cache, &dev->option_info, 0,
-                       dev->driver_name, NULL, NULL, 0);
+                       dev->driver_name, NULL, NULL, 0, NULL, 0);
 }
 
 char *

diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c
index 41fa71a4349045b8767507e1203db38137e98f2d..fa6d7352241eeb97843491adb3d903367c80d11e 100644 (file)
--- a/src/gallium/targets/d3dadapter9/drm.c
+++ b/src/gallium/targets/d3dadapter9/drm.c
@@ -251,7 +251,7 @@ drm_create_adapter( int fd,
 
     driParseOptionInfo(&defaultInitOptions, __driConfigOptionsNine);
     driParseConfigFiles(&userInitOptions, &defaultInitOptions, 0,
-                        "nine", NULL, NULL, 0);
+                        "nine", NULL, NULL, 0, NULL, 0);
     if (driCheckOption(&userInitOptions, "throttle_value", DRI_INT)) {
         throttling_value_user = driQueryOptioni(&userInitOptions, "throttle_value");
         if (throttling_value_user == -1)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index bb2861860b493de7205ad28734cc09790619a3b5..d10567a939b79d860a501a0e2709953932467845 100644 (file)
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -776,6 +776,8 @@ VkResult anv_CreateInstance(
    driParseOptionInfo(&instance->available_dri_options, anv_dri_options_xml);
    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);
 

diff --git a/src/loader/loader.c b/src/loader/loader.c
index e0b08dfa6cb6046a39a052911ba2b638a360e718..38395c8b768f1bbd35807b9bb9bcba68cc5ec313 100644 (file)
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -195,7 +195,7 @@ static char *loader_get_dri_config_driver(int fd)
 
    driParseOptionInfo(&defaultInitOptions, __driConfigOptionsLoader);
    driParseConfigFiles(&userInitOptions, &defaultInitOptions, 0,
-                       "loader", kernel_driver, NULL, 0);
+                       "loader", kernel_driver, NULL, 0, NULL, 0);
    if (driCheckOption(&userInitOptions, "dri_driver", DRI_STRING)) {
       char *opt = driQueryOptionstr(&userInitOptions, "dri_driver");
       /* not an empty string */
@@ -217,7 +217,7 @@ static char *loader_get_dri_config_device_id(void)
 
    driParseOptionInfo(&defaultInitOptions, __driConfigOptionsLoader);
    driParseConfigFiles(&userInitOptions, &defaultInitOptions, 0,
-                       "loader", NULL, NULL, 0);
+                       "loader", NULL, NULL, 0, NULL, 0);
    if (driCheckOption(&userInitOptions, "device_id", DRI_STRING))
       prime = strdup(driQueryOptionstr(&userInitOptions, "device_id"));
    driDestroyOptionCache(&userInitOptions);

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 0d9290d15ae6de716d8be23509187047856dd963..ffc4bbd110347ceb1cce216b4f3e3e177712fe19 100644 (file)
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -150,7 +150,7 @@ driCreateNewScreen2(int scrn, int fd,
     /* Option parsing before ->InitScreen(), as some options apply there. */
     driParseOptionInfo(&psp->optionInfo, __dri2ConfigOptions);
     driParseConfigFiles(&psp->optionCache, &psp->optionInfo, psp->myNum,
-                        "dri2", NULL, NULL, 0);
+                        "dri2", NULL, NULL, 0, NULL, 0);
 
     *driver_configs = psp->driver->InitScreen(psp);
     if (*driver_configs == NULL) {

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index c9426db67b3823433450ed0fb05c95e5bde7af7e..09c2ee1e5ae94b2ebfa4d6dd13f3cd6a03bf510d 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -445,7 +445,7 @@ intelInitContext(struct intel_context *intel,
          0, sizeof(ctx->TextureFormatSupported));
 
    driParseConfigFiles(&intel->optionCache, &intelScreen->optionCache,
-                       sPriv->myNum, "i915", NULL, NULL, 0);
+                       sPriv->myNum, "i915", NULL, NULL, 0, NULL, 0);
    intel->maxBatchSize = 4096;
 
    /* Estimate the size of the mappable aperture into the GTT.  There's an

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index d254002c1a2d8a4e6cf5f186e9d771570d8fadb1..0320e72537e8307fa5960431d37fd27178aab4e6 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -862,7 +862,7 @@ brw_process_driconf_options(struct brw_context *brw)
    driOptionCache *options = &brw->optionCache;
    driParseConfigFiles(options, &brw->screen->optionCache,
                        brw->driContext->driScreenPriv->myNum,
-                       "i965", NULL, NULL, 0);
+                       "i965", NULL, NULL, 0, NULL, 0);
 
    if (INTEL_DEBUG & DEBUG_NO_HIZ) {
        brw->has_hiz = false;

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index a57adc9f6870f0a7f8f58ef47f475e553fc56229..77577ec0f4275e4d523b4b75486c75596529c3bf 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -2545,7 +2545,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
 
    driParseOptionInfo(&options, brw_config_options.xml);
    driParseConfigFiles(&screen->optionCache, &options, dri_screen->myNum,
-                       "i965", NULL, NULL, 0);
+                       "i965", NULL, NULL, 0, NULL, 0);
    driDestroyOptionCache(&options);
 
    screen->driScrnPriv = dri_screen;

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index ab0c6c9d38e8ddcb130d643d26c8e26305083741..68b6e60bdef6cbc8854d6b5454ba665b8a075403 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -216,7 +216,7 @@ GLboolean r200CreateContext( gl_api api,
     * the default textures.
     */
    driParseConfigFiles (&rmesa->radeon.optionCache, &screen->optionCache,
-                       screen->driScreen->myNum, "r200", NULL, NULL, 0);
+                       screen->driScreen->myNum, "r200", NULL, NULL, 0, NULL, 0);
    rmesa->radeon.initialMaxAnisotropy = driQueryOptionf(&rmesa->radeon.optionCache,
                                                        "def_max_anisotropy");
 

diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 5a1c01fdd0df751e899601d7e4aff85521399e96..3c809630524626b347be0b22f90e649195f8c5b3 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -182,7 +182,7 @@ r100CreateContext( gl_api api,
     * the default textures.
     */
    driParseConfigFiles (&rmesa->radeon.optionCache, &screen->optionCache,
-                       screen->driScreen->myNum, "radeon", NULL, NULL, 0);
+                       screen->driScreen->myNum, "radeon", NULL, NULL, 0, NULL, 0);
    rmesa->radeon.initialMaxAnisotropy = driQueryOptionf(&rmesa->radeon.optionCache,
                                                  "def_max_anisotropy");
 

diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 1452d4a5937739cad47ceb6a907085f9afbabf74..2a1dd8f26fee217e29b6e24adc2f2a0ec1405a98 100644 (file)
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -34,8 +34,10 @@ TODO: document the other workarounds.
    <!ATTLIST device       driver CDATA #IMPLIED>
    <!ELEMENT application  (option+)>
    <!ATTLIST application  name CDATA #REQUIRED
-                          executable CDATA #REQUIRED
-                          sha1 CDATA #IMPLIED>
+                          executable CDATA #IMPLIED
+                          sha1 CDATA #IMPLIED
+                          application_name_match CDATA #IMPLIED
+                          application_versions CDATA #IMPLIED>
    <!ELEMENT engine       (option+)>
 
    <!-- engine_name_match: A regexp matching the engine name -->

diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c
index 4ddad79e8bdebf983d175f1056c028191ee02777..a02e47e0ae57ab68f2666cf828939a07594a9dc9 100644 (file)
--- a/src/util/xmlconfig.c
+++ b/src/util/xmlconfig.c
@@ -715,7 +715,9 @@ struct OptConfData {
     const char *driverName, *execName;
     const char *kernelDriverName;
     const char *engineName;
+    const char *applicationName;
     uint32_t engineVersion;
+    uint32_t applicationVersion;
     uint32_t ignoringDevice;
     uint32_t ignoringApp;
     uint32_t inDriConf;
@@ -782,10 +784,20 @@ parseAppAttr(struct OptConfData *data, const XML_Char **attr)
     uint32_t i;
     const XML_Char *exec = NULL;
     const XML_Char *sha1 = NULL;
+    const XML_Char *application_name_match = NULL;
+    const XML_Char *application_versions = NULL;
+    driOptionInfo version_ranges = {
+       .type = DRI_INT,
+    };
+
     for (i = 0; attr[i]; i += 2) {
         if (!strcmp (attr[i], "name")) /* not needed here */;
         else if (!strcmp (attr[i], "executable")) exec = attr[i+1];
         else if (!strcmp (attr[i], "sha1")) sha1 = attr[i+1];
+        else if (!strcmp (attr[i], "application_name_match"))
+           application_name_match = attr[i+1];
+        else if (!strcmp (attr[i], "application_versions"))
+           application_versions = attr[i+1];
         else XML_WARNING("unknown application attribute: %s.", attr[i]);
     }
     if (exec && strcmp (exec, data->execName)) {
@@ -814,6 +826,20 @@ parseAppAttr(struct OptConfData *data, const XML_Char **attr)
                 data->ignoringApp = data->inApp;
             }
         }
+    } else if (application_name_match) {
+       regex_t re;
+
+       if (regcomp (&re, application_name_match, REG_EXTENDED|REG_NOSUB) == 0) {
+          if (regexec (&re, data->applicationName, 0, NULL, 0) == REG_NOMATCH)
+             data->ignoringApp = data->inApp;
+          regfree (&re);
+       } else
+          XML_WARNING ("Invalid application_name_match=\"%s\".", application_name_match);
+    }
+    if (application_versions) {
+       if (parseRanges (&version_ranges, application_versions) &&
+           !valueInRanges (&version_ranges, data->applicationVersion))
+          data->ignoringApp = data->inApp;
     }
 }
 
@@ -1103,6 +1129,7 @@ void
 driParseConfigFiles(driOptionCache *cache, const driOptionCache *info,
                     int screenNum, const char *driverName,
                     const char *kernelDriverName,
+                    const char *applicationName, uint32_t applicationVersion,
                     const char *engineName, uint32_t engineVersion)
 {
     char *home;
@@ -1114,6 +1141,8 @@ driParseConfigFiles(driOptionCache *cache, const driOptionCache *info,
     userData.screenNum = screenNum;
     userData.driverName = driverName;
     userData.kernelDriverName = kernelDriverName;
+    userData.applicationName = applicationName ? applicationName : "";
+    userData.applicationVersion = applicationVersion;
     userData.engineName = engineName ? engineName : "";
     userData.engineVersion = engineVersion;
     userData.execName = util_get_process_name();

diff --git a/src/util/xmlconfig.h b/src/util/xmlconfig.h
index 6cc3e8b59d785d32ee3270d8a93f57be56946b60..3ecd5188634509befb9783dc6777935a1aa889dd 100644 (file)
--- a/src/util/xmlconfig.h
+++ b/src/util/xmlconfig.h
@@ -104,10 +104,11 @@ void driParseOptionInfo (driOptionCache *info,
 /** \brief Initialize option cache from info and parse configuration files
  *
  * To be called in <driver>CreateContext. screenNum, driverName,
- * kernelDriverName and engineName select device sections. */
+ * kernelDriverName, applicationName and engineName select device sections. */
 void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info,
                          int screenNum, const char *driverName,
                          const char *kernelDriverName,
+                         const char *applicationName, uint32_t applicationVersion,
                          const char *engineName, uint32_t engineVersion);
 /** \brief Destroy option info
  *