Stefan Dirsch
3214aee2ca
* src/freedreno/registers/gen_header.py: hopefully fixes aarch64 build - u_0001-intel-genxml-Drop-from-__future__-import-annotations.patch u_0002-intel-genxml-Add-a-untyped-OrderedDict-fallback-for-.patch python36-buildfix.patch * fixes build against python 3.6 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1252
77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
--- mesa-23.3.3/src/nouveau/nvidia-headers/class_parser.py.orig 2024-01-20 12:47:36.464476669 +0100
|
|
+++ mesa-23.3.3/src/nouveau/nvidia-headers/class_parser.py 2024-01-20 13:04:30.212851443 +0100
|
|
@@ -9,6 +9,16 @@
|
|
|
|
from mako.template import Template
|
|
|
|
+def removeprefix(s, prefix):
|
|
+ if s.startswith(prefix):
|
|
+ return s[len(prefix):]
|
|
+ return s
|
|
+
|
|
+def removesuffix(s, suffix):
|
|
+ if s.endswith(suffix):
|
|
+ return s[:-len(suffix)]
|
|
+ return s
|
|
+
|
|
METHOD_ARRAY_SIZES = {
|
|
'BIND_GROUP_CONSTANT_BUFFER' : 16,
|
|
'CALL_MME_DATA' : 256,
|
|
@@ -273,7 +283,7 @@
|
|
if ":" in list[2]:
|
|
state = 1
|
|
elif teststr in list[1]:
|
|
- curmthd.field_defs[curfield][list[1].removeprefix(teststr)] = list[2]
|
|
+ curmthd.field_defs[curfield][removeprefix(list[1], teststr)] = list[2]
|
|
else:
|
|
state = 1
|
|
|
|
@@ -283,7 +293,7 @@
|
|
if ("0x" in list[2]):
|
|
state = 1
|
|
else:
|
|
- field = list[1].removeprefix(teststr)
|
|
+ field = removeprefix(list[1], teststr)
|
|
bitfield = list[2].split(":")
|
|
curmthd.field_name_start[field] = bitfield[1]
|
|
curmthd.field_name_end[field] = bitfield[0]
|
|
@@ -304,13 +314,13 @@
|
|
is_array = 0
|
|
if (':' in list[2]):
|
|
continue
|
|
- name = list[1].removeprefix(teststr)
|
|
+ name = removeprefix(list[1], teststr)
|
|
if name.endswith("(i)"):
|
|
is_array = 1
|
|
- name = name.removesuffix("(i)")
|
|
+ name = removesuffix(name, "(i)")
|
|
if name.endswith("(j)"):
|
|
is_array = 1
|
|
- name = name.removesuffix("(j)")
|
|
+ name = removesuffix(name, "(j)")
|
|
x = method()
|
|
x.name = name
|
|
x.addr = list[2]
|
|
@@ -336,8 +346,8 @@
|
|
|
|
clheader = os.path.basename(args.in_h)
|
|
nvcl = clheader
|
|
- nvcl = nvcl.removeprefix("cl")
|
|
- nvcl = nvcl.removesuffix(".h")
|
|
+ nvcl = removeprefix(nvcl, "cl")
|
|
+ nvcl = removesuffix(nvcl, ".h")
|
|
nvcl = nvcl.upper()
|
|
nvcl = "NV" + nvcl
|
|
|
|
--- mesa-23.3.3/src/freedreno/registers/gen_header.py.orig 2024-01-20 14:01:30.261999839 +0100
|
|
+++ mesa-23.3.3/src/freedreno/registers/gen_header.py 2024-01-20 14:01:57.678558692 +0100
|
|
@@ -781,7 +781,7 @@ def main():
|
|
parser.add_argument('--rnn', type=str, required=True)
|
|
parser.add_argument('--xml', type=str, required=True)
|
|
|
|
- subparsers = parser.add_subparsers(required=True)
|
|
+ subparsers = parser.add_subparsers()
|
|
|
|
parser_c_defines = subparsers.add_parser('c-defines')
|
|
parser_c_defines.set_defaults(func=dump_c_defines)
|