| Index: tools/gpu/GrContextFactory.h
|
| diff --git a/src/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h
|
| similarity index 90%
|
| rename from src/gpu/GrContextFactory.h
|
| rename to tools/gpu/GrContextFactory.h
|
| index 1bc1e21fbbd1828a48c562d39cd3aba7e9bb9254..b17460819d9968ea6434972608fbf0fa7267a5ab 100644
|
| --- a/src/gpu/GrContextFactory.h
|
| +++ b/tools/gpu/GrContextFactory.h
|
| @@ -11,9 +11,10 @@
|
| #include "GrContext.h"
|
| #include "GrContextOptions.h"
|
|
|
| -#include "gl/SkGLContext.h"
|
| +#include "gl/GLContext.h"
|
| #include "SkTArray.h"
|
|
|
| +namespace sk_gpu_test {
|
| /**
|
| * This is a simple class that is useful in test apps that use different
|
| * GrContexts backed by different types of GL contexts. It manages creating the
|
| @@ -110,11 +111,11 @@ public:
|
| struct ContextInfo {
|
| ContextInfo()
|
| : fGrContext(nullptr), fGLContext(nullptr) { }
|
| - ContextInfo(GrContext* grContext, SkGLContext* glContext)
|
| + ContextInfo(GrContext* grContext, GLContext* glContext)
|
| : fGrContext(grContext), fGLContext(glContext) { }
|
| GrContext* fGrContext;
|
| - SkGLContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
|
| - //! destroyContexts().
|
| + GLContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
|
| + //! destroyContexts().
|
| };
|
|
|
| /**
|
| @@ -133,13 +134,13 @@ public:
|
|
|
| private:
|
| struct Context {
|
| - GLContextType fType;
|
| - GLContextOptions fOptions;
|
| - SkGLContext* fGLContext;
|
| - GrContext* fGrContext;
|
| + GLContextType fType;
|
| + GLContextOptions fOptions;
|
| + GLContext* fGLContext;
|
| + GrContext* fGrContext;
|
| };
|
| SkTArray<Context, true> fContexts;
|
| const GrContextOptions fGlobalOptions;
|
| };
|
| -
|
| +} // namespace sk_gpu_test
|
| #endif
|
|
|