Module: Mesa Branch: main Commit: 87a673cac4a5861e0c37148cab19785a8218b2b0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87a673cac4a5861e0c37148cab19785a8218b2b0
Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Mon Oct 23 13:43:31 2023 +0200 broadcom/cle: rename xml files This has been confusing for some time, as from a xml file with the suffix v33 (so suggesting just one version) we were generating the headers for v33, v40, v41 and v71. So now there is a header for the vc4 driver, and one header for the v3d/v3dv (so v3d "platform") drivers. FWIW, this means that now the name of the original xml and the header files generated doesn't maintain a so similar pattern, but again the equivalence were not there anyway. Acked-by: Emma Anholt <e...@anholt.net> Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25851> --- src/broadcom/cle/gen_pack_header.py | 2 +- src/broadcom/cle/meson.build | 17 ++++++++--------- src/broadcom/cle/{v3d_packet_v33.xml => v3d_packet.xml} | 0 src/broadcom/cle/{v3d_packet_v21.xml => vc4_packet.xml} | 0 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/broadcom/cle/gen_pack_header.py b/src/broadcom/cle/gen_pack_header.py index 50545d7955e..1cc2446d0bd 100644 --- a/src/broadcom/cle/gen_pack_header.py +++ b/src/broadcom/cle/gen_pack_header.py @@ -26,7 +26,7 @@ import xml.parsers.expat import re import sys -license = """/* Generated code, see v3d_packet_v21.xml, v3d_packet_v33.xml and gen_pack_header.py */ +license = """/* Generated code, see vc4_packet.xml, v3d_packet.xml and gen_pack_header.py */ """ pack_header = """%(license)s diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build index a3ed2cff759..9fb786803e1 100644 --- a/src/broadcom/cle/meson.build +++ b/src/broadcom/cle/meson.build @@ -18,26 +18,25 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# [version, cle XML version] +# [version, cle XML file] v3d_versions = [ - [21, 21], - [42, 33], - [71, 33] + [21, 'vc4_packet.xml'], + [42, 'v3d_packet.xml'], + [71, 'v3d_packet.xml'] ] v3d_xml_files = [] v3d_xml_pack = [] foreach _v : v3d_versions v = _v[0] - xmlver = _v[1] - f = 'v3d_packet_v@0@.xml'.format(xmlver) + xmlfile = _v[1] _name = 'v3d_packet_v@0@_pack.h'.format(v) - if not v3d_xml_files.contains(f) - v3d_xml_files += f + if not v3d_xml_files.contains(xmlfile) + v3d_xml_files += xmlfile endif v3d_xml_pack += custom_target( _name, - input : ['gen_pack_header.py', f], + input : ['gen_pack_header.py', xmlfile], output : _name, command : [prog_python, '@INPUT@', '@0@'.format(v)], capture : true, diff --git a/src/broadcom/cle/v3d_packet_v33.xml b/src/broadcom/cle/v3d_packet.xml similarity index 100% rename from src/broadcom/cle/v3d_packet_v33.xml rename to src/broadcom/cle/v3d_packet.xml diff --git a/src/broadcom/cle/v3d_packet_v21.xml b/src/broadcom/cle/vc4_packet.xml similarity index 100% rename from src/broadcom/cle/v3d_packet_v21.xml rename to src/broadcom/cle/vc4_packet.xml
