Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: tools/gpu/GrContextFactory.h

Issue 1815823002: Move SkGLContext and some GrGLInterface implementations to skgputest module (Closed) Base URL: https://chromium.googlesource.com/skia.git@debugobject
Patch Set: rebase, readd null interface to main lib Created 4 years, 9 months 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: 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 7afa3108c69d8984e0d63cd76350570dc764d4be..7e5c10e039cc8ab66c14cbc9a8f272ce464bade9 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
@@ -109,11 +110,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().
};
/**
@@ -132,13 +133,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

Powered by Google App Engine
This is Rietveld 408576698