Mesa (main): util/drirc: make engine_versions an optional field

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 34f5407b8e05b00a2430861fad0302b7d89ce865
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=34f5407b8e05b00a2430861fad0302b7d89ce865

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue May 25 14:32:14 2021 +0200

util/drirc: make engine_versions an optional field

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10978>

---

 src/util/00-mesa-defaults.conf | 2 +-
 src/util/driconf_static.py     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 46cc886e386..b6911daf3de 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -45,7 +45,7 @@ TODO: document the other workarounds.
              (version 1 to 4 : "1:4") -->
 
    <!ATTLIST engine       engine_name_match CDATA #REQUIRED
-                          engine_versions CDATA #REQUIRED>
+                          engine_versions CDATA #IMPLIED>
 
    <!ELEMENT option       EMPTY>
    <!ATTLIST option       name CDATA #REQUIRED
diff --git a/src/util/driconf_static.py b/src/util/driconf_static.py
index 5a4c6d49adf..72eac1eaaa2 100644
--- a/src/util/driconf_static.py
+++ b/src/util/driconf_static.py
@@ -58,7 +58,7 @@ class Engine(object):
     def __init__(self, xml):
         self.cname = cname('engine')
         self.engine_name_match = xml.attrib['engine_name_match']
-        self.engine_versions = xml.attrib['engine_versions']
+        self.engine_versions = xml.attrib.get('engine_versions', None)
         self.options = []
 
         for option in xml.findall('option'):
@@ -156,7 +156,9 @@ static const struct driconf_option ${cname}[] = {
 static const struct driconf_engine ${device.cname}_engines[] = {
 %    for engine in device.engines:
     { .engine_name_match = "${engine.engine_name_match}",
+%        if engine.engine_versions:
       .engine_versions = "${engine.engine_versions}",
+%        endif
       .num_options = ${len(engine.options)},
       .options = ${engine.cname + '_options'},
     },