diff options
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 7665c2a4ee..10fbabbe60 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -8,6 +8,7 @@ #include "GrGLGpu.h" #include "../private/GrGLSL.h" +#include "GrBackendSurface.h" #include "GrFixedClip.h" #include "GrGLBuffer.h" #include "GrGLGpuCommandBuffer.h" @@ -511,15 +512,18 @@ static GrSurfaceOrigin resolve_origin(GrSurfaceOrigin origin, bool renderTarget) } } -sk_sp<GrTexture> GrGLGpu::onWrapBackendTexture(const GrBackendTextureDesc& desc, +sk_sp<GrTexture> GrGLGpu::onWrapBackendTexture(const GrBackendTexture& backendTex, + GrSurfaceOrigin origin, + GrBackendTextureFlags flags, + int sampleCnt, GrWrapOwnership ownership) { - const GrGLTextureInfo* info = reinterpret_cast<const GrGLTextureInfo*>(desc.fTextureHandle); + const GrGLTextureInfo* info = backendTex.getGLTextureInfo(); if (!info || !info->fID) { return nullptr; } - // next line relies on GrBackendTextureDesc's flags matching GrTexture's - bool renderTarget = SkToBool(desc.fFlags & kRenderTarget_GrBackendTextureFlag); + // next line relies on GrBackendTextureFlags matching GrTexture's + bool renderTarget = SkToBool(flags & kRenderTarget_GrBackendTextureFlag); SkASSERT(!renderTarget || kAdoptAndCache_GrWrapOwnership != ownership); // Not supported GrGLTexture::IDDesc idDesc; @@ -543,7 +547,7 @@ sk_sp<GrTexture> GrGLGpu::onWrapBackendTexture(const GrBackendTextureDesc& desc, // Sample count is interpreted to mean the number of samples that Gr code should allocate // for a render buffer that resolves to the texture. We don't support MSAA textures. - if (desc.fSampleCnt && !renderTarget) { + if (sampleCnt && !renderTarget) { return nullptr; } @@ -554,19 +558,19 @@ sk_sp<GrTexture> GrGLGpu::onWrapBackendTexture(const GrBackendTextureDesc& desc, } GrSurfaceDesc surfDesc; - surfDesc.fFlags = (GrSurfaceFlags) desc.fFlags; - surfDesc.fWidth = desc.fWidth; - surfDesc.fHeight = desc.fHeight; - surfDesc.fConfig = desc.fConfig; - surfDesc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount()); + surfDesc.fFlags = (GrSurfaceFlags) flags; + surfDesc.fWidth = backendTex.width(); + surfDesc.fHeight = backendTex.height(); + surfDesc.fConfig = backendTex.config(); + surfDesc.fSampleCnt = SkTMin(sampleCnt, this->caps()->maxSampleCount()); // FIXME: this should be calling resolve_origin(), but Chrome code is currently // assuming the old behaviour, which is that backend textures are always // BottomLeft, even for non-RT's. Once Chrome is fixed, change this to: // glTexDesc.fOrigin = resolve_origin(desc.fOrigin, renderTarget); - if (kDefault_GrSurfaceOrigin == desc.fOrigin) { + if (kDefault_GrSurfaceOrigin == origin) { surfDesc.fOrigin = kBottomLeft_GrSurfaceOrigin; } else { - surfDesc.fOrigin = desc.fOrigin; + surfDesc.fOrigin = origin; } if (renderTarget) { @@ -603,8 +607,10 @@ sk_sp<GrRenderTarget> GrGLGpu::onWrapBackendRenderTarget(const GrBackendRenderTa return GrGLRenderTarget::MakeWrapped(this, desc, idDesc, wrapDesc.fStencilBits); } -sk_sp<GrRenderTarget> GrGLGpu::onWrapBackendTextureAsRenderTarget(const GrBackendTextureDesc& desc){ - const GrGLTextureInfo* info = reinterpret_cast<const GrGLTextureInfo*>(desc.fTextureHandle); +sk_sp<GrRenderTarget> GrGLGpu::onWrapBackendTextureAsRenderTarget(const GrBackendTexture& tex, + GrSurfaceOrigin origin, + int sampleCnt) { + const GrGLTextureInfo* info = tex.getGLTextureInfo(); if (!info || !info->fID) { return nullptr; } @@ -621,19 +627,19 @@ sk_sp<GrRenderTarget> GrGLGpu::onWrapBackendTextureAsRenderTarget(const GrBacken } GrSurfaceDesc surfDesc; - surfDesc.fFlags = (GrSurfaceFlags) desc.fFlags; - surfDesc.fWidth = desc.fWidth; - surfDesc.fHeight = desc.fHeight; - surfDesc.fConfig = desc.fConfig; - surfDesc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount()); + surfDesc.fFlags = kRenderTarget_GrSurfaceFlag; + surfDesc.fWidth = tex.width(); + surfDesc.fHeight = tex.height(); + surfDesc.fConfig = tex.config(); + surfDesc.fSampleCnt = SkTMin(sampleCnt, this->caps()->maxSampleCount()); // FIXME: this should be calling resolve_origin(), but Chrome code is currently // assuming the old behaviour, which is that backend textures are always // BottomLeft, even for non-RT's. Once Chrome is fixed, change this to: // glTexDesc.fOrigin = resolve_origin(desc.fOrigin, renderTarget); - if (kDefault_GrSurfaceOrigin == desc.fOrigin) { + if (kDefault_GrSurfaceOrigin == origin) { surfDesc.fOrigin = kBottomLeft_GrSurfaceOrigin; } else { - surfDesc.fOrigin = desc.fOrigin; + surfDesc.fOrigin = origin; } GrGLRenderTarget::IDDesc rtIDDesc; |