diff options
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 30 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.h | 50 | ||||
-rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 14 |
3 files changed, 82 insertions, 12 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 8f2d4c1297..89d873bdd8 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -48,6 +48,8 @@ void GrGLCaps::reset() { fIsCoreProfile = false; fFullClearIsFree = false; fDropsTileOnZeroDivide = false; + + fReadPixelsSupportedCache.reset(); } GrGLCaps::GrGLCaps(const GrGLCaps& caps) : GrDrawTargetCaps() { @@ -504,7 +506,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 && @@ -560,9 +562,9 @@ void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const G } } -bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf, - GrGLenum format, - GrGLenum type) const { +bool GrGLCaps::doReadPixelsSupported(const GrGLInterface* intf, + GrGLenum format, + GrGLenum type) const { if (GR_GL_RGBA == format && GR_GL_UNSIGNED_BYTE == type) { // ES 2 guarantees this format is supported return true; @@ -589,6 +591,26 @@ 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 { + + ReadPixelsSupportedFormats::Key key = {format, type, currFboFormat}; + + ReadPixelsSupportedFormats* cachedValue = fReadPixelsSupportedCache.find(key); + + if (NULL == cachedValue) { + bool value = doReadPixelsSupported(intf, format, type); + ReadPixelsSupportedFormats newValue(key, value); + fReadPixelsSupportedCache.add(newValue); + + return newValue.value(); + } + + return cachedValue->value(); +} + void GrGLCaps::initFSAASupport(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) { fMSFBOType = kNone_MSFBOType; diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h index ccf04fd7ba..2d391b122c 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/gl/GrGLCaps.h @@ -11,8 +11,9 @@ #include "GrDrawTargetCaps.h" #include "GrGLStencilBuffer.h" +#include "SkChecksum.h" +#include "SkTHashCache.h" #include "SkTArray.h" -#include "SkTDArray.h" class GrGLContextInfo; @@ -253,7 +254,8 @@ public: /// Does ReadPixels support the provided format/type combo? bool readPixelsSupported(const GrGLInterface* intf, GrGLenum format, - GrGLenum type) const; + GrGLenum type, + GrGLenum currFboFormat) const; bool isCoreProfile() const { return fIsCoreProfile; } @@ -324,6 +326,10 @@ private: void initConfigRenderableTable(const GrGLContextInfo&); void initConfigTexturableTable(const GrGLContextInfo&, const GrGLInterface*); + bool doReadPixelsSupported(const GrGLInterface* intf, + GrGLenum format, + GrGLenum type) const; + // tracks configs that have been verified to pass the FBO completeness when // used as a color attachment VerifiedColorConfigs fVerifiedColorConfigs; @@ -364,6 +370,46 @@ private: bool fFullClearIsFree : 1; bool fDropsTileOnZeroDivide : 1; + class ReadPixelsSupportedFormats { + public: + struct Key { + GrGLenum fFormat; + GrGLenum fType; + GrGLenum fFboFormat; + + bool operator==(const Key& rhs) const { + return fFormat == rhs.fFormat + && fType == rhs.fType + && fFboFormat == rhs.fFboFormat; + } + + uint32_t getHash() const { + return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(this), sizeof(*this)); + } + }; + + ReadPixelsSupportedFormats(Key key, bool value) : fKey(key), fValue(value) { + } + + static const Key& GetKey(const ReadPixelsSupportedFormats& element) { + return element.fKey; + } + + static uint32_t Hash(const Key& key) { + return key.getHash(); + } + + bool value() const { + return fValue; + } + private: + Key fKey; + bool fValue; + }; + + mutable SkTHashCache<ReadPixelsSupportedFormats, + ReadPixelsSupportedFormats::Key> fReadPixelsSupportedCache; + typedef GrDrawTargetCaps INHERITED; }; diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index eddccc39f6..3eca3d6247 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -170,8 +170,6 @@ GrGpuGL::~GrGpuGL() { } /////////////////////////////////////////////////////////////////////////////// - - GrPixelConfig GrGpuGL::preferredReadPixelsConfig(GrPixelConfig readConfig, GrPixelConfig surfaceConfig) const { if (GR_GL_RGBA_8888_PIXEL_OPS_SLOW && kRGBA_8888_GrPixelConfig == readConfig) { @@ -182,9 +180,13 @@ GrPixelConfig GrGpuGL::preferredReadPixelsConfig(GrPixelConfig readConfig, // Mesa 3D takes a slow path on when reading back BGRA from an RGBA surface and vice-versa. // Perhaps this should be guarded by some compiletime or runtime check. return surfaceConfig; - } else if (readConfig == kBGRA_8888_GrPixelConfig && - !this->glCaps().readPixelsSupported(this->glInterface(), - GR_GL_BGRA, GR_GL_UNSIGNED_BYTE)) { + } else if (readConfig == kBGRA_8888_GrPixelConfig + && this->glCaps().readPixelsSupported( + this->glInterface(), + GR_GL_BGRA, + GR_GL_UNSIGNED_BYTE, + surfaceConfig + )) { return kRGBA_8888_GrPixelConfig; } else { return readConfig; @@ -713,7 +715,7 @@ bool GrGpuGL::uploadTexData(const GrGLTexture::Desc& desc, } // TODO: This function is using a lot of wonky semantics like, if width == -1 -// then set width = desc.fWdith ... blah. A better way to do it might be to +// then set width = desc.fWdith ... blah. A better way to do it might be to // create a CompressedTexData struct that takes a desc/ptr and figures out // the proper upload semantics. Then users can construct this function how they // see fit if they want to go against the "standard" way to do it. |