Reviewed-by: Erik Faye-Lund <erik.faye-l...@collabora.com> On Wed, 2018-11-21 at 12:04 +0000, Emil Velikov wrote: > From: Emil Velikov <emil.veli...@collabora.com> > > Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> > --- > src/mapi/shared-glapi/SConscript | 28 +++++++++++++++++++++------- > 1 file changed, 21 insertions(+), 7 deletions(-) > > diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared- > glapi/SConscript > index 060c61dadce..81aea74873d 100644 > --- a/src/mapi/shared-glapi/SConscript > +++ b/src/mapi/shared-glapi/SConscript > @@ -27,13 +27,27 @@ def mapi_objects(env, printer, mode): > > # generate ABI header > GLAPI = '../glapi/' > - header = env.CodeGenerate( > - target = header_name, > - script = '../mapi_abi.py', > - source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI > + 'gen/*.xml'), > - command = python_cmd + ' $SCRIPT ' + \ > - '--printer %s $SOURCE > $TARGET' % (printer), > - ) > + if printer != 'glapi': > + if printer == 'es1api': > + abi_tag = 'glesv1' > + else: > + abi_tag = 'glesv2' > + > + header = env.CodeGenerate( > + target = header_name, > + script = '../new/gen_gldispatch_mapi.py', > + source = GLAPI + 'registry/gl.xml' > + command = python_cmd + ' $SCRIPT ' + \ > + '%s $SOURCE > $TARGET' % (abi_tag), > + ) > + else: > + header = env.CodeGenerate( > + target = header_name, > + script = '../mapi_abi.py', > + source = [GLAPI + 'gen/gl_and_es_API.xml'] + > env.Glob(GLAPI + 'gen/*.xml'), > + command = python_cmd + ' $SCRIPT ' + \ > + '--printer %s $SOURCE > $TARGET' % (printer), > + ) > > cpppath = [ > header[0].dir,
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
