diff options
| author | robertphillips <robertphillips@google.com> | 2016-03-30 09:26:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-30 09:26:24 -0700 |
| commit | 6f70d43719d0583d486a000f66e915c10a6b83a2 (patch) | |
| tree | 6f9511faa88ca6d44932e1a247fc10c0f297a3e0 /samplecode/SampleApp.cpp | |
| parent | fe3456cb006110d045b26ff3f8681b893a757b58 (diff) | |
Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module (patchset #13 id:240001 of https://codereview.chromium.org/1815823002/ )
Reason for revert:
red bots
Original issue's description:
> Move SkGLContext and some GrGLInterface implementations to skgputest module
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1815823002
> CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58
TBR=jvanverth@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1845473004
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 780eabd1e3..e0d152d97b 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 @@ public: break; #if SK_ANGLE case kANGLE_DeviceType: - glInterface.reset(sk_gpu_test::CreateANGLEGLInterface()); + glInterface.reset(GrGLCreateANGLEInterface()); break; #endif // SK_ANGLE #if SK_COMMAND_BUFFER |