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: 5740ac3701
("xmlconfig: Add static driconfig support")
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14562>
This commit is contained in:
parent
fe0a6b9606
commit
d15021435e
|
@ -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-4: skip
|
||||||
spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-6: 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_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_shading_language_420pack/binding layout: fail
|
||||||
spec/arb_sparse_buffer/basic: skip
|
spec/arb_sparse_buffer/basic: skip
|
||||||
spec/arb_sparse_buffer/buffer-data: skip
|
spec/arb_sparse_buffer/buffer-data: skip
|
||||||
|
@ -4274,8 +4273,8 @@ wgl/wgl-sanity: skip
|
||||||
summary:
|
summary:
|
||||||
name: results
|
name: results
|
||||||
---- --------
|
---- --------
|
||||||
pass: 15882
|
pass: 15883
|
||||||
fail: 1208
|
fail: 1207
|
||||||
crash: 68
|
crash: 68
|
||||||
skip: 2977
|
skip: 2977
|
||||||
timeout: 0
|
timeout: 0
|
||||||
|
|
|
@ -46,6 +46,7 @@ class Application(object):
|
||||||
self.cname = cname('application')
|
self.cname = cname('application')
|
||||||
self.name = xml.attrib['name']
|
self.name = xml.attrib['name']
|
||||||
self.executable = xml.attrib.get('executable', None)
|
self.executable = xml.attrib.get('executable', None)
|
||||||
|
self.executable_regexp = xml.attrib.get('executable_regexp', None)
|
||||||
self.sha1 = xml.attrib.get('sha1', None)
|
self.sha1 = xml.attrib.get('sha1', None)
|
||||||
self.application_name_match = xml.attrib.get('application_name_match', None)
|
self.application_name_match = xml.attrib.get('application_name_match', None)
|
||||||
self.application_versions = xml.attrib.get('application_versions', None)
|
self.application_versions = xml.attrib.get('application_versions', None)
|
||||||
|
@ -118,6 +119,7 @@ struct driconf_option {
|
||||||
struct driconf_application {
|
struct driconf_application {
|
||||||
const char *name;
|
const char *name;
|
||||||
const char *executable;
|
const char *executable;
|
||||||
|
const char *executable_regexp;
|
||||||
const char *sha1;
|
const char *sha1;
|
||||||
const char *application_name_match;
|
const char *application_name_match;
|
||||||
const char *application_versions;
|
const char *application_versions;
|
||||||
|
@ -179,6 +181,9 @@ static const struct driconf_application ${device.cname}_applications[] = {
|
||||||
% if application.executable:
|
% if application.executable:
|
||||||
.executable = "${application.executable}",
|
.executable = "${application.executable}",
|
||||||
% endif
|
% endif
|
||||||
|
% if application.executable_regexp:
|
||||||
|
.executable_regexp = "${application.executable_regexp}",
|
||||||
|
% endif
|
||||||
% if application.sha1:
|
% if application.sha1:
|
||||||
.sha1 = "${application.sha1}",
|
.sha1 = "${application.sha1}",
|
||||||
% endif
|
% endif
|
||||||
|
|
|
@ -1123,6 +1123,8 @@ parseStaticConfig(struct OptConfData *data)
|
||||||
const char *appattr[] = {
|
const char *appattr[] = {
|
||||||
"name", a->name,
|
"name", a->name,
|
||||||
"executable", a->executable,
|
"executable", a->executable,
|
||||||
|
"executable_regexp", a->executable_regexp,
|
||||||
|
"sha1", a->sha1,
|
||||||
"application_name_match", a->application_name_match,
|
"application_name_match", a->application_name_match,
|
||||||
"application_versions", a->application_versions,
|
"application_versions", a->application_versions,
|
||||||
NULL
|
NULL
|
||||||
|
|
Loading…
Reference in New Issue