diff options
| -rw-r--r-- | gyp/tests.gyp | 1 | ||||
| -rw-r--r-- | include/gpu/GrContextFactory.h | 13 | ||||
| -rw-r--r-- | tests/GrContextFactoryTest.cpp | 36 |
3 files changed, 50 insertions, 0 deletions
diff --git a/gyp/tests.gyp b/gyp/tests.gyp index b128a545a5..efb41f81e4 100644 --- a/gyp/tests.gyp +++ b/gyp/tests.gyp @@ -47,6 +47,7 @@ '../tests/GeometryTest.cpp', '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', + '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', '../tests/InfRectTest.cpp', diff --git a/include/gpu/GrContextFactory.h b/include/gpu/GrContextFactory.h index 9f14f3b063..409c7fa15f 100644 --- a/include/gpu/GrContextFactory.h +++ b/include/gpu/GrContextFactory.h @@ -109,6 +109,19 @@ public: ctx.fType = type; return ctx.fGrContext; } + + // Returns the GLContext of the given type. If it has not been created yet, + // NULL is returned instead. + SkGLContext* getGLContext(GLContextType type) { + for (int i = 0; i < fContexts.count(); ++i) { + if (fContexts[i].fType == type) { + return fContexts[i].fGLContext; + } + } + + return NULL; + } + private: struct GPUContext { GLContextType fType; diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp new file mode 100644 index 0000000000..80f1418057 --- /dev/null +++ b/tests/GrContextFactoryTest.cpp @@ -0,0 +1,36 @@ +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "Test.h" + +// This is a GPU-backend specific test +#if SK_SUPPORT_GPU +#include "GrContextFactory.h" + +static void test_context_factory(skiatest::Reporter* reporter) { + GrContextFactory contextFactory; + + // Before we ask for a context, we expect the GL context to not be there. + REPORTER_ASSERT(reporter, + NULL == contextFactory.getGLContext(GrContextFactory::kNative_GLContextType)); + + // After we ask for a context, we expect that the GL context to be there. + contextFactory.get(GrContextFactory::kNative_GLContextType); + REPORTER_ASSERT(reporter, + contextFactory.getGLContext(GrContextFactory::kNative_GLContextType) != NULL); + + // If we did not ask for a context with the particular GL context, we would + // expect the particular GL context to not be there. + REPORTER_ASSERT(reporter, + NULL == contextFactory.getGLContext(GrContextFactory::kNull_GLContextType)); +} + + +#include "TestClassDef.h" +DEFINE_TESTCLASS("GrContextFactory", GrContextFactoryClass, test_context_factory); + +#endif |