aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2014-09-29 14:20:11 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-09-29 14:20:11 -0700
commitc0eb9b9818462471f5fc1c47fa549c6052d8bbae (patch)
tree9da0008e6fe68fbe2010ad14f5e6c54c7fa5008b /tests
parentc5e15a1afab2621e860a251c3fcf5917867ad49f (diff)
Make "priv" classes for GrTexure and GrSurface.
R=robertphillips@google.com, egdaniel@google.com, joshualitt@google.com, joshualitt@chromium.org Author: bsalomon@google.com Review URL: https://codereview.chromium.org/596053002
Diffstat (limited to 'tests')
-rw-r--r--tests/GrSurfaceTest.cpp29
1 files changed, 16 insertions, 13 deletions
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index a2ed62928e..285e9e8ad8 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -11,6 +11,7 @@
#include "GrContextFactory.h"
#include "GrRenderTarget.h"
#include "GrTexture.h"
+#include "GrSurfacePriv.h"
#include "SkTypes.h"
#include "Test.h"
@@ -28,14 +29,14 @@ DEF_GPUTEST(GrSurface, reporter, factory) {
desc.fFlags = kNone_GrTextureFlags;
GrSurface* tex1 = context->createUncachedTexture(desc, NULL, 0);
- REPORTER_ASSERT(reporter, texRT1->isSameAs(texRT1));
- REPORTER_ASSERT(reporter, texRT1->isSameAs(texRT1->asRenderTarget()));
- REPORTER_ASSERT(reporter, texRT1->asRenderTarget()->isSameAs(texRT1));
- REPORTER_ASSERT(reporter, !texRT2->isSameAs(texRT1));
- REPORTER_ASSERT(reporter, !texRT2->asRenderTarget()->isSameAs(texRT1));
- REPORTER_ASSERT(reporter, !texRT2->isSameAs(texRT1->asRenderTarget()));
- REPORTER_ASSERT(reporter, !texRT2->isSameAs(tex1));
- REPORTER_ASSERT(reporter, !texRT2->asRenderTarget()->isSameAs(tex1));
+ REPORTER_ASSERT(reporter, texRT1->surfacePriv().isSameAs(texRT1));
+ REPORTER_ASSERT(reporter, texRT1->surfacePriv().isSameAs(texRT1->asRenderTarget()));
+ REPORTER_ASSERT(reporter, texRT1->asRenderTarget()->surfacePriv().isSameAs(texRT1));
+ REPORTER_ASSERT(reporter, !texRT2->surfacePriv().isSameAs(texRT1));
+ REPORTER_ASSERT(reporter, !texRT2->asRenderTarget()->surfacePriv().isSameAs(texRT1));
+ REPORTER_ASSERT(reporter, !texRT2->surfacePriv().isSameAs(texRT1->asRenderTarget()));
+ REPORTER_ASSERT(reporter, !texRT2->surfacePriv().isSameAs(tex1));
+ REPORTER_ASSERT(reporter, !texRT2->asRenderTarget()->surfacePriv().isSameAs(tex1));
GrBackendTextureDesc backendDesc;
backendDesc.fConfig = kSkia8888_GrPixelConfig;
@@ -45,11 +46,13 @@ DEF_GPUTEST(GrSurface, reporter, factory) {
backendDesc.fSampleCnt = 0;
backendDesc.fTextureHandle = 5;
GrSurface* externalTexRT = context->wrapBackendTexture(backendDesc);
- REPORTER_ASSERT(reporter, externalTexRT->isSameAs(externalTexRT));
- REPORTER_ASSERT(reporter, externalTexRT->isSameAs(externalTexRT->asRenderTarget()));
- REPORTER_ASSERT(reporter, externalTexRT->asRenderTarget()->isSameAs(externalTexRT));
- REPORTER_ASSERT(reporter, !externalTexRT->isSameAs(texRT1));
- REPORTER_ASSERT(reporter, !externalTexRT->asRenderTarget()->isSameAs(texRT1));
+ REPORTER_ASSERT(reporter, externalTexRT->surfacePriv().isSameAs(externalTexRT));
+ REPORTER_ASSERT(reporter,
+ externalTexRT->surfacePriv().isSameAs(externalTexRT->asRenderTarget()));
+ REPORTER_ASSERT(reporter,
+ externalTexRT->asRenderTarget()->surfacePriv().isSameAs(externalTexRT));
+ REPORTER_ASSERT(reporter, !externalTexRT->surfacePriv().isSameAs(texRT1));
+ REPORTER_ASSERT(reporter, !externalTexRT->asRenderTarget()->surfacePriv().isSameAs(texRT1));
texRT1->unref();
texRT2->unref();