diff options
author | Greg Daniel <egdaniel@google.com> | 2017-04-27 18:48:15 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-27 18:48:19 +0000 |
commit | e3bd422fafc74dd3410c3de24a576635be92c3b4 (patch) | |
tree | 63bc3f6768299f8e4dde996df333ea4022855efe /tests | |
parent | df7e075c74110fcfebdc49ca503684162e118af5 (diff) |
Revert "Plumb the use of GrBackendRenderTarget throughout Skia"
This reverts commit fdd77daedbba3b7c53be74a82fb9fae891b51696.
Reason for revert: Apparently I have a few more build files to update before this can land.
Original change's description:
> Plumb the use of GrBackendRenderTarget throughout Skia
>
> Bug: skia:
> Change-Id: Ib99a58d9552f5c7b8d77c09dcc72fa88326c26aa
> Reviewed-on: https://skia-review.googlesource.com/14148
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I984e1909870182474c4c3cce257f01b6a9d8581f
Reviewed-on: https://skia-review.googlesource.com/14531
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ProxyConversionTest.cpp | 18 | ||||
-rw-r--r-- | tests/ProxyTest.cpp | 17 | ||||
-rw-r--r-- | tests/VkWrapTests.cpp | 20 |
3 files changed, 33 insertions, 22 deletions
diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp index 167cc4b10d..a041d68c2b 100644 --- a/tests/ProxyConversionTest.cpp +++ b/tests/ProxyConversionTest.cpp @@ -10,7 +10,6 @@ #include "Test.h" #if SK_SUPPORT_GPU -#include "GrBackendSurface.h" #include "GrRenderTargetProxy.h" #include "GrResourceProvider.h" #include "GrSurfaceProxy.h" @@ -19,12 +18,16 @@ static sk_sp<GrSurfaceProxy> make_wrapped_FBO0(GrResourceProvider* provider, skiatest::Reporter* reporter, const GrSurfaceDesc& desc) { - GrGLFramebufferInfo fboInfo; - fboInfo.fFBOID = 0; - GrBackendRenderTarget backendRT(desc.fWidth, desc.fHeight, desc.fSampleCnt, 8, - desc.fConfig, fboInfo); - - sk_sp<GrRenderTarget> defaultFBO(provider->wrapBackendRenderTarget(backendRT, desc.fOrigin)); + GrBackendRenderTargetDesc backendDesc; + backendDesc.fWidth = desc.fWidth; + backendDesc.fHeight = desc.fHeight; + backendDesc.fConfig = desc.fConfig; + backendDesc.fOrigin = desc.fOrigin; + backendDesc.fSampleCnt = desc.fSampleCnt; + backendDesc.fStencilBits = 8; + backendDesc.fRenderTargetHandle = 0; + + sk_sp<GrRenderTarget> defaultFBO(provider->wrapBackendRenderTarget(backendDesc)); SkASSERT(!defaultFBO->asTexture()); return GrSurfaceProxy::MakeWrapped(std::move(defaultFBO)); @@ -59,7 +62,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyConversionTest, reporter, ctxInfo desc.fWidth = 64; desc.fHeight = 64; desc.fConfig = kRGBA_8888_GrPixelConfig; - desc.fOrigin = kBottomLeft_GrSurfaceOrigin; if (kOpenGL_GrBackend == ctxInfo.backend()) { // External on-screen render target. diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 6553b4e94f..db407d791f 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -10,7 +10,6 @@ #include "Test.h" #if SK_SUPPORT_GPU -#include "GrBackendSurface.h" #include "GrRenderTargetPriv.h" #include "GrRenderTargetProxy.h" #include "GrResourceProvider.h" @@ -21,7 +20,7 @@ static void check_surface(skiatest::Reporter* reporter, GrSurfaceProxy* proxy, GrSurfaceOrigin origin, - int width, int height, + int width, int height, GrPixelConfig config, const GrGpuResource::UniqueID& uniqueID, SkBudgeted budgeted) { @@ -229,13 +228,17 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { // External on-screen render target. if (renderable && kOpenGL_GrBackend == ctxInfo.backend()) { - GrGLFramebufferInfo fboInfo; - fboInfo.fFBOID = 0; - GrBackendRenderTarget backendRT(kWidthHeight, kWidthHeight, numSamples, 8, - config, fboInfo); + GrBackendRenderTargetDesc backendDesc; + backendDesc.fWidth = kWidthHeight; + backendDesc.fHeight = kWidthHeight; + backendDesc.fConfig = config; + backendDesc.fOrigin = origin; + backendDesc.fSampleCnt = numSamples; + backendDesc.fStencilBits = 8; + backendDesc.fRenderTargetHandle = 0; sk_sp<GrRenderTarget> defaultFBO( - provider->wrapBackendRenderTarget(backendRT, origin)); + provider->wrapBackendRenderTarget(backendDesc)); sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(defaultFBO)); check_surface(reporter, sProxy.get(), origin, diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp index 0ae3402da2..44b5e72bc9 100644 --- a/tests/VkWrapTests.cpp +++ b/tests/VkWrapTests.cpp @@ -93,24 +93,30 @@ void wrap_rt_test(skiatest::Reporter* reporter, GrContext* context) { true); const GrVkImageInfo* backendTex = reinterpret_cast<const GrVkImageInfo*>(backendObj); - GrBackendRenderTarget backendRT(kW, kH, 0, 0, *backendTex); - - sk_sp<GrRenderTarget> rt = gpu->wrapBackendRenderTarget(backendRT, kTopLeft_GrSurfaceOrigin); + // check basic borrowed creation + GrBackendRenderTargetDesc desc; + desc.fWidth = kW; + desc.fHeight = kH; + desc.fConfig = kPixelConfig; + desc.fOrigin = kTopLeft_GrSurfaceOrigin; + desc.fSampleCnt = 0; + desc.fStencilBits = 0; + desc.fRenderTargetHandle = backendObj; + sk_sp<GrRenderTarget> rt = gpu->wrapBackendRenderTarget(desc); REPORTER_ASSERT(reporter, rt); // image is null GrVkImageInfo backendCopy = *backendTex; backendCopy.fImage = VK_NULL_HANDLE; - GrBackendRenderTarget backendRT2(kW, kH, 0, 0, backendCopy); - rt = gpu->wrapBackendRenderTarget(backendRT2, kTopLeft_GrSurfaceOrigin); + desc.fRenderTargetHandle = (GrBackendObject)&backendCopy; + rt = gpu->wrapBackendRenderTarget(desc); REPORTER_ASSERT(reporter, !rt); // alloc is null backendCopy.fImage = backendTex->fImage; backendCopy.fAlloc = { VK_NULL_HANDLE, 0, 0, 0 }; // can wrap null alloc - GrBackendRenderTarget backendRT3(kW, kH, 0, 0, backendCopy); - rt = gpu->wrapBackendRenderTarget(backendRT3, kTopLeft_GrSurfaceOrigin); + rt = gpu->wrapBackendRenderTarget(desc); REPORTER_ASSERT(reporter, rt); // When we wrapBackendRenderTarget it is always borrowed, so we must make sure to free the |