377f19bdd3
- Update to 17.3.2
* Multiple fixes in the RADV Vulkan driver, workaround when using
slibtool and a GLSL workaround for various titles using Unreal
Engine 4.
- Drop upstreamed u_r600-Add-support-for-B5G5R5A1.patch
- Modify u_mesa-python3-only.patch to not break python 2.
OBS-URL: https://build.opensuse.org/request/show/563225
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=676
112 lines
3.7 KiB
Diff
112 lines
3.7 KiB
Diff
diff --git a/src/gallium/drivers/r600/egd_tables.py b/src/gallium/drivers/r600/egd_tables.py
|
|
index d7b78c7fb1..7bda44ce83 100644
|
|
--- a/src/gallium/drivers/r600/egd_tables.py
|
|
+++ b/src/gallium/drivers/r600/egd_tables.py
|
|
@@ -1,4 +1,4 @@
|
|
-
|
|
+#!/usr/bin/python3
|
|
CopyRight = '''
|
|
/*
|
|
* Copyright 2015 Advanced Micro Devices, Inc.
|
|
@@ -60,7 +60,7 @@ class StringTable:
|
|
"""
|
|
fragments = [
|
|
'"%s\\0" /* %s */' % (
|
|
- te[0].encode('string_escape'),
|
|
+ te[0].encode('unicode_escape'),
|
|
', '.join(str(idx) for idx in te[2])
|
|
)
|
|
for te in self.table
|
|
@@ -217,10 +217,10 @@ def write_tables(regs, packets):
|
|
strings = StringTable()
|
|
strings_offsets = IntTable("int")
|
|
|
|
- print '/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */'
|
|
- print
|
|
- print CopyRight.strip()
|
|
- print '''
|
|
+ print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */')
|
|
+ print('')
|
|
+ print(CopyRight.strip())
|
|
+ print('''
|
|
#ifndef EG_TABLES_H
|
|
#define EG_TABLES_H
|
|
|
|
@@ -242,20 +242,20 @@ struct eg_packet3 {
|
|
unsigned name_offset;
|
|
unsigned op;
|
|
};
|
|
-'''
|
|
+''')
|
|
|
|
- print 'static const struct eg_packet3 packet3_table[] = {'
|
|
+ print('static const struct eg_packet3 packet3_table[] = {')
|
|
for pkt in packets:
|
|
- print '\t{%s, %s},' % (strings.add(pkt[5:]), pkt)
|
|
- print '};'
|
|
- print
|
|
+ print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt))
|
|
+ print('};')
|
|
+ print('')
|
|
|
|
- print 'static const struct eg_field egd_fields_table[] = {'
|
|
+ print('static const struct eg_field egd_fields_table[] = {')
|
|
|
|
fields_idx = 0
|
|
for reg in regs:
|
|
if len(reg.fields) and reg.own_fields:
|
|
- print '\t/* %s */' % (fields_idx)
|
|
+ print('\t/* %s */' % (fields_idx))
|
|
|
|
reg.fields_idx = fields_idx
|
|
|
|
@@ -266,34 +266,34 @@ struct eg_packet3 {
|
|
while value[1] >= len(values_offsets):
|
|
values_offsets.append(-1)
|
|
values_offsets[value[1]] = strings.add(strip_prefix(value[0]))
|
|
- print '\t{%s, %s(~0u), %s, %s},' % (
|
|
+ print('\t{%s, %s(~0u), %s, %s},' % (
|
|
strings.add(field.name), field.s_name,
|
|
- len(values_offsets), strings_offsets.add(values_offsets))
|
|
+ len(values_offsets), strings_offsets.add(values_offsets)))
|
|
else:
|
|
- print '\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name)
|
|
+ print('\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name))
|
|
fields_idx += 1
|
|
|
|
- print '};'
|
|
- print
|
|
+ print('};')
|
|
+ print('')
|
|
|
|
- print 'static const struct eg_reg egd_reg_table[] = {'
|
|
+ print('static const struct eg_reg egd_reg_table[] = {')
|
|
for reg in regs:
|
|
if len(reg.fields):
|
|
- print '\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name,
|
|
- len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx)
|
|
+ print('\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name,
|
|
+ len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx))
|
|
else:
|
|
- print '\t{%s, %s},' % (strings.add(reg.name), reg.r_name)
|
|
- print '};'
|
|
- print
|
|
+ print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name))
|
|
+ print('};')
|
|
+ print('')
|
|
|
|
strings.emit(sys.stdout, "egd_strings")
|
|
|
|
- print
|
|
+ print('')
|
|
|
|
strings_offsets.emit(sys.stdout, "egd_strings_offsets")
|
|
|
|
- print
|
|
- print '#endif'
|
|
+ print('')
|
|
+ print('#endif')
|
|
|
|
|
|
def main():
|