Qt5.15 compatible graphics updates

Signed-off-by: Michael Carroll <[email protected]>

src/plugins/minimal_scene/MinimalScene.cc

@@ -29,6 +29,7 @@
 #include <map>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <gz/common/Console.hh>
@@ -52,17 +53,10 @@
 #include "gz/gui/Helpers.hh"
 #include "gz/gui/MainWindow.hh"
 
-#define GZ_GUI_HAVE_VULKAN \
-  QT_VERSION >= QT_VERSION_CHECK(5, 15, 2) && \
-  QT_CONFIG(vulkan) && \
-  GZ_RENDERING_HAVE_VULKAN
-
-#define GZ_GUI_HAVE_METAL __APPLE__
-
 #if GZ_GUI_HAVE_VULKAN
 #  include <QVulkanInstance>
 #  include <gz/rendering/RenderEngineVulkanExternalDeviceStructs.hh>
-#endif  // GZ_HAVE_VULKAN
+#endif  // GZ_GUI_HAVE_VULKAN
 
 Q_DECLARE_METATYPE(gz::gui::plugins::RenderSync*)
 
@@ -1189,7 +1183,12 @@ QSGNode *RenderWindowItem::updatePaintNode(QSGNode *_node,
 
     if (this->dataPtr->graphicsAPI == rendering::GraphicsAPI::OPENGL)
     {
-      QOpenGLContext *current = this->window()->openglContext();
+      auto *rif = this->window()->rendererInterface();
+      Q_ASSERT(rif->graphicsApi() == QSGRendererInterface::OpenGL);
+
+      auto *current =  static_cast<QOpenGLContext*>(
+        rif->getResource(this->window(), QSGRendererInterface::OpenGLContextResource));
+
       // Some GL implementations require that the currently bound context is
       // made non-current before we set up sharing, so we doneCurrent here
       // and makeCurrent down below while setting up our own context.

src/plugins/minimal_scene/MinimalSceneRhi.hh

@@ -26,6 +26,13 @@
 #include <QSGTexture>
 #include <QSize>
 
+#define GZ_GUI_HAVE_VULKAN \
+  QT_VERSION >= QT_VERSION_CHECK(5, 15, 2) && \
+  QT_CONFIG(vulkan) && \
+  GZ_RENDERING_HAVE_VULKAN
+
+#define GZ_GUI_HAVE_METAL __APPLE__
+
 namespace gz::gui::plugins
 {
   /// \brief Render interface class to handle OpenGL / Metal compatibility

src/plugins/minimal_scene/MinimalSceneRhiOpenGL.cc

@@ -16,6 +16,7 @@
 */
 
 #include "MinimalSceneRhiOpenGL.hh"
+#include <qsgtexture_platform.h>
 
 #include "EngineToQtInterface.hh"
 #include "MinimalScene.hh"
@@ -59,6 +60,27 @@ namespace gz::gui::plugins
     public: QMutex mutex;
     public: QSGTexture *texture = nullptr;
     public: QQuickWindow *window = nullptr;
+
+  public: void CreateTexture(GLuint *_id, QSize _size) {
+    delete this->texture;
+    this->texture = nullptr;
+
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    this->texture = QNativeInterface::QSGOpenGLTexture::fromNative(
+      *_id,
+      this->window,
+      _size);
+#else
+  this->texture =
+      this->window->createTextureFromNativeObject(
+          QQuickWindow::NativeObjectTexture,
+          static_cast<void*>(_id),
+          0,
+          _size);
+#endif
+    }
+
   };
 
 /////////////////////////////////////////////////
@@ -206,12 +228,8 @@ TextureNodeRhiOpenGL::TextureNodeRhiOpenGL(QQuickWindow *_window)
   this->dataPtr->window = _window;
 
   // Our texture node must have a texture, so use the default 0 texture.
-  this->dataPtr->texture =
-      this->dataPtr->window->createTextureFromNativeObject(
-          QQuickWindow::NativeObjectTexture,
-          static_cast<void*>(&this->dataPtr->textureId),
-          0,
-          QSize(1, 1));
+  this->dataPtr->CreateTexture(
+    &this->dataPtr->textureId, QSize(1, 1));
 }
 
 /////////////////////////////////////////////////
@@ -246,17 +264,10 @@ void TextureNodeRhiOpenGL::PrepareNode()
   this->dataPtr->textureId = 0;
   this->dataPtr->mutex.unlock();
 
-  if (this->dataPtr->newTextureId)
+  if (this->dataPtr->newTextureId != 0)
   {
-    delete this->dataPtr->texture;
-    this->dataPtr->texture = nullptr;
-
-    this->dataPtr->texture =
-        this->dataPtr->window->createTextureFromNativeObject(
-            QQuickWindow::NativeObjectTexture,
-            static_cast<void*>(&this->dataPtr->newTextureId),
-            0,
-            this->dataPtr->newSize);
+    this->dataPtr->CreateTexture(
+      &this->dataPtr->newTextureId, this->dataPtr->newSize);
   }
 }
 }  // namespace gz::gui::plugins

