Quoting Emil Velikov (2018-11-21 04:04:09)
> From: Emil Velikov <emil.veli...@collabora.com>
>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> src/mapi/es1api/meson.build | 6 +++---
> src/mapi/es2api/meson.build | 6 +++---
> src/mapi/glapi/gen/meson.build | 7 +++++++
> src/mapi/meson.build | 1 +
> 4 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
> index 53e894f091c..6c37dbb67bc 100644
> --- a/src/mapi/es1api/meson.build
> +++ b/src/mapi/es1api/meson.build
> @@ -20,10 +20,10 @@
>
> es1_glapi_mapi_tmp_h = custom_target(
> 'es1_glapi_mapi_tmp.h',
> - input : [mapi_abi_py, gl_and_es_api_files],
> + input : [glapi_gen_mapi_script, glapi_gen_gl_xml],
> output : 'glapi_mapi_tmp.h',
> - command : [prog_python, '@INPUT0@', '--printer', 'es1api', '@INPUT1@'],
> - depend_files : api_xml_files,
> + command : [prog_python, '@INPUT0@', 'glesv1', '@INPUT1@'],
> + depend_files : glapi_gen_mapi_deps,
> capture : true,
> )
>
> diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
> index 1f397e2b752..3cb6a0cdeb3 100644
> --- a/src/mapi/es2api/meson.build
> +++ b/src/mapi/es2api/meson.build
> @@ -20,10 +20,10 @@
>
> es2_glapi_mapi_tmp_h = custom_target(
> 'es2_glapi_mapi_tmp.h',
> - input : [mapi_abi_py, gl_and_es_api_files],
> + input : [glapi_gen_mapi_script, glapi_gen_gl_xml],
> output : 'glapi_mapi_tmp.h',
> - command : [prog_python, '@INPUT0@', '--printer', 'es2api', '@INPUT1@'],
> - depend_files : api_xml_files,
> + command : [prog_python, '@INPUT0@', 'glesv2', '@INPUT1@'],
> + depend_files : glapi_gen_mapi_deps,
> capture : true,
> )
>
> diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build
> index f494e9707b6..fa06c7c5458 100644
> --- a/src/mapi/glapi/gen/meson.build
> +++ b/src/mapi/glapi/gen/meson.build
> @@ -18,6 +18,13 @@
> # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> THE
> # SOFTWARE.
>
> +glapi_gen_gl_xml = files('../registry/gl.xml')
the gl_enum.py generate could use this as well.
> +glapi_gen_mapi_deps = [
> + glapi_gen_gl_xml,
> + files('../../new/genCommon.py'),
> + glapi_gen_gl_xml,
> +]
> +
> gl_and_es_api_files = files('gl_and_es_API.xml')
>
> api_xml_files = files(
> diff --git a/src/mapi/meson.build b/src/mapi/meson.build
> index 798586bfb0c..e7a6685576b 100644
> --- a/src/mapi/meson.build
> +++ b/src/mapi/meson.build
> @@ -25,6 +25,7 @@ files_mapi_util = files(
> 'u_execmem.h',
> )
>
> +glapi_gen_mapi_script = files('new/gen_gldispatch_mapi.py')
All of the other generated scripts are "${foo}_py", can we continue to use that
format please?
> mapi_abi_py = files('mapi_abi.py')
>
> subdir('glapi')
> --
> 2.19.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
