rhi: Remove QRhiSrb data getters

This is for internal use, QRhiShaderResourceBinding does not need
to have the data() getters. The backends can use any internal means
to access this, no need to have the getters in the frontend just for
that.

Now, Qt Quick 3D has a special case of accessing this, hence keeping
the two getters for now, to be removed in a follow up once that repo
updates.

While we are at it, share and reuse the sorting function.

Change-Id: Ia2308af79863c72ca65024ce6c00531d0256a2cb
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/gui/rhi/qrhi_p.h b/src/gui/rhi/qrhi_p.h
index caac76a6c2..e254eafd2e 100644
--- a/src/gui/rhi/qrhi_p.h
+++ b/src/gui/rhi/qrhi_p.h
@@ -409,6 +409,7 @@ public:
         }
     };
 
+    // ### remove these two once Qt Quick 3D is updated
     Data *data() { return &d; }
     const Data *data() const { return &d; }
 
@@ -420,13 +421,14 @@ public:
                                            Output dst)
     {
         while (first != last) {
-            dst = first->data()->serialize(dst);
+            dst = first->d.serialize(dst);
             ++first;
         }
     }
 
 private:
     Data d;
+    friend class QRhiImplementation;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiShaderResourceBinding::StageFlags)