Run ruff format against the whole source tree

Only two files that needed changes anyway, might as well enforce this.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2327>
(cherry picked from commit 6aa23cf642)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2026-09-17 10:14:12 +10:00 • committed by Enrico Weigelt
commit c3b028aee8

View file

@ -29,71 +29,74 @@ from reg import *
# Default input / log files
errFilename = None
diagFilename = 'diag.txt'
regFilename = 'gl.xml'
outFilename = 'gen_gl_wrappers.c'
diagFilename = "diag.txt"
regFilename = "gl.xml"
outFilename = "gen_gl_wrappers.c"
protect=True
prefix="gl"
preresolve=False
wrapper=False
shim=False
thunk=False
thunkdefs=False
staticwrappers=False
nodebug=False
protect = True
prefix = "gl"
preresolve = False
wrapper = False
shim = False
thunk = False
thunkdefs = False
staticwrappers = False
nodebug = False
# list of WGL extension functions we use
used_wgl_ext_fns = {key: 1 for key in [
"wglSwapIntervalEXT",
"wglGetExtensionsStringARB",
"wglDestroyPbufferARB",
"wglGetPbufferDCARB",
"wglReleasePbufferDCARB",
"wglCreatePbufferARB",
"wglMakeContextCurrentARB",
"wglChoosePixelFormatARB",
"wglGetPixelFormatAttribivARB",
"wglGetPixelFormatAttribivARB"
]}
used_wgl_ext_fns = {
key: 1
for key in [
"wglSwapIntervalEXT",
"wglGetExtensionsStringARB",
"wglDestroyPbufferARB",
"wglGetPbufferDCARB",
"wglReleasePbufferDCARB",
"wglCreatePbufferARB",
"wglMakeContextCurrentARB",
"wglChoosePixelFormatARB",
"wglGetPixelFormatAttribivARB",
"wglGetPixelFormatAttribivARB",
]
}
if __name__ == '__main__':
if __name__ == "__main__":
i = 1
while (i < len(sys.argv)):
while i < len(sys.argv):
arg = sys.argv[i]
i = i + 1
if (arg == '-noprotect'):
print('Disabling inclusion protection in output headers', file=sys.stderr)
if arg == "-noprotect":
print("Disabling inclusion protection in output headers", file=sys.stderr)
protect = False
elif (arg == '-registry'):
elif arg == "-registry":
regFilename = sys.argv[i]
i = i+1
print('Using registry', regFilename, file=sys.stderr)
elif (arg == '-outfile'):
i = i + 1
print("Using registry", regFilename, file=sys.stderr)
elif arg == "-outfile":
outFilename = sys.argv[i]
i = i+1
elif (arg == '-preresolve'):
preresolve=True
elif (arg == '-wrapper'):
wrapper=True
elif (arg == '-shim'):
shim=True
elif (arg == '-thunk'):
thunk=True
elif (arg == '-thunkdefs'):
thunkdefs=True
elif (arg == '-staticwrappers'):
staticwrappers=True
elif (arg == '-prefix'):
i = i + 1
elif arg == "-preresolve":
preresolve = True
elif arg == "-wrapper":
wrapper = True
elif arg == "-shim":
shim = True
elif arg == "-thunk":
thunk = True
elif arg == "-thunkdefs":
thunkdefs = True
elif arg == "-staticwrappers":
staticwrappers = True
elif arg == "-prefix":
prefix = sys.argv[i]
i = i+1
elif (arg == '-nodebug'):
i = i + 1
elif arg == "-nodebug":
nodebug = True
elif (arg[0:1] == '-'):
print('Unrecognized argument:', arg, file=sys.stderr)
elif arg[0:1] == "-":
print("Unrecognized argument:", arg, file=sys.stderr)
exit(1)
print('Generating', outFilename, file=sys.stderr)
print("Generating", outFilename, file=sys.stderr)
# Load & parse registry
reg = Registry()
@ -101,124 +104,145 @@ tree = etree.parse(regFilename)
reg.loadElementTree(tree)
if shim:
versions = '1\.[012]'
versions = "1\.[012]"
else:
versions = '.*'
versions = ".*"
genOpts = CGeneratorOptions(
apiname = prefix,
profile = 'compatibility',
versions = versions,
emitversions = versions,
defaultExtensions = prefix, # Default extensions for GL
protectFile = protect,
protectFeature = protect,
protectProto = protect,
)
apiname=prefix,
profile="compatibility",
versions=versions,
emitversions=versions,
defaultExtensions=prefix, # Default extensions for GL
protectFile=protect,
protectFeature=protect,
protectProto=protect,
)
# create error/warning & diagnostic files
if (errFilename):
errWarn = open(errFilename,'w')
if errFilename:
errWarn = open(errFilename, "w")
else:
errWarn = sys.stderr
diag = open(diagFilename, 'w')
diag = open(diagFilename, "w")
def ParseCmdRettype(cmd):
proto=noneStr(cmd.elem.find('proto'))
rettype=noneStr(proto.text)
if rettype.lower()!="void ":
plist = ([t for t in proto.itertext()])
rettype = ''.join(plist[:-1])
rettype=rettype.strip()
proto = noneStr(cmd.elem.find("proto"))
rettype = noneStr(proto.text)
if rettype.lower() != "void ":
plist = [t for t in proto.itertext()]
rettype = "".join(plist[:-1])
rettype = rettype.strip()
return rettype
def ParseCmdParams(cmd):
params = cmd.elem.findall('param')
plist=[]
params = cmd.elem.findall("param")
plist = []
for param in params:
# construct the formal parameter definition from ptype and name
# elements, also using any text found around these in the
# param element, in the order it appears in the document
paramtype = ''
paramtype = ""
# also extract the formal parameter name from the name element
paramname = ''
paramname = ""
for t in param.iter():
if t.tag == 'ptype' or t.tag == 'param':
if t.tag == "ptype" or t.tag == "param":
paramtype = paramtype + noneStr(t.text)
if t.tag == 'name':
paramname = t.text + '_'
paramtype = paramtype + ' ' + paramname
if t.tag == "name":
paramname = t.text + "_"
paramtype = paramtype + " " + paramname
if t.tail is not None:
paramtype = paramtype + t.tail.strip()
plist.append((paramtype, paramname))
return plist
class PreResolveOutputGenerator(OutputGenerator):
def __init__(self,
errFile = sys.stderr,
warnFile = sys.stderr,
diagFile = sys.stdout):
def __init__(self, errFile=sys.stderr, warnFile=sys.stderr, diagFile=sys.stdout):
OutputGenerator.__init__(self, errFile, warnFile, diagFile)
self.wrappers={}
self.wrappers = {}
def beginFile(self, genOpts):
self.outFile.write('/* Automatically generated from %s - DO NOT EDIT */\n\n'%regFilename)
self.outFile.write(
"/* Automatically generated from %s - DO NOT EDIT */\n\n" % regFilename
)
def endFile(self):
self.outFile.write('\nvoid ' + prefix + 'ResolveExtensionProcs(void)\n{\n')
self.outFile.write("\nvoid " + prefix + "ResolveExtensionProcs(void)\n{\n")
for funcname in self.wrappers.keys():
self.outFile.write( ' PRERESOLVE(PFN' + funcname.upper() + 'PROC, "' + funcname + '");\n')
self.outFile.write('}\n\n')
self.outFile.write(
" PRERESOLVE(PFN" + funcname.upper() + 'PROC, "' + funcname + '");\n'
)
self.outFile.write("}\n\n")
def beginFeature(self, interface, emit):
OutputGenerator.beginFeature(self, interface, emit)
def endFeature(self):
OutputGenerator.endFeature(self)
def genType(self, typeinfo, name):
OutputGenerator.genType(self, typeinfo, name)
def genEnum(self, enuminfo, name):
OutputGenerator.genEnum(self, enuminfo, name)
def genCmd(self, cmd, name):
OutputGenerator.genCmd(self, cmd, name)
if prefix == 'wgl' and not name in used_wgl_ext_fns:
if prefix == "wgl" and not name in used_wgl_ext_fns:
return
self.outFile.write('RESOLVE_DECL(PFN' + name.upper() + 'PROC);\n')
self.wrappers[name]=1
self.outFile.write("RESOLVE_DECL(PFN" + name.upper() + "PROC);\n")
self.wrappers[name] = 1
class WrapperOutputGenerator(OutputGenerator):
def __init__(self,
errFile = sys.stderr,
warnFile = sys.stderr,
diagFile = sys.stdout):
def __init__(self, errFile=sys.stderr, warnFile=sys.stderr, diagFile=sys.stdout):
OutputGenerator.__init__(self, errFile, warnFile, diagFile)
def beginFile(self, genOpts):
self.outFile.write('/* Automatically generated from %s - DO NOT EDIT */\n\n'%regFilename)
self.outFile.write(
"/* Automatically generated from %s - DO NOT EDIT */\n\n" % regFilename
)
def endFile(self):
pass
def beginFeature(self, interface, emit):
OutputGenerator.beginFeature(self, interface, emit)
self.OldVersion = self.featureName.startswith('GL_VERSION_1_0') or self.featureName.startswith('GL_VERSION_1_1')
self.OldVersion = self.featureName.startswith(
"GL_VERSION_1_0"
) or self.featureName.startswith("GL_VERSION_1_1")
def endFeature(self):
OutputGenerator.endFeature(self)
def genType(self, typeinfo, name):
OutputGenerator.genType(self, typeinfo, name)
def genEnum(self, enuminfo, name):
OutputGenerator.genEnum(self, enuminfo, name)
def genCmd(self, cmd, name):
OutputGenerator.genCmd(self, cmd, name)
if prefix == 'wgl' and not name in used_wgl_ext_fns:
if prefix == "wgl" and not name in used_wgl_ext_fns:
return
rettype=ParseCmdRettype(cmd)
rettype = ParseCmdRettype(cmd)
if staticwrappers: self.outFile.write("static ")
self.outFile.write("%s %sWrapper("%(rettype, name))
plist=ParseCmdParams(cmd)
Comma=""
if staticwrappers:
self.outFile.write("static ")
self.outFile.write("%s %sWrapper(" % (rettype, name))
plist = ParseCmdParams(cmd)
Comma = ""
if len(plist):
for ptype, pname in plist:
self.outFile.write("%s%s"%(Comma, ptype))
Comma=", "
self.outFile.write("%s%s" % (Comma, ptype))
Comma = ", "
else:
self.outFile.write("void")
@ -227,78 +251,100 @@ class WrapperOutputGenerator(OutputGenerator):
# for GL 1.0 and 1.1 functions, generate stdcall wrappers which call the function directly
if self.OldVersion:
if not nodebug:
self.outFile.write(' if (glxWinDebugSettings.enable%scallTrace) ErrorF("%s\\n");\n'%(prefix.upper(), name))
self.outFile.write(
' if (glxWinDebugSettings.enable%scallTrace) ErrorF("%s\\n");\n'
% (prefix.upper(), name)
)
self.outFile.write(" glWinDirectProcCalls++;\n")
self.outFile.write("\n")
if rettype.lower()=="void":
self.outFile.write(" %s( "%(name))
if rettype.lower() == "void":
self.outFile.write(" %s( " % (name))
else:
self.outFile.write(" return %s( "%(name))
self.outFile.write(" return %s( " % (name))
Comma=""
Comma = ""
for ptype, pname in plist:
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
self.outFile.write("%s%s" % (Comma, pname))
Comma = ", "
# for GL 1.2+ functions, generate stdcall wrappers which use wglGetProcAddress()
else:
if rettype.lower()=="void":
self.outFile.write(' RESOLVE(PFN%sPROC, "%s");\n'%(name.upper(), name))
if rettype.lower() == "void":
self.outFile.write(
' RESOLVE(PFN%sPROC, "%s");\n' % (name.upper(), name)
)
if not nodebug:
self.outFile.write("\n")
self.outFile.write(' if (glxWinDebugSettings.enable%scallTrace) ErrorF("%s\\n");\n'%(prefix.upper(), name))
self.outFile.write(
' if (glxWinDebugSettings.enable%scallTrace) ErrorF("%s\\n");\n'
% (prefix.upper(), name)
)
self.outFile.write("\n")
self.outFile.write(" RESOLVED_PROC(PFN%sPROC)( """%(name.upper()))
self.outFile.write(" RESOLVED_PROC(PFN%sPROC)( " % (name.upper()))
else:
self.outFile.write(' RESOLVE_RET(PFN%sPROC, "%s", FALSE);\n'%(name.upper(), name))
self.outFile.write(
' RESOLVE_RET(PFN%sPROC, "%s", FALSE);\n' % (name.upper(), name)
)
if not nodebug:
self.outFile.write("\n")
self.outFile.write(' if (glxWinDebugSettings.enable%scallTrace) ErrorF("%s\\n");\n'%(prefix.upper(), name))
self.outFile.write(
' if (glxWinDebugSettings.enable%scallTrace) ErrorF("%s\\n");\n'
% (prefix.upper(), name)
)
self.outFile.write("\n")
self.outFile.write(" return RESOLVED_PROC(PFN%sPROC)("%(name.upper()))
self.outFile.write(
" return RESOLVED_PROC(PFN%sPROC)(" % (name.upper())
)
Comma=""
Comma = ""
for ptype, pname in plist:
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
self.outFile.write("%s%s" % (Comma, pname))
Comma = ", "
self.outFile.write(" );\n}\n\n")
class ThunkOutputGenerator(OutputGenerator):
def __init__(self,
errFile = sys.stderr,
warnFile = sys.stderr,
diagFile = sys.stdout):
def __init__(self, errFile=sys.stderr, warnFile=sys.stderr, diagFile=sys.stdout):
OutputGenerator.__init__(self, errFile, warnFile, diagFile)
def beginFile(self, genOpts):
self.outFile.write('/* Automatically generated from %s - DO NOT EDIT */\n\n'%regFilename)
self.outFile.write(
"/* Automatically generated from %s - DO NOT EDIT */\n\n" % regFilename
)
def endFile(self):
pass
def beginFeature(self, interface, emit):
OutputGenerator.beginFeature(self, interface, emit)
self.OldVersion = (self.featureName in ['GL_VERSION_1_0', 'GL_VERSION_1_1'])
self.OldVersion = self.featureName in ["GL_VERSION_1_0", "GL_VERSION_1_1"]
def endFeature(self):
OutputGenerator.endFeature(self)
def genType(self, typeinfo, name):
OutputGenerator.genType(self, typeinfo, name)
def genEnum(self, enuminfo, name):
OutputGenerator.genEnum(self, enuminfo, name)
def genCmd(self, cmd, name):
OutputGenerator.genCmd(self, cmd, name)
rettype=ParseCmdRettype(cmd)
self.outFile.write("%s %sWrapper("%(rettype, name))
plist=ParseCmdParams(cmd)
rettype = ParseCmdRettype(cmd)
self.outFile.write("%s %sWrapper(" % (rettype, name))
plist = ParseCmdParams(cmd)
Comma=""
Comma = ""
if len(plist):
for ptype, pname in plist:
self.outFile.write("%s%s"%(Comma, ptype))
Comma=", "
self.outFile.write("%s%s" % (Comma, ptype))
Comma = ", "
else:
self.outFile.write("void")
@ -306,75 +352,104 @@ class ThunkOutputGenerator(OutputGenerator):
# for GL 1.0 and 1.1 functions, generate stdcall thunk wrappers which call the function directly
if self.OldVersion:
if rettype.lower()=="void":
self.outFile.write(" %s( "%(name))
if rettype.lower() == "void":
self.outFile.write(" %s( " % (name))
else:
self.outFile.write(" return %s( "%(name))
self.outFile.write(" return %s( " % (name))
Comma=""
Comma = ""
for ptype, pname in plist:
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
self.outFile.write("%s%s" % (Comma, pname))
Comma = ", "
# for GL 1.2+ functions, generate wrappers which use wglGetProcAddress()
else:
if rettype.lower()=="void":
self.outFile.write(' RESOLVE(PFN%sPROC, "%s");\n'%(name.upper(), name))
self.outFile.write(" RESOLVED_PROC(PFN%sPROC)( """%(name.upper()))
if rettype.lower() == "void":
self.outFile.write(
' RESOLVE(PFN%sPROC, "%s");\n' % (name.upper(), name)
)
self.outFile.write(" RESOLVED_PROC(PFN%sPROC)( " % (name.upper()))
else:
self.outFile.write(' RESOLVE_RET(PFN%sPROC, "%s", FALSE);\n'%(name.upper(), name))
self.outFile.write(" return RESOLVED_PROC(PFN%sPROC)("%(name.upper()))
self.outFile.write(
' RESOLVE_RET(PFN%sPROC, "%s", FALSE);\n' % (name.upper(), name)
)
self.outFile.write(
" return RESOLVED_PROC(PFN%sPROC)(" % (name.upper())
)
Comma=""
Comma = ""
for ptype, pname in plist:
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
self.outFile.write("%s%s" % (Comma, pname))
Comma = ", "
self.outFile.write(" );\n}\n\n")
class ThunkDefsOutputGenerator(OutputGenerator):
def __init__(self,
errFile = sys.stderr,
warnFile = sys.stderr,
diagFile = sys.stdout):
def __init__(self, errFile=sys.stderr, warnFile=sys.stderr, diagFile=sys.stdout):
OutputGenerator.__init__(self, errFile, warnFile, diagFile)
def beginFile(self, genOpts):
self.outFile.write("EXPORTS\n"); # this must be the first line for libtool to realize this is a .def file
self.outFile.write('; Automatically generated from %s - DO NOT EDIT\n\n'%regFilename)
self.outFile.write(
"EXPORTS\n"
) # this must be the first line for libtool to realize this is a .def file
self.outFile.write(
"; Automatically generated from %s - DO NOT EDIT\n\n" % regFilename
)
def endFile(self):
pass
def beginFeature(self, interface, emit):
OutputGenerator.beginFeature(self, interface, emit)
def endFeature(self):
OutputGenerator.endFeature(self)
def genType(self, typeinfo, name):
OutputGenerator.genType(self, typeinfo, name)
def genEnum(self, enuminfo, name):
OutputGenerator.genEnum(self, enuminfo, name)
def genCmd(self, cmd, name):
OutputGenerator.genCmd(self, cmd, name)
# export the wrapper function with the name of the function it wraps
self.outFile.write("%s = %sWrapper\n"%(name, name))
self.outFile.write("%s = %sWrapper\n" % (name, name))
class ShimOutputGenerator(OutputGenerator):
def __init__(self,
errFile = sys.stderr,
warnFile = sys.stderr,
diagFile = sys.stdout):
def __init__(self, errFile=sys.stderr, warnFile=sys.stderr, diagFile=sys.stdout):
OutputGenerator.__init__(self, errFile, warnFile, diagFile)
def beginFile(self, genOpts):
self.outFile.write('/* Automatically generated from %s - DO NOT EDIT */\n\n'%regFilename)
self.outFile.write(
"/* Automatically generated from %s - DO NOT EDIT */\n\n" % regFilename
)
def endFile(self):
pass
def beginFeature(self, interface, emit):
OutputGenerator.beginFeature(self, interface, emit)
self.OldVersion = (self.featureName in ['GL_VERSION_1_0', 'GL_VERSION_1_1', 'GL_VERSION_1_2', 'GL_ARB_imaging', 'GL_ARB_multitexture', 'GL_ARB_texture_compression'])
self.OldVersion = self.featureName in [
"GL_VERSION_1_0",
"GL_VERSION_1_1",
"GL_VERSION_1_2",
"GL_ARB_imaging",
"GL_ARB_multitexture",
"GL_ARB_texture_compression",
]
def endFeature(self):
OutputGenerator.endFeature(self)
def genType(self, typeinfo, name):
OutputGenerator.genType(self, typeinfo, name)
def genEnum(self, enuminfo, name):
OutputGenerator.genEnum(self, enuminfo, name)
def genCmd(self, cmd, name):
OutputGenerator.genCmd(self, cmd, name)
@ -382,90 +457,85 @@ class ShimOutputGenerator(OutputGenerator):
return
# for GL functions which are in the ABI, generate a shim which calls the function via GetProcAddress
rettype=ParseCmdRettype(cmd)
self.outFile.write("%s %s("%(rettype, name))
plist=ParseCmdParams(cmd)
rettype = ParseCmdRettype(cmd)
self.outFile.write("%s %s(" % (rettype, name))
plist = ParseCmdParams(cmd)
Comma=""
Comma = ""
if len(plist):
for ptype, pname in plist:
self.outFile.write("%s%s"%(Comma, ptype))
Comma=", "
self.outFile.write("%s%s" % (Comma, ptype))
Comma = ", "
else:
self.outFile.write("void")
self.outFile.write(")\n{\n")
self.outFile.write(' typedef %s (* PFN%sPROC)(' % (rettype, name.upper()))
self.outFile.write(" typedef %s (* PFN%sPROC)(" % (rettype, name.upper()))
if len(plist):
Comma=""
Comma = ""
for ptype, pname in plist:
self.outFile.write("%s %s"%(Comma, ptype))
Comma=", "
self.outFile.write("%s %s" % (Comma, ptype))
Comma = ", "
else:
self.outFile.write("void")
self.outFile.write(');\n')
self.outFile.write(");\n")
if rettype.lower()=="void":
self.outFile.write(' RESOLVE(PFN%sPROC, "%s");\n'%(name.upper(), name))
self.outFile.write(' RESOLVED_PROC(')
if rettype.lower() == "void":
self.outFile.write(' RESOLVE(PFN%sPROC, "%s");\n' % (name.upper(), name))
self.outFile.write(" RESOLVED_PROC(")
else:
self.outFile.write(' RESOLVE_RET(PFN%sPROC, "%s", 0);\n'%(name.upper(), name))
self.outFile.write(' return RESOLVED_PROC(')
self.outFile.write(
' RESOLVE_RET(PFN%sPROC, "%s", 0);\n' % (name.upper(), name)
)
self.outFile.write(" return RESOLVED_PROC(")
Comma=""
Comma = ""
for ptype, pname in plist:
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
self.outFile.write("%s%s" % (Comma, pname))
Comma = ", "
self.outFile.write(" );\n}\n\n")
def genHeaders():
outFile = open(outFilename,"w")
outFile = open(outFilename, "w")
if preresolve:
gen = PreResolveOutputGenerator(errFile=errWarn,
warnFile=errWarn,
diagFile=diag)
gen.outFile=outFile
gen = PreResolveOutputGenerator(
errFile=errWarn, warnFile=errWarn, diagFile=diag
)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if wrapper:
gen = WrapperOutputGenerator(errFile=errWarn,
warnFile=errWarn,
diagFile=diag)
gen.outFile=outFile
gen = WrapperOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if shim:
gen = ShimOutputGenerator(errFile=errWarn,
warnFile=errWarn,
diagFile=diag)
gen.outFile=outFile
gen = ShimOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if thunk:
gen = ThunkOutputGenerator(errFile=errWarn,
warnFile=errWarn,
diagFile=diag)
gen.outFile=outFile
gen = ThunkOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if thunkdefs:
gen = ThunkDefsOutputGenerator(errFile=errWarn,
warnFile=errWarn,
diagFile=diag)
gen.outFile=outFile
gen = ThunkDefsOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
outFile.close()
genHeaders()