Remove OpenGL dependency from QSGTexture

The QSGTexture API is now clean, the OpenGL-specific functions are
removed.

Docs are to be updated in a separate patch.

QSGPlainTexture, and a number of texture related places have to follow
suit.

The OpenGL atlas texture implementation is now removed.

Task-number: QTBUG-84717
Task-number: QTBUG-84623
Change-Id: I1aab3b8b9145bb74ad39ef836ce540fc851292c5
Reviewed-by: Andy Nichols <[email protected]>

4 files changed, 0 insertions, 23 deletions

diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp
index 0d599209b7..35d84a2d7e 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp
@@ -65,11 +65,6 @@ QSGSoftwareLayer::~QSGSoftwareLayer()
     invalidated();
 }
 
-int QSGSoftwareLayer::textureId() const
-{
-    return 0;
-}
-
 qint64 QSGSoftwareLayer::comparisonKey() const
 {
     return 0;
@@ -90,10 +85,6 @@ bool QSGSoftwareLayer::hasMipmaps() const
     return false;
 }
 
-void QSGSoftwareLayer::bind()
-{
-}
-
 bool QSGSoftwareLayer::updateTexture()
 {
     bool doGrab = (m_live || m_grab) && m_dirtyTexture;
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h
index c1b5686d0a..387e6e9eb8 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h
@@ -71,11 +71,9 @@ public:
     // QSGTexture interface
 public:
     qint64 comparisonKey() const override;
-    int textureId() const override;
     QSize textureSize() const override;
     bool hasAlphaChannel() const override;
     bool hasMipmaps() const override;
-    void bind() override;
 
     // QSGDynamicTexture interface
 public:
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture.cpp
index 0812290def..16bccb073e 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture.cpp
@@ -60,11 +60,6 @@ QSGSoftwarePixmapTexture::QSGSoftwarePixmapTexture(const QPixmap &pixmap)
 {
 }
 
-int QSGSoftwarePixmapTexture::textureId() const
-{
-    return 0;
-}
-
 QSize QSGSoftwarePixmapTexture::textureSize() const
 {
     return m_pixmap.size();
@@ -80,11 +75,6 @@ bool QSGSoftwarePixmapTexture::hasMipmaps() const
     return false;
 }
 
-void QSGSoftwarePixmapTexture::bind()
-{
-    Q_UNREACHABLE();
-}
-
 qint64 QSGSoftwarePixmapTexture::comparisonKey() const
 {
     return 0;
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture_p.h
index 801d33c091..96473f280c 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaptexture_p.h
@@ -65,11 +65,9 @@ public:
     QSGSoftwarePixmapTexture(const QPixmap &pixmap);
 
     qint64 comparisonKey() const override;
-    int textureId() const override;
     QSize textureSize() const override;
     bool hasAlphaChannel() const override;
     bool hasMipmaps() const override;
-    void bind() override;
 
     const QPixmap &pixmap() const { return m_pixmap; }