andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xwin/glx: Improve code generator to deal with latest Khronos OpenGL registry XML 

Improve the parsing of the <proto> XML element

Include all text from the param element, in the order it appears in the xml
document, as part of the formal parameter declaration

This is needed to correctly handle the XML description added in svn r27498 of
glPathGlyphIndexRangeNV()'s baseAndCount parameter of type GLuint[2]

This fixes the way the parameter declaration is generated so it is in the
correct form 'GLuint baseAndCount_[2]' and not 'GLuint baseAndCount[2]_'

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
(cherry picked from commit d02f9611c8)
This commit is contained in:
Jon TURNEY 2015-03-16 16:29:29 +00:00 committed by Adam Jackson
parent 6fa7510e6a
commit c3db722ffe
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/xwin/glx/gen_gl_wrappers.py
View File

@ -136,9 +136,20 @@ def ParseCmdParams(cmd):
params = cmd.elem.findall('param')
plist=[]
for param in params:
paramlist = ([t for t in param.itertext()])
paramtype = ''.join(paramlist[:-1])
paramname = paramlist[-1]
# 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 = ''
# also extract the formal parameter name from the name element
paramname = ''
for t in param.iter():
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.tail is not None:
paramtype = paramtype + t.tail.strip()
plist.append((paramtype, paramname))
return plist
@ -206,7 +217,7 @@ class WrapperOutputGenerator(OutputGenerator):
Comma=""
if len(plist):
for ptype, pname in plist:
self.outFile.write("%s%s%s_"%(Comma, ptype, pname))
self.outFile.write("%s%s"%(Comma, ptype))
Comma=", "
else:
self.outFile.write("void")
@ -227,7 +238,7 @@ class WrapperOutputGenerator(OutputGenerator):
Comma=""
for ptype, pname in plist:
self.outFile.write("%s%s_"%(Comma, pname))
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
# for GL 1.2+ functions, generate stdcall wrappers which use wglGetProcAddress()
@ -253,7 +264,7 @@ class WrapperOutputGenerator(OutputGenerator):
Comma=""
for ptype, pname in plist:
self.outFile.write("%s%s_"%(Comma, pname))
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
self.outFile.write(" );\n}\n\n")
@ -282,10 +293,11 @@ class ThunkOutputGenerator(OutputGenerator):
rettype=ParseCmdRettype(cmd)
self.outFile.write("%s %sWrapper("%(rettype, name))
plist=ParseCmdParams(cmd)
Comma=""
if len(plist):
for ptype, pname in plist:
self.outFile.write("%s%s%s_"%(Comma, ptype, pname))
self.outFile.write("%s%s"%(Comma, ptype))
Comma=", "
else:
self.outFile.write("void")
@ -301,7 +313,7 @@ class ThunkOutputGenerator(OutputGenerator):
Comma=""
for ptype, pname in plist:
self.outFile.write("%s%s_"%(Comma, pname))
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
# for GL 1.2+ functions, generate wrappers which use wglGetProcAddress()
@ -315,7 +327,7 @@ class ThunkOutputGenerator(OutputGenerator):
Comma=""
for ptype, pname in plist:
self.outFile.write("%s%s_"%(Comma, pname))
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
self.outFile.write(" );\n}\n\n")
@ -373,10 +385,11 @@ class ShimOutputGenerator(OutputGenerator):
rettype=ParseCmdRettype(cmd)
self.outFile.write("%s %s("%(rettype, name))
plist=ParseCmdParams(cmd)
Comma=""
if len(plist):
for ptype, pname in plist:
self.outFile.write("%s%s%s_"%(Comma, ptype, pname))
self.outFile.write("%s%s"%(Comma, ptype))
Comma=", "
else:
self.outFile.write("void")
@ -388,7 +401,7 @@ class ShimOutputGenerator(OutputGenerator):
if len(plist):
Comma=""
for ptype, pname in plist:
self.outFile.write("%s %s %s_"%(Comma, ptype, pname))
self.outFile.write("%s %s"%(Comma, ptype))
Comma=", "
else:
self.outFile.write("void")
@ -404,7 +417,7 @@ class ShimOutputGenerator(OutputGenerator):
Comma=""
for ptype, pname in plist:
self.outFile.write("%s%s_"%(Comma, pname))
self.outFile.write("%s%s"%(Comma, pname))
Comma=", "
self.outFile.write(" );\n}\n\n")