anv: Query the kernel for reset status

[mesa.git] / src / intel / vulkan / anv_entrypoints_gen.py

diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py
index 6b2d4220150678c5eb14a6ac3a5fef7bd245b554..1a7d75309c478f30d1aa5a275e4bfa1fcb1a995f 100644 (file)
--- a/src/intel/vulkan/anv_entrypoints_gen.py
+++ b/src/intel/vulkan/anv_entrypoints_gen.py
@@ -26,7 +26,7 @@ import argparse
 import functools
 import os
 import textwrap
-import xml.etree.ElementTree as et
+import xml.etree.cElementTree as et
 
 from mako.template import Template
 
@@ -35,6 +35,7 @@ MAX_API_VERSION = 1.0
 SUPPORTED_EXTENSIONS = [
     'VK_KHR_descriptor_update_template',
     'VK_KHR_get_physical_device_properties2',
+    'VK_KHR_incremental_present',
     'VK_KHR_maintenance1',
     'VK_KHR_push_descriptor',
     'VK_KHR_sampler_mirror_clamp_to_edge',
@@ -73,7 +74,6 @@ TEMPLATE_H = Template(textwrap.dedent("""\
        };
     };
 
-    void anv_set_dispatch_devinfo(const struct gen_device_info *info);
     % for type_, name, args, num, h, guard in entrypoints:
       % if guard is not None:
     #ifdef ${guard}
@@ -295,10 +295,7 @@ def get_entrypoints(doc, entrypoints_to_defines):
         shortname = fullname[2:]
         params = (''.join(p.itertext()) for p in command.findall('./param'))
         params = ', '.join(params)
-        if fullname in entrypoints_to_defines:
-            guard = entrypoints_to_defines[fullname]
-        else:
-            guard = None
+        guard = entrypoints_to_defines.get(fullname)
         entrypoints.append((type, shortname, params, index, cal_hash(fullname), guard))
         index += 1
 
@@ -308,13 +305,14 @@ def get_entrypoints(doc, entrypoints_to_defines):
 def get_entrypoints_defines(doc):
     """Maps entry points to extension defines."""
     entrypoints_to_defines = {}
-    extensions = doc.findall('./extensions/extension')
-    for extension in extensions:
-        define = extension.get('protect')
-        entrypoints = extension.findall('./require/command')
-        for entrypoint in entrypoints:
-            fullname = entrypoint.get('name')
+
+    for extension in doc.findall('./extensions/extension[@protect]'):
+        define = extension.attrib['protect']
+
+        for entrypoint in extension.findall('./require/command'):
+            fullname = entrypoint.attrib['name']
             entrypoints_to_defines[fullname] = define
+
     return entrypoints_to_defines