summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-11-04 15:05:23 +0100
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-11-11 11:48:37 +0100
commit1919c0161fdf4804e7424347b6379184eeb2f399 (patch)
treebe931ef56ad3a2b717eaa0b4b8a950caf990c1c7
parent84dce213c77e744c1f0aab72f5ad3eab7b963908 (diff)
downloadqtwayland-1919c0161fdf4804e7424347b6379184eeb2f399.tar.gz
Make texture sharing mechanism hidden and experimental
The texture sharing mechanism has some issues still, and it is not strictly required in Qt 6.0. So we keep the code for now, but hide the feature and document it as experimental and unsupported. This makes it convenient to bring it back later, maybe with a revised API, when have more concrete use cases. The example is moved into manual tests for now, and can easily be brought back later. Change-Id: Icfe4841b329bebcf9d63d1e00a4f6ae613c5092f Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
-rw-r--r--examples/wayland/.prev_CMakeLists.txt1
-rw-r--r--examples/wayland/CMakeLists.txt1
-rw-r--r--examples/wayland/wayland.pro3
-rw-r--r--src/imports/texture-sharing-extension/plugin.cpp4
-rw-r--r--src/imports/texture-sharing/plugin.cpp5
-rw-r--r--tests/manual/texture-sharing-2/.gitignore (renamed from examples/wayland/texture-sharing/.gitignore)0
-rw-r--r--tests/manual/texture-sharing-2/CMakeLists.txt (renamed from examples/wayland/texture-sharing/CMakeLists.txt)0
-rw-r--r--tests/manual/texture-sharing-2/README (renamed from examples/wayland/texture-sharing/README)0
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt (renamed from examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt)0
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/compositor.qrc (renamed from examples/wayland/texture-sharing/custom-compositor/compositor.qrc)0
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/custom-compositor.pro (renamed from examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro)0
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/images/background.png (renamed from examples/wayland/texture-sharing/custom-compositor/images/background.png)bin9287 -> 9287 bytes
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/images/car.ktx (renamed from examples/wayland/texture-sharing/custom-compositor/images/car.ktx)bin11908 -> 11908 bytes
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/images/qt4.astc (renamed from examples/wayland/texture-sharing/custom-compositor/images/qt4.astc)bin12816 -> 12816 bytes
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/images/qt_logo.png (renamed from examples/wayland/texture-sharing/custom-compositor/images/qt_logo.png)bin1528 -> 1528 bytes
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/main.cpp (renamed from examples/wayland/texture-sharing/custom-compositor/main.cpp)0
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/qml/main.qml (renamed from examples/wayland/texture-sharing/custom-compositor/qml/main.qml)0
-rw-r--r--tests/manual/texture-sharing-2/minimal-compositor.qml (renamed from examples/wayland/texture-sharing/minimal-compositor.qml)0
-rw-r--r--tests/manual/texture-sharing-2/qml-client/CMakeLists.txt (renamed from examples/wayland/texture-sharing/qml-client/CMakeLists.txt)0
-rw-r--r--tests/manual/texture-sharing-2/qml-client/main.cpp (renamed from examples/wayland/texture-sharing/qml-client/main.cpp)0
-rw-r--r--tests/manual/texture-sharing-2/qml-client/main.qml (renamed from examples/wayland/texture-sharing/qml-client/main.qml)0
-rw-r--r--tests/manual/texture-sharing-2/qml-client/qml-client.pro (renamed from examples/wayland/texture-sharing/qml-client/qml-client.pro)0
-rw-r--r--tests/manual/texture-sharing-2/qml-client/qml-client.qrc (renamed from examples/wayland/texture-sharing/qml-client/qml-client.qrc)0
-rw-r--r--tests/manual/texture-sharing-2/texture-sharing.pro (renamed from examples/wayland/texture-sharing/texture-sharing.pro)0
24 files changed, 10 insertions, 4 deletions
diff --git a/examples/wayland/.prev_CMakeLists.txt b/examples/wayland/.prev_CMakeLists.txt
index 490035a9..400b4412 100644
--- a/examples/wayland/.prev_CMakeLists.txt
+++ b/examples/wayland/.prev_CMakeLists.txt
@@ -19,5 +19,4 @@ if(TARGET Qt::Quick AND TARGET Qt::WaylandClient)
endif()
if(QT_FEATURE_opengl AND TARGET Qt::Quick AND TARGET Qt::WaylandClient)
add_subdirectory(server-buffer)
- add_subdirectory(texture-sharing)
endif()
diff --git a/examples/wayland/CMakeLists.txt b/examples/wayland/CMakeLists.txt
index 1275ca2e..78132bb1 100644
--- a/examples/wayland/CMakeLists.txt
+++ b/examples/wayland/CMakeLists.txt
@@ -20,6 +20,5 @@ if(TARGET Qt::Quick AND TARGET Qt::WaylandClient)
endif()
if(QT_FEATURE_opengl AND TARGET Qt::Quick AND TARGET Qt::WaylandClient)
add_subdirectory(server-buffer)
- add_subdirectory(texture-sharing)
endif()
endif() # special case
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
index e7ff0a16..c6103623 100644
--- a/examples/wayland/wayland.pro
+++ b/examples/wayland/wayland.pro
@@ -23,8 +23,7 @@ qtHaveModule(quick) {
qtConfig(opengl) {
SUBDIRS += \
- server-buffer \
- texture-sharing
+ server-buffer
}
}
SUBDIRS += hwlayer-compositor
diff --git a/src/imports/texture-sharing-extension/plugin.cpp b/src/imports/texture-sharing-extension/plugin.cpp
index 42dcd8e2..094d2f74 100644
--- a/src/imports/texture-sharing-extension/plugin.cpp
+++ b/src/imports/texture-sharing-extension/plugin.cpp
@@ -43,6 +43,7 @@
#include "QtWaylandCompositor/private/qwltexturesharingextension_p.h"
/*!
+ \internal
\qmlmodule QtWayland.Compositor.TextureSharingExtension 1
\title Qt Wayland Shared Texture Provider
\ingroup qmlmodules
@@ -53,6 +54,9 @@
This module lets the compositor export graphical resources that can be used by clients,
without allocating any graphics memory in the client.
+ \note The texture sharing functionality is considered experimental and
+ currently unsupported in Qt 6.
+
\section2 Usage
This module is imported like this:
diff --git a/src/imports/texture-sharing/plugin.cpp b/src/imports/texture-sharing/plugin.cpp
index 9cf6bbca..695ce874 100644
--- a/src/imports/texture-sharing/plugin.cpp
+++ b/src/imports/texture-sharing/plugin.cpp
@@ -43,6 +43,7 @@
#include "sharedtextureprovider.h"
/*!
+ \internal
\qmlmodule QtWayland.Client.TextureSharing 1
\title Qt Wayland Shared Texture Provider
\ingroup qmlmodules
@@ -52,6 +53,10 @@
This module allows Qt Wayland clients to use graphical resources exported
by the compositor, without allocating any graphics memory in the client.
+
+ \note The texture sharing functionality is considered experimental and
+ currently unsupported in Qt 6.
+
\section2 Usage
To use this module, import it like this:
diff --git a/examples/wayland/texture-sharing/.gitignore b/tests/manual/texture-sharing-2/.gitignore
index c684448d..c684448d 100644
--- a/examples/wayland/texture-sharing/.gitignore
+++ b/tests/manual/texture-sharing-2/.gitignore
diff --git a/examples/wayland/texture-sharing/CMakeLists.txt b/tests/manual/texture-sharing-2/CMakeLists.txt
index bf6a7cbf..bf6a7cbf 100644
--- a/examples/wayland/texture-sharing/CMakeLists.txt
+++ b/tests/manual/texture-sharing-2/CMakeLists.txt
diff --git a/examples/wayland/texture-sharing/README b/tests/manual/texture-sharing-2/README
index 27ea7674..27ea7674 100644
--- a/examples/wayland/texture-sharing/README
+++ b/tests/manual/texture-sharing-2/README
diff --git a/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt b/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt
index 0ca81f26..0ca81f26 100644
--- a/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt
+++ b/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt
diff --git a/examples/wayland/texture-sharing/custom-compositor/compositor.qrc b/tests/manual/texture-sharing-2/custom-compositor/compositor.qrc
index 86a8567f..86a8567f 100644
--- a/examples/wayland/texture-sharing/custom-compositor/compositor.qrc
+++ b/tests/manual/texture-sharing-2/custom-compositor/compositor.qrc
diff --git a/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro b/tests/manual/texture-sharing-2/custom-compositor/custom-compositor.pro
index 098034f3..098034f3 100644
--- a/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro
+++ b/tests/manual/texture-sharing-2/custom-compositor/custom-compositor.pro
diff --git a/examples/wayland/texture-sharing/custom-compositor/images/background.png b/tests/manual/texture-sharing-2/custom-compositor/images/background.png
index 845830c5..845830c5 100644
--- a/examples/wayland/texture-sharing/custom-compositor/images/background.png
+++ b/tests/manual/texture-sharing-2/custom-compositor/images/background.png
Binary files differ
diff --git a/examples/wayland/texture-sharing/custom-compositor/images/car.ktx b/tests/manual/texture-sharing-2/custom-compositor/images/car.ktx
index 2aefdd30..2aefdd30 100644
--- a/examples/wayland/texture-sharing/custom-compositor/images/car.ktx
+++ b/tests/manual/texture-sharing-2/custom-compositor/images/car.ktx
Binary files differ
diff --git a/examples/wayland/texture-sharing/custom-compositor/images/qt4.astc b/tests/manual/texture-sharing-2/custom-compositor/images/qt4.astc
index 7f7a3f47..7f7a3f47 100644
--- a/examples/wayland/texture-sharing/custom-compositor/images/qt4.astc
+++ b/tests/manual/texture-sharing-2/custom-compositor/images/qt4.astc
Binary files differ
diff --git a/examples/wayland/texture-sharing/custom-compositor/images/qt_logo.png b/tests/manual/texture-sharing-2/custom-compositor/images/qt_logo.png
index 5e2b355e..5e2b355e 100644
--- a/examples/wayland/texture-sharing/custom-compositor/images/qt_logo.png
+++ b/tests/manual/texture-sharing-2/custom-compositor/images/qt_logo.png
Binary files differ
diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp b/tests/manual/texture-sharing-2/custom-compositor/main.cpp
index af375024..af375024 100644
--- a/examples/wayland/texture-sharing/custom-compositor/main.cpp
+++ b/tests/manual/texture-sharing-2/custom-compositor/main.cpp
diff --git a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml b/tests/manual/texture-sharing-2/custom-compositor/qml/main.qml
index 7a570516..7a570516 100644
--- a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
+++ b/tests/manual/texture-sharing-2/custom-compositor/qml/main.qml
diff --git a/examples/wayland/texture-sharing/minimal-compositor.qml b/tests/manual/texture-sharing-2/minimal-compositor.qml
index a832b051..a832b051 100644
--- a/examples/wayland/texture-sharing/minimal-compositor.qml
+++ b/tests/manual/texture-sharing-2/minimal-compositor.qml
diff --git a/examples/wayland/texture-sharing/qml-client/CMakeLists.txt b/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt
index 76161a78..76161a78 100644
--- a/examples/wayland/texture-sharing/qml-client/CMakeLists.txt
+++ b/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt
diff --git a/examples/wayland/texture-sharing/qml-client/main.cpp b/tests/manual/texture-sharing-2/qml-client/main.cpp
index 618d6701..618d6701 100644
--- a/examples/wayland/texture-sharing/qml-client/main.cpp
+++ b/tests/manual/texture-sharing-2/qml-client/main.cpp
diff --git a/examples/wayland/texture-sharing/qml-client/main.qml b/tests/manual/texture-sharing-2/qml-client/main.qml
index 2c258404..2c258404 100644
--- a/examples/wayland/texture-sharing/qml-client/main.qml
+++ b/tests/manual/texture-sharing-2/qml-client/main.qml
diff --git a/examples/wayland/texture-sharing/qml-client/qml-client.pro b/tests/manual/texture-sharing-2/qml-client/qml-client.pro
index 67d5c707..67d5c707 100644
--- a/examples/wayland/texture-sharing/qml-client/qml-client.pro
+++ b/tests/manual/texture-sharing-2/qml-client/qml-client.pro
diff --git a/examples/wayland/texture-sharing/qml-client/qml-client.qrc b/tests/manual/texture-sharing-2/qml-client/qml-client.qrc
index 5f6483ac..5f6483ac 100644
--- a/examples/wayland/texture-sharing/qml-client/qml-client.qrc
+++ b/tests/manual/texture-sharing-2/qml-client/qml-client.qrc
diff --git a/examples/wayland/texture-sharing/texture-sharing.pro b/tests/manual/texture-sharing-2/texture-sharing.pro
index 3f779282..3f779282 100644
--- a/examples/wayland/texture-sharing/texture-sharing.pro
+++ b/tests/manual/texture-sharing-2/texture-sharing.pro