diff options
| author | Eric Engestrom <eric@igalia.com> | 2023-02-27 16:50:50 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-03-08 18:00:13 +0000 |
| commit | c18f920e5d0828987cde9d6949bf9c767387a589 (patch) | |
| tree | c98ccf0615f136b011db059c6d71ff244addbce6 | |
| parent | 55b6c88d4d0146c80c25272564ceaa84fafe7eed (diff) | |
| download | mesa-c18f920e5d0828987cde9d6949bf9c767387a589.tar.gz | |
glapi/meson: drop duplicate line in deps
Fixes: 0842bc879b34414de54b ("meson: wire the new generator for es1 and es2")
Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21562>
(cherry picked from commit c9f3ba987fee21819a891ba588ba2dd84dab580e)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/meson.build | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 83fbb2e097d..410946337cd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4261,7 +4261,7 @@ "description": "glapi/meson: drop duplicate line in deps", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0842bc879b34414de54be9a2299ea8cdb0ecde5e" }, diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 8866701e46b..7baa275ed14 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -22,7 +22,6 @@ glapi_gen_gl_xml = files('../registry/gl.xml') glapi_gen_mapi_deps = [ glapi_gen_gl_xml, genCommon_py, - glapi_gen_gl_xml, ] gl_and_es_api_files = files('gl_and_es_API.xml') |