--- src/mapi/glapi/gen/gl_marshal_h.py | 4 ++-- src/mapi/glapi/gen/meson.build | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/mapi/glapi/gen/gl_marshal_h.py b/src/mapi/glapi/gen/gl_marshal_h.py index 91948177e33..76dd4f17108 100644 --- a/src/mapi/glapi/gen/gl_marshal_h.py +++ b/src/mapi/glapi/gen/gl_marshal_h.py @@ -121,10 +121,10 @@ static inline int safe_mul(int a, int b) if (cmd->${p.name}_null) { ${p.name} = NULL; } else { - /* TODO: variable_data += */ + ## variable_data += ${p.len.scale}; } % else: - /* TODO: variable_data += */ + ## variable_data += ${p.len.scale}; % endif % endfor % endif diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 97312596c9c..34f87714c13 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -220,11 +220,13 @@ main_api_exec_c = custom_target( main_marshal_generated_c = custom_target( 'marshal_generated.c', - input : ['gl_marshal.py', 'gl_and_es_API.xml'], + input : ['gl_marshal_h.py', files_gl_xml], output : 'marshal_generated.c', - command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'], - depend_files : files('marshal_XML.py') + glapi_gen_depends, - capture : true, + command : [ + prog_python, '@INPUT0@', '--code', '@OUTPUT@', '@INPUT1@', + join_paths(meson.current_source_dir(), 'templates'), + ], + depend_files : glapi_new_gen_depends, ) glx_generated = [] -- 2.19.2 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev