From 86250c7251b5652acc794a8b0efe2ad98cfec840 Mon Sep 17 00:00:00 2001
From: Hoe Hao Cheng <haochengho12907@gmail.com>
Date: Fri, 30 Jul 2021 16:59:21 +0800
Subject: [PATCH] zink: make codegen compatible with python 3.5

Fixes: f1432fd3 ("zink: generate extension infrastructure using a python script")
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12137>
---
 src/gallium/drivers/zink/zink_extensions.py | 38 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_extensions.py b/src/gallium/drivers/zink/zink_extensions.py
index bbc3b5a..52c7def 100644
--- a/src/gallium/drivers/zink/zink_extensions.py
+++ b/src/gallium/drivers/zink/zink_extensions.py
@@ -25,8 +25,8 @@ from xml.etree import ElementTree
 from typing import List,Tuple
 
 class Version:
-    device_version : Tuple[int, int, int] = (1,0,0)
-    struct_version : Tuple[int, int] = (1,0)
+    device_version = (1,0,0)
+    struct_version = (1,0)
 
     def __init__(self, version, struct=()):
         self.device_version = version
@@ -59,17 +59,17 @@ class Version:
                 + '_' + struct)
 
 class Extension:
-    name           : str       = None
-    alias          : str       = None
-    is_required    : bool      = False
-    is_nonstandard : bool      = False
-    enable_conds   : List[str] = None
-    core_since     : Version   = None
+    name           = None
+    alias          = None
+    is_required    = False
+    is_nonstandard = False
+    enable_conds   = None
+    core_since     = None
 
     # these are specific to zink_device_info.py:
-    has_properties : bool      = False
-    has_features   : bool      = False
-    guard          : bool      = False
+    has_properties = False
+    has_features   = False
+    guard          = False
 
     def __init__(self, name, alias="", required=False, nonstandard=False,
                  properties=False, features=False, conditions=None, guard=False,
@@ -143,16 +143,16 @@ Layer = Extension
 
 class ExtensionRegistryEntry:
     # type of extension - right now it's either "instance" or "device"
-    ext_type          : str       = ""
+    ext_type          = ""
     # the version in which the extension is promoted to core VK
-    promoted_in       : Version   = None
+    promoted_in       = None
     # functions added by the extension are referred to as "commands" in the registry
-    device_commands   : List[str] = None
-    pdevice_commands  : List[str] = None
-    instance_commands : List[str] = None
-    constants         : List[str] = None
-    features_struct   : str       = None
-    properties_struct : str       = None
+    device_commands   = None
+    pdevice_commands  = None
+    instance_commands = None
+    constants         = None
+    features_struct   = None
+    properties_struct = None
 
 class ExtensionRegistry:
     # key = extension name, value = registry entry
-- 
2.7.4