Reopened: Caching the result of readPixelsSupported

src/gpu/gl/GrGLCaps.cpp

Index: src/gpu/gl/GrGLCaps.cpp
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 4a62c5acaab1ce370545f9b11d991153260d0e3f..d10a2bb93c2756e83f80c5cbf77dfa3ddffb4e94 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -485,7 +485,7 @@ void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const G
     // First check version for support
     if (kGL_GrGLStandard == standard) {
         hasETC1 = hasCompressTex2D &&
-            (version >= GR_GL_VER(4, 3) || 
+            (version >= GR_GL_VER(4, 3) ||
              ctxInfo.hasExtension("GL_ARB_ES3_compatibility"));
     } else {
         hasETC1 = hasCompressTex2D &&
@@ -541,7 +541,7 @@ void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const G
     }
 }
 
-bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
+bool GrGLCaps::doReadPixelsSupported(const GrGLInterface* intf,
                                    GrGLenum format,
                                    GrGLenum type) const {
     if (GR_GL_RGBA == format && GR_GL_UNSIGNED_BYTE == type) {
@@ -570,6 +570,25 @@ bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
     return (GrGLenum)otherFormat == format && (GrGLenum)otherType == type;
 }
 
+bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
+                                   GrGLenum format,
+                                   GrGLenum type,
+                                   GrGLenum currFboFormat) const {
+
+    ReadPixelsSupportedFormatsKey key = {format, type, currFboFormat};
+
+    ReadPixelsSupportedFormats* cachedValue = fReadPixelsSupportedCache.find(key);
+
+    if (cachedValue == NULL) {

[Justin Novosad, 2014/07/03 15:43:51]

Skia style: if (NULL == cachedValue)

[Rémi Piotaix, 2014/07/03 17:48:10]

Done.

+        bool value = doReadPixelsSupported(intf, format, type);
+        cachedValue = new ReadPixelsSupportedFormats(key, value);

[Justin Novosad, 2014/07/03 15:43:51]

This is leaked.

[Rémi Piotaix, 2014/07/03 17:48:10]

Done.

+
+        fReadPixelsSupportedCache.add(cachedValue);
+    }
+
+    return cachedValue->value();
+}
+
 void GrGLCaps::initFSAASupport(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
 
     fMSFBOType = kNone_MSFBOType;
@@ -798,3 +817,17 @@ SkString GrGLCaps::dump() const {
     r.appendf("Drops tile on zero divide: %s\n", (fDropsTileOnZeroDivide ? "YES" : "NO"));
     return r;
 }
+
+//Computes a hash based on the three values in the key struct
+// bits 31------------15---------7---------------0
+//      fFormat(15:0) fType(7:0) fFboFormat(7:0)
+uint32_t GrGLCaps::ReadPixelsSupportedFormats::Hash(const ReadPixelsSupportedFormatsKey& key) {
+    // fFormat has different values like 0x190X or 0x8XXX: 16 bits are required
+    uint32_t hash = ((key.fFormat & 0xFFFF) << 16);
+    // fType is 0x14XX: 8 lower bits are enough
+    hash |= ((key.fType & 0xFF) << 8);
+    // fFboFormat is enum GrPixelConfig which has less than 15 values: 8 bits OK
+    hash |= (key.fFboFormat & 0xFF);
+
+    return hash;
+}