From 2fca2ca03a26db5fe06ae51b5fddad179e11dcf9 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 24 Feb 2021 20:30:14 +0200 Subject: [PATCH] Scanner: Remove global version check libwayland-server ensures that the requested version is less than or equal to the global version. This change removes the global version check to simplify the generated code and reduce memory usage footprint, however the latter shouldn't be that noticeable. Change-Id: Idd76098e588f3f4ca1be960d20a16994726702af Reviewed-by: David Edmundson --- src/tools/qtwaylandscanner/qtwaylandscanner.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp index 6da02152eea..93f4b68ff64 100644 --- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp @@ -637,7 +637,6 @@ bool Scanner::process() printf(" QMultiMap m_resource_map;\n"); printf(" Resource *m_resource;\n"); printf(" struct ::wl_global *m_global;\n"); - printf(" uint32_t m_globalVersion;\n"); printf(" struct DisplayDestroyedListener : ::wl_listener {\n"); printf(" %s *parent;\n", interfaceName); printf(" };\n"); @@ -762,7 +761,6 @@ bool Scanner::process() printf(" void %s::init(struct ::wl_display *display, int version)\n", interfaceName); printf(" {\n"); printf(" m_global = wl_global_create(display, &::%s_interface, version, this, bind_func);\n", interfaceName); - printf(" m_globalVersion = version;\n"); printf(" m_displayDestroyedListener.notify = %s::display_destroy_func;\n", interfaceName); printf(" m_displayDestroyedListener.parent = this;\n"); printf(" wl_display_add_destroy_listener(display, &m_displayDestroyedListener);\n"); @@ -794,7 +792,7 @@ bool Scanner::process() printf(" void %s::bind_func(struct ::wl_client *client, void *data, uint32_t version, uint32_t id)\n", interfaceName); printf(" {\n"); printf(" %s *that = static_cast<%s *>(data);\n", interfaceName, interfaceName); - printf(" that->add(client, id, qMin(that->m_globalVersion, version));\n"); + printf(" that->add(client, id, version);\n"); printf(" }\n"); printf("\n");