samplecode/SampleApp.cpp - Issue 1845473004: Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

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

Unified Diff: samplecode/SampleApp.cpp

Issue 1845473004: Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module (Closed) Base URL: https://chromium.googlesource.com/skia.git@debugobject

Patch Set: 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: samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp

index 780eabd1e38d2fa7ff162bbe87781612943daf73..e0d152d97b252dbc01f5049effff42f1b4641f2f 100644

--- a/samplecode/SampleApp.cpp

+++ b/samplecode/SampleApp.cpp

@@ -33,14 +33,11 @@

#include "sk_tool_utils.h"

#if SK_SUPPORT_GPU

-# include "gl/GrGLInterface.h"

-# include "gl/GrGLUtil.h"

-# include "GrRenderTarget.h"

-# include "GrContext.h"

-# include "SkGpuDevice.h"

-# if SK_ANGLE

-# include "gl/angle/GLContext_angle.h"

-# endif

+#include "gl/GrGLInterface.h"

+#include "gl/GrGLUtil.h"

+#include "GrRenderTarget.h"

+#include "GrContext.h"

+#include "SkGpuDevice.h"

#else

class GrContext;

#endif

@@ -236,7 +233,7 @@

break;

#if SK_ANGLE

case kANGLE_DeviceType:

- glInterface.reset(sk_gpu_test::CreateANGLEGLInterface());

+ glInterface.reset(GrGLCreateANGLEInterface());

break;

#endif // SK_ANGLE

#if SK_COMMAND_BUFFER

« no previous file with comments | « include/gpu/gl/command_buffer/SkCommandBufferGLContext.h ('k') | src/gpu/GrContextFactory.h » ('j') | no next file with comments »