diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrSurface.h | 11 | ||||
| -rw-r--r-- | include/private/GrTextureProxy.h | 10 | ||||
| -rw-r--r-- | include/private/GrTypesPriv.h | 16 |
3 files changed, 32 insertions, 5 deletions
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h index 3a7294b26e..f3771a74e2 100644 --- a/include/gpu/GrSurface.h +++ b/include/gpu/GrSurface.h @@ -63,9 +63,20 @@ public: GrMipMapped, bool useNextPow2 = false); protected: + void setDoesNotSupportMipMaps() { + SkASSERT(this->asTexture()); + fSurfaceFlags |= GrInternalSurfaceFlags::kDoesNotSupportMipMaps; + } + bool doesNotSupportMipMaps() const { + return fSurfaceFlags & GrInternalSurfaceFlags::kDoesNotSupportMipMaps; + } + void setIsGLTextureRectangleOrExternal() { SkASSERT(this->asTexture()); fSurfaceFlags |= GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal; + // If we are a GL rectangle or external texture, it also means that we do not support + // generating mip maps. + this->setDoesNotSupportMipMaps(); } bool isGLTextureRectangleOrExternal() const { return fSurfaceFlags & GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal; diff --git a/include/private/GrTextureProxy.h b/include/private/GrTextureProxy.h index fc7f1c54a7..8bbdbf2959 100644 --- a/include/private/GrTextureProxy.h +++ b/include/private/GrTextureProxy.h @@ -100,8 +100,18 @@ protected: sk_sp<GrSurface> createSurface(GrResourceProvider*) const override; + void setDoesNotSupportMipMaps() { + fSurfaceFlags |= GrInternalSurfaceFlags::kDoesNotSupportMipMaps; + } + bool doesNotSupportMipMaps() const { + return fSurfaceFlags & GrInternalSurfaceFlags::kDoesNotSupportMipMaps; + } + void setIsGLTextureRectangleOrExternal() { fSurfaceFlags |= GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal; + // If we are a GL rectangle or external texture, it also means that we do not support + // generating mip maps. + this->setDoesNotSupportMipMaps(); } bool isGLTextureRectangleOrExternal() const { return fSurfaceFlags & GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal; diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h index 32a13f2358..84461836f0 100644 --- a/include/private/GrTypesPriv.h +++ b/include/private/GrTypesPriv.h @@ -868,14 +868,20 @@ enum class GrInternalSurfaceFlags { // Texture-only flags + // This flag is set when the internal texture target doesn't support mipmaps (e.g., + // external and rectangle textures). Note that Ganesh does not internally + // create resources with this limitation - this flag will only appear on resources passed + // into Ganesh. + kDoesNotSupportMipMaps = 1 << 1, + // This flag is for GL only. It says that the GL texture we will use has a target which is // either GL_TEXTURE_RECTANGLE or GL_GL_TEXTURE_EXTERNAL. We use this information to make // decisions about various rendering capabilites (e.g. is clamp the only supported wrap mode). // Note: Ganesh does not internally create these types of textures so they will only occur on // resources passed into Ganesh. - kIsGLTextureRectangleOrExternal = 1 << 1, + kIsGLTextureRectangleOrExternal = 1 << 2, - kTextureMask = kIsGLTextureRectangleOrExternal, + kTextureMask = kDoesNotSupportMipMaps | kIsGLTextureRectangleOrExternal, // RT-only @@ -885,17 +891,17 @@ enum class GrInternalSurfaceFlags { // this is disabled for FBO0 // but, otherwise, is enabled whenever MSAA is enabled and GrCaps reports mixed samples // are supported - kMixedSampled = 1 << 2, + kMixedSampled = 1 << 3, // For internal resources: // this is enabled whenever GrCaps reports window rect support // For wrapped resources1 // this is disabled for FBO0 // but, otherwise, is enabled whenever GrCaps reports window rect support - kWindowRectsSupport = 1 << 3, + kWindowRectsSupport = 1 << 4, // This flag is for use with GL only. It tells us that the internal render target wraps FBO 0. - kGLRTFBOIDIs0 = 1 << 4, + kGLRTFBOIDIs0 = 1 << 5, kRenderTargetMask = kMixedSampled | kWindowRectsSupport | kGLRTFBOIDIs0, }; |