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

Unified Diff: tools/gpu/GrContextFactory.cpp.rej

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.cpp.rej
diff --git a/tools/gpu/GrContextFactory.cpp.rej b/tools/gpu/GrContextFactory.cpp.rej
new file mode 100644
index 0000000000000000000000000000000000000000..9ad8866665f099f039408ef08bdf7b8130d25559
--- /dev/null
+++ b/tools/gpu/GrContextFactory.cpp.rej
@@ -0,0 +1,31 @@
+diff a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp (rejected hunks)
+@@ -7,22 +7,23 @@
+ */
+
jvanverth1 2016/03/28 20:26:35 This file doesn't appear to belong here.
bsalomon 2016/03/28 20:46:25 D'oh forgot to add a filename filter to my git add
+ #include "GrContextFactory.h"
++#include "gl/GLContext.h"
+
+ #if SK_ANGLE
+- #include "gl/angle/SkANGLEGLContext.h"
++ #include "gl/angle/GLContext_angle.h"
+ #endif
+ #if SK_COMMAND_BUFFER
+- #include "gl/command_buffer/SkCommandBufferGLContext.h"
++ #include "gl/command_buffer/GLContext_command_buffer.h"
+ #endif
+-#include "gl/debug/SkDebugGLContext.h"
++#include "gl/debug/DebugGLContext.h"
+ #if SK_MESA
+- #include "gl/mesa/SkMesaGLContext.h"
++ #include "gl/mesa/GLContext_mesa.h"
+ #endif
+-#include "gl/SkGLContext.h"
+-#include "gl/SkNullGLContext.h"
++#include "gl/null/NullGLContext.h"
+ #include "gl/GrGLGpu.h"
+ #include "GrCaps.h"
+
++namespace sk_gpu_test {
+ GrContextFactory::GrContextFactory() { }
+
+ GrContextFactory::GrContextFactory(const GrContextOptions& opts)

Powered by Google App Engine
This is Rietveld 408576698