tools/gpu/GrContextFactory.cpp.rej - Issue 1815823002: Move SkGLContext and some GrGLInterface implementations to skgputest module

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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, 8 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 unified diff | Download patch

OLD	NEW
(Empty)
	1 diff a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp (rejecte d hunks)

	2 @@ -7,22 +7,23 @@

	3 */

	4
	jvanverth1 2016/03/28 20:26:35 This file doesn't appear to belong here. 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 Show quoted text On 2016/03/28 20:26:35, jvanverth1 wrote: > This file doesn't appear to belong here. D'oh forgot to add a filename filter to my git add.
	5 #include "GrContextFactory.h"

	6 +#include "gl/GLContext.h"

	7

	8 #if SK_ANGLE

	9 - #include "gl/angle/SkANGLEGLContext.h"

	10 + #include "gl/angle/GLContext_angle.h"

	11 #endif

	12 #if SK_COMMAND_BUFFER

	13 - #include "gl/command_buffer/SkCommandBufferGLContext.h"

	14 + #include "gl/command_buffer/GLContext_command_buffer.h"

	15 #endif

	16 -#include "gl/debug/SkDebugGLContext.h"

	17 +#include "gl/debug/DebugGLContext.h"

	18 #if SK_MESA

	19 - #include "gl/mesa/SkMesaGLContext.h"

	20 + #include "gl/mesa/GLContext_mesa.h"

	21 #endif

	22 -#include "gl/SkGLContext.h"

	23 -#include "gl/SkNullGLContext.h"

	24 +#include "gl/null/NullGLContext.h"

	25 #include "gl/GrGLGpu.h"

	26 #include "GrCaps.h"

	27

	28 +namespace sk_gpu_test {

	29 GrContextFactory::GrContextFactory() { }

	30

	31 GrContextFactory::GrContextFactory(const GrContextOptions& opts)

OLD	NEW

« tests/TextureStorageAllocator.cpp ('K') | « tools/gpu/GrContextFactory.cpp ('k') | tools/gpu/GrTest.h » ('j') | tools/gpu/gl/GLContext.h » ('J')