GraphicsContext: simplify active texture handling

Used to be split up into multiple vectors, bitarrays, even hashtables.
In fact, all operations that have to do with active textures are
identified by the respective texture unit. So there should be exactly
one entry for each texture unit that encapsulates all important
information.

Change-Id: Ib1a0502f5b5f05a24516183b7eedf96a418c43be
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index 647db9e47..c1f561a62 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -266,19 +266,19 @@ private:
     QHash<QSurface *, GraphicsHelperInterface*> m_glHelpers;
 
     // active textures, indexed by texture unit
-    QVector<uint> m_activeTextures;
-    QBitArray m_pinnedTextureUnits;
-    QVector<TextureScope> m_textureScopes;
+    struct ActiveTexture {
+        uint textureDna = 0;
+        int score = 0;
+        TextureScope scope = TextureScopeMaterial;
+        bool pinned = false;
+    };
+    QVector<ActiveTexture> m_activeTextures;
 
     // cache some current state, to make sure we don't issue unnecessary GL calls
     int m_currClearStencilValue;
     float m_currClearDepthValue;
     QColor m_currClearColorValue;
 
-    // recency score for all render-textures we've seen. Higher scores
-    // mean more recently used.
-    QHash<uint, int> m_textureScores;
-
     Material* m_material;
     QRectF m_viewport;
     GLuint m_activeFBO;