src/plugins/minimal_scene/MinimalSceneRhiVulkan.cc

@@ -17,7 +17,7 @@
 
 #include "MinimalSceneRhiVulkan.hh"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2) && QT_CONFIG(vulkan)
+#if GZ_GUI_HAVE_VULKAN
 
 #include "EngineToQtInterface.hh"
 #include "MinimalScene.hh"
@@ -60,8 +60,29 @@ class TextureNodeRhiVulkanPrivate
   public: QMutex mutex;
   public: QSGTexture *texture = nullptr;
   public: QQuickWindow *window = nullptr;
+
+  public: void CreateTexture(VkImage *_id, QSize _size) {
+    delete this->texture;
+    this->texture = nullptr;
+
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    this->texture = QNativeInterface::QSGVulkanTexture::fromNative(
+      *_id,
+      VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+      this->window,
+      _size);
+#else
+    this->texture = this->window->createTextureFromNativeObject(
+      QQuickWindow::NativeObjectTexture,
+      static_cast<void *>(_id),  //
+      VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL,
+      _size);
+#endif
+    }
 };
 
+
 /////////////////////////////////////////////////
 GzCameraTextureRhiVulkan::~GzCameraTextureRhiVulkan() = default;
 
@@ -182,10 +203,8 @@ TextureNodeRhiVulkan::TextureNodeRhiVulkan(QQuickWindow *_window,
   _camera->RenderTextureMetalId(&this->dataPtr->textureId);
   this->dataPtr->lastCamera = _camera;
 
-  this->dataPtr->texture = this->dataPtr->window->createTextureFromNativeObject(
-    QQuickWindow::NativeObjectTexture,
-    static_cast<void *>(&this->dataPtr->textureId),  //
-    0,                                               //
+  this->dataPtr->CreateTexture(
+    &this->dataPtr->textureId,
     QSize(static_cast<int>(_camera->ImageWidth()),
           static_cast<int>(_camera->ImageHeight())));
 }
@@ -229,16 +248,9 @@ void TextureNodeRhiVulkan::PrepareNode()
 
   if (this->dataPtr->newTextureId != nullptr)
   {
-    delete this->dataPtr->texture;
-    this->dataPtr->texture = nullptr;
-
-    this->dataPtr->texture =
-        this->dataPtr->window->createTextureFromNativeObject(
-            QQuickWindow::NativeObjectTexture,
-            static_cast<void*>(&this->dataPtr->newTextureId),
-            VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-            this->dataPtr->newSize);
+    this->dataPtr->CreateTexture(
+      &this->dataPtr->newTextureId, this->dataPtr->newSize);
   }
 }
 }  // namespace gz::gui::plugins
-#endif  // HAVE_QT_VULKAN
+#endif  // GZ_GUI_HAVE_VULKAN