diff options
Diffstat (limited to 'src/gpu/gl/GrGLCaps.h')
-rw-r--r-- | src/gpu/gl/GrGLCaps.h | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h index 24bf83afbb..ccf04fd7ba 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/gl/GrGLCaps.h @@ -13,7 +13,6 @@ #include "GrGLStencilBuffer.h" #include "SkTArray.h" #include "SkTDArray.h" -#include "SkTDynamicHash.h" class GrGLContextInfo; @@ -254,8 +253,7 @@ public: /// Does ReadPixels support the provided format/type combo? bool readPixelsSupported(const GrGLInterface* intf, GrGLenum format, - GrGLenum type, - GrGLenum currFboFormat) const; + GrGLenum type) const; bool isCoreProfile() const { return fIsCoreProfile; } @@ -326,10 +324,6 @@ 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; @@ -370,38 +364,6 @@ private: bool fFullClearIsFree : 1; bool fDropsTileOnZeroDivide : 1; - struct ReadPixelsSupportedFormatsKey { - GrGLenum fFormat; - GrGLenum fType; - GrGLenum fFboFormat; - - bool operator==(const ReadPixelsSupportedFormatsKey& rhs) const { - return fFormat == rhs.fFormat - && fType == rhs.fType - && fFboFormat == rhs.fFboFormat; - } - }; - - class ReadPixelsSupportedFormats { - public: - ReadPixelsSupportedFormats(ReadPixelsSupportedFormatsKey key, - bool value) - :fKey(key), fValue(value) { - } - - static const ReadPixelsSupportedFormatsKey& GetKey(const ReadPixelsSupportedFormats& element) { - return element.fKey; - } - static uint32_t Hash(const ReadPixelsSupportedFormatsKey&); - - bool value() const { return fValue; } - private: - ReadPixelsSupportedFormatsKey fKey; - bool fValue; - }; - - mutable SkTDynamicHash<ReadPixelsSupportedFormats, ReadPixelsSupportedFormatsKey> fReadPixelsSupportedCache; - typedef GrDrawTargetCaps INHERITED; }; |