AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of Make stencils be attachable to render targets created via SkSurface::MakeFromBackendTextureAsRender… (patchset #5 id:80001 of https://codereview.chromium.org/1924183003/ )

Browse Source 
Reason for revert:
Breaking the DEPS roll.

Also seems to be causing failure in DM on some Windows bots:
c:\0\build\slave\workdir\build\skia\tests\surfacetest.cpp:963	kShapeColor == bitmap.getColor(kW / 2, kH / 2)

Original issue's description:
> Make stencils be attachable to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget
>
> This is a regression from "Refactor to separate backend object lifecycle
> and GpuResource budget decision".
>
> GrGLRenderTarget::CreateWrapped creates only render targets that wrap
> the FBO.
> GrGLRenderTargetTexture::CreateWrapped creates render targets that
> wrap the texture.
>
> Use the latter as the implementation for
> SkSurface::MakeFromBackendTextureAsRenderTarget.
>
> The test contains disabled code. The
> MakeFromBackendTextureAsRenderTarget does not copy the existing texture
> contents to the FBO render buffer.
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1924183003
>
> Committed: https://skia.googlesource.com/skia/+/fe635fd76bbc375d527d1884af23cc617ca364ee

TBR=bsalomon@google.com,kkinnunen@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/1931293003
This commit is contained in:
benjaminwagner 2016-04-29 11:17:07 -07:00 committed by Commit bot
parent a2ffa98323
commit 817fed3cb7
2 changed files with 8 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gpu/gl/GrGLGpu.cpp
View File

@ -723,20 +723,19 @@ GrRenderTarget* GrGLGpu::onWrapBackendTextureAsRenderTarget(const GrBackendTextu
}
#endif
GrGLTexture::IDDesc idDesc;
idDesc.fOwnership = GrBackendObjectOwnership::kBorrowed;
GrGLTextureInfo texInfo;
GrSurfaceDesc surfDesc;
#ifdef SK_IGNORE_GL_TEXTURE_TARGET
idDesc.fInfo.fID = static_cast<GrGLuint>(desc.fTextureHandle);
texInfo.fID = static_cast<GrGLuint>(desc.fTextureHandle);
// We only support GL_TEXTURE_2D at the moment.
idDesc.fInfo.fTarget = GR_GL_TEXTURE_2D;
texInfo.fTarget = GR_GL_TEXTURE_2D;
#else
idDesc.fInfo = *info;
texInfo = *info;
#endif
if (GR_GL_TEXTURE_RECTANGLE != idDesc.fInfo.fTarget &&
GR_GL_TEXTURE_2D != idDesc.fInfo.fTarget) {
if (GR_GL_TEXTURE_RECTANGLE != texInfo.fTarget &&
GR_GL_TEXTURE_2D != texInfo.fTarget) {
// Only texture rectangle and texture 2d are supported. We do not check whether texture
// rectangle is supported by Skia - if the caller provided us with a texture rectangle,
// we assume the necessary support exists.
@ -759,10 +758,10 @@ GrRenderTarget* GrGLGpu::onWrapBackendTextureAsRenderTarget(const GrBackendTextu
}
GrGLRenderTarget::IDDesc rtIDDesc;
if (!this->createRenderTargetObjects(surfDesc, idDesc.fInfo, &rtIDDesc)) {
if (!this->createRenderTargetObjects(surfDesc, texInfo, &rtIDDesc)) {
return nullptr;
}
return GrGLTextureRenderTarget::CreateWrapped(this, surfDesc, idDesc, rtIDDesc);
return GrGLRenderTarget::CreateWrapped(this, surfDesc, rtIDDesc, 0);
}
////////////////////////////////////////////////////////////////////////////////

71
tests/SurfaceTest.cpp
View File

@ -900,74 +900,3 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SurfaceClear_Gpu, reporter, ctxInfo) {
}
}
#endif
#if SK_SUPPORT_GPU
DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SurfaceWrappedTextureAsRenderTarget, reporter, ctxInfo) {
GrGpu* gpu = ctxInfo.fGrContext->getGpu();
if (!gpu) {
return;
}
// Validate that we can draw paths to a canvas of a surface created with
// SkSurface::MakeFromBackendTextureAsRenderTarget. The code intends to enforce the use of
// stencil buffer. The original bug prevented the creation of stencil buffer, causing an assert
// while drawing paths.
static const int kW = 100;
static const int kH = 100;
static const uint32_t kOrigColor = SK_ColorRED;
const SkColor kShapeColor = SK_ColorGREEN;
SkPath clipPath;
clipPath.quadTo(SkIntToScalar(kW), SkIntToScalar(0), SkIntToScalar(kW), SkIntToScalar(kH));
clipPath.lineTo(SkIntToScalar(0), SkIntToScalar(kH));
clipPath.lineTo(SkIntToScalar(0), SkIntToScalar(0));
clipPath.close();
SkPath path;
path.quadTo(SkIntToScalar(0), SkIntToScalar(kH), SkIntToScalar(kW), SkIntToScalar(kH));
path.lineTo(SkIntToScalar(kW), SkIntToScalar(0));
path.lineTo(SkIntToScalar(0), SkIntToScalar(0));
path.close();
SkPaint paint;
paint.setAntiAlias(true);
paint.setColor(kShapeColor);
SkImageInfo bitmapInfo = SkImageInfo::Make(kW, kH, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
for (int sampleCnt : {0, 4, 8}) {
SkBitmap bitmap;
bitmap.allocPixels(bitmapInfo);
bitmap.eraseColor(kOrigColor);
GrBackendObject texHandle = gpu->createTestingOnlyBackendTexture(bitmap.getPixels(), kW, kH,
kRGBA_8888_GrPixelConfig);
GrBackendTextureDesc wrappedDesc;
wrappedDesc.fConfig = kRGBA_8888_GrPixelConfig;
wrappedDesc.fWidth = kW;
wrappedDesc.fHeight = kH;
wrappedDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
wrappedDesc.fFlags = kRenderTarget_GrBackendTextureFlag;
wrappedDesc.fTextureHandle = texHandle;
wrappedDesc.fSampleCnt = sampleCnt;
sk_sp<SkSurface> surface(
SkSurface::MakeFromBackendTextureAsRenderTarget(ctxInfo.fGrContext, wrappedDesc,
nullptr));
if (!surface) {
continue;
}
surface->getCanvas()->clipPath(clipPath, SkRegion::kIntersect_Op, true);
surface->getCanvas()->drawPath(path, paint);
SkAssertResult(surface->readPixels(bitmapInfo, bitmap.getPixels(),
bitmap.rowBytes(), 0, 0));
// Ensure that the shape color ends up to the surface.
REPORTER_ASSERT(reporter, kShapeColor == bitmap.getColor(kW / 2, kH / 2));
SkColor backgroundColor = bitmap.getColor(kW - 1, 0);
if (!sampleCnt) {
// Ensure that the original texture color is preserved in pixels that aren't rendered to
// via the surface.
REPORTER_ASSERT(reporter, kOrigColor == backgroundColor);
}
gpu->deleteTestingOnlyBackendTexture(texHandle);
}
}
#endif