From d15021435ed546de89668976bdbebc9f9ea200f4 Mon Sep 17 00:00:00 2001 From: Lepton Wu Date: Fri, 14 Jan 2022 09:57:42 -0800 Subject: [PATCH] driconf: Fix unhandled tags in static conf A rule with executable_regexp tag would match every executable without this fix and force_glsl_extensions_warn would be always set to true which breaks some dEQP tests. Fixes: 5740ac37014 ("xmlconfig: Add static driconfig support") Reviewed-by: Rob Clark Part-of: --- src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt | 5 ++--- src/util/driconf_static.py | 5 +++++ src/util/xmlconfig.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt index f3503e0774b..5cdad6f7ab0 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt @@ -2084,7 +2084,6 @@ spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-32: sk spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-4: skip spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-6: skip spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-8: skip -spec/arb_shading_language_420pack/active sampler conflict: fail spec/arb_shading_language_420pack/binding layout: fail spec/arb_sparse_buffer/basic: skip spec/arb_sparse_buffer/buffer-data: skip @@ -4274,8 +4273,8 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 15882 - fail: 1208 + pass: 15883 + fail: 1207 crash: 68 skip: 2977 timeout: 0 diff --git a/src/util/driconf_static.py b/src/util/driconf_static.py index cd03d17508f..3e62336d647 100644 --- a/src/util/driconf_static.py +++ b/src/util/driconf_static.py @@ -46,6 +46,7 @@ class Application(object): self.cname = cname('application') self.name = xml.attrib['name'] self.executable = xml.attrib.get('executable', None) + self.executable_regexp = xml.attrib.get('executable_regexp', None) self.sha1 = xml.attrib.get('sha1', None) self.application_name_match = xml.attrib.get('application_name_match', None) self.application_versions = xml.attrib.get('application_versions', None) @@ -118,6 +119,7 @@ struct driconf_option { struct driconf_application { const char *name; const char *executable; + const char *executable_regexp; const char *sha1; const char *application_name_match; const char *application_versions; @@ -179,6 +181,9 @@ static const struct driconf_application ${device.cname}_applications[] = { % if application.executable: .executable = "${application.executable}", % endif +% if application.executable_regexp: + .executable_regexp = "${application.executable_regexp}", +% endif % if application.sha1: .sha1 = "${application.sha1}", % endif diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c index 789684d23e3..d02e5d84677 100644 --- a/src/util/xmlconfig.c +++ b/src/util/xmlconfig.c @@ -1123,6 +1123,8 @@ parseStaticConfig(struct OptConfData *data) const char *appattr[] = { "name", a->name, "executable", a->executable, + "executable_regexp", a->executable_regexp, + "sha1", a->sha1, "application_name_match", a->application_name_match, "application_versions", a->application_versions, NULL