tests/GrSurfaceTest.cpp - Issue 1448873002: Generate list of GPU contexts outside tests

Unified Diff: tests/GrSurfaceTest.cpp

Issue 1448873002: Generate list of GPU contexts outside tests (Closed) Base URL: https://skia.googlesource.com/skia.git@commandbuffer-as-api-01-gpu-test-context-support

Patch Set: make blurtest for all rendering contexts Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: tests/GrSurfaceTest.cpp

diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp

index bc24d1c02a87a33e64b8d98d0813e5a32b6ea107..4b7dbd30de31642c520a7d27928ffd5723a144c0 100644

--- a/tests/GrSurfaceTest.cpp

+++ b/tests/GrSurfaceTest.cpp

@@ -10,7 +10,6 @@

#if SK_SUPPORT_GPU

#include "GrContext.h"

-#include "GrContextFactory.h"

#include "GrGpu.h"

#include "GrRenderTarget.h"

#include "GrTexture.h"

@@ -19,58 +18,55 @@

// Tests that GrSurface::asTexture(), GrSurface::asRenderTarget(), and static upcasting of texture

// and render targets to GrSurface all work as expected.

-DEF_GPUTEST(GrSurface, reporter, factory) {

- GrContext* context = factory->get(GrContextFactory::kNull_GLContextType);

- if (context) {

- GrSurfaceDesc desc;

- desc.fConfig = kSkia8888_GrPixelConfig;

- desc.fFlags = kRenderTarget_GrSurfaceFlag;

- desc.fWidth = 256;

- desc.fHeight = 256;

- desc.fSampleCnt = 0;

- GrSurface* texRT1 = context->textureProvider()->createTexture(desc, false, nullptr, 0);

+DEF_GPUTEST_FOR_NULL_CONTEXT(GrSurface, reporter, context) {

+ GrSurfaceDesc desc;

+ desc.fConfig = kSkia8888_GrPixelConfig;

+ desc.fFlags = kRenderTarget_GrSurfaceFlag;

+ desc.fWidth = 256;

+ desc.fHeight = 256;

+ desc.fSampleCnt = 0;

+ GrSurface* texRT1 = context->textureProvider()->createTexture(desc, false, nullptr, 0);

- REPORTER_ASSERT(reporter, texRT1 == texRT1->asRenderTarget());

- REPORTER_ASSERT(reporter, texRT1 == texRT1->asTexture());

- REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT1->asRenderTarget()) ==

- texRT1->asTexture());

- REPORTER_ASSERT(reporter, texRT1->asRenderTarget() ==

- static_cast<GrSurface*>(texRT1->asTexture()));

- REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT1->asRenderTarget()) ==

- static_cast<GrSurface*>(texRT1->asTexture()));

+ REPORTER_ASSERT(reporter, texRT1 == texRT1->asRenderTarget());

+ REPORTER_ASSERT(reporter, texRT1 == texRT1->asTexture());

+ REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT1->asRenderTarget()) ==

+ texRT1->asTexture());

+ REPORTER_ASSERT(reporter, texRT1->asRenderTarget() ==

+ static_cast<GrSurface*>(texRT1->asTexture()));

+ REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT1->asRenderTarget()) ==

+ static_cast<GrSurface*>(texRT1->asTexture()));

- desc.fFlags = kNone_GrSurfaceFlags;

- GrSurface* tex1 = context->textureProvider()->createTexture(desc, false, nullptr, 0);

- REPORTER_ASSERT(reporter, nullptr == tex1->asRenderTarget());

- REPORTER_ASSERT(reporter, tex1 == tex1->asTexture());

- REPORTER_ASSERT(reporter, static_cast<GrSurface*>(tex1) == tex1->asTexture());

+ desc.fFlags = kNone_GrSurfaceFlags;

+ GrSurface* tex1 = context->textureProvider()->createTexture(desc, false, nullptr, 0);

+ REPORTER_ASSERT(reporter, nullptr == tex1->asRenderTarget());

+ REPORTER_ASSERT(reporter, tex1 == tex1->asTexture());

+ REPORTER_ASSERT(reporter, static_cast<GrSurface*>(tex1) == tex1->asTexture());

- GrBackendObject backendTex = context->getGpu()->createTestingOnlyBackendTexture(

- nullptr, 256, 256, kSkia8888_GrPixelConfig);

+ GrBackendObject backendTex = context->getGpu()->createTestingOnlyBackendTexture(

+ nullptr, 256, 256, kSkia8888_GrPixelConfig);

- GrBackendTextureDesc backendDesc;

- backendDesc.fConfig = kSkia8888_GrPixelConfig;

- backendDesc.fFlags = kRenderTarget_GrBackendTextureFlag;

- backendDesc.fWidth = 256;

- backendDesc.fHeight = 256;

- backendDesc.fSampleCnt = 0;

- backendDesc.fTextureHandle = backendTex;

- GrSurface* texRT2 = context->textureProvider()->wrapBackendTexture(

- backendDesc, kBorrow_GrWrapOwnership);

- REPORTER_ASSERT(reporter, texRT2 == texRT2->asRenderTarget());

- REPORTER_ASSERT(reporter, texRT2 == texRT2->asTexture());

- REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT2->asRenderTarget()) ==

- texRT2->asTexture());

- REPORTER_ASSERT(reporter, texRT2->asRenderTarget() ==

- static_cast<GrSurface*>(texRT2->asTexture()));

- REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT2->asRenderTarget()) ==

- static_cast<GrSurface*>(texRT2->asTexture()));

+ GrBackendTextureDesc backendDesc;

+ backendDesc.fConfig = kSkia8888_GrPixelConfig;

+ backendDesc.fFlags = kRenderTarget_GrBackendTextureFlag;

+ backendDesc.fWidth = 256;

+ backendDesc.fHeight = 256;

+ backendDesc.fSampleCnt = 0;

+ backendDesc.fTextureHandle = backendTex;

+ GrSurface* texRT2 = context->textureProvider()->wrapBackendTexture(

+ backendDesc, kBorrow_GrWrapOwnership);

+ REPORTER_ASSERT(reporter, texRT2 == texRT2->asRenderTarget());

+ REPORTER_ASSERT(reporter, texRT2 == texRT2->asTexture());

+ REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT2->asRenderTarget()) ==

+ texRT2->asTexture());

+ REPORTER_ASSERT(reporter, texRT2->asRenderTarget() ==

+ static_cast<GrSurface*>(texRT2->asTexture()));

+ REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT2->asRenderTarget()) ==

+ static_cast<GrSurface*>(texRT2->asTexture()));

- texRT1->unref();

- texRT2->unref();

- tex1->unref();

- context->getGpu()->deleteTestingOnlyBackendTexture(backendTex);

- }

+ texRT1->unref();

+ texRT2->unref();

+ tex1->unref();

+ context->getGpu()->deleteTestingOnlyBackendTexture(backendTex);

}

#endif

« no previous file with comments | « tests/GrPorterDuffTest.cpp ('k') | tests/GrTextureMipMapInvalidationTest.cpp » ('j') | no next file with comments »