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

Side by Side Diff: samplecode/SampleApp.cpp

Issue 1850543003: Revert of rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext (Closed) Base URL: https://chromium.googlesource.com/skia.git@move
Patch Set: 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
« no previous file with comments | « dm/DM.cpp ('k') | tests/EGLImageTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SampleApp.h" 8 #include "SampleApp.h"
9 9
10 #include "OverView.h" 10 #include "OverView.h"
(...skipping 21 matching lines...) Expand all
32 #include "SkWindow.h" 32 #include "SkWindow.h"
33 #include "sk_tool_utils.h" 33 #include "sk_tool_utils.h"
34 34
35 #if SK_SUPPORT_GPU 35 #if SK_SUPPORT_GPU
36 # include "gl/GrGLInterface.h" 36 # include "gl/GrGLInterface.h"
37 # include "gl/GrGLUtil.h" 37 # include "gl/GrGLUtil.h"
38 # include "GrRenderTarget.h" 38 # include "GrRenderTarget.h"
39 # include "GrContext.h" 39 # include "GrContext.h"
40 # include "SkGpuDevice.h" 40 # include "SkGpuDevice.h"
41 # if SK_ANGLE 41 # if SK_ANGLE
42 # include "gl/angle/GLTestContext_angle.h" 42 # include "gl/angle/GLContext_angle.h"
43 # endif 43 # endif
44 #else 44 #else
45 class GrContext; 45 class GrContext;
46 #endif 46 #endif
47 47
48 const struct { 48 const struct {
49 SkColorType fColorType; 49 SkColorType fColorType;
50 SkColorProfileType fProfileType; 50 SkColorProfileType fProfileType;
51 const char* fName; 51 const char* fName;
52 } gConfig[] = { 52 } gConfig[] = {
(...skipping 2280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2333 #ifdef SK_BUILD_FOR_MAC 2333 #ifdef SK_BUILD_FOR_MAC
2334 setenv("ANDROID_ROOT", "/android/device/data", 0); 2334 setenv("ANDROID_ROOT", "/android/device/data", 0);
2335 #endif 2335 #endif
2336 SkGraphics::Init(); 2336 SkGraphics::Init();
2337 SkEvent::Init(); 2337 SkEvent::Init();
2338 } 2338 }
2339 2339
2340 void application_term() { 2340 void application_term() {
2341 SkEvent::Term(); 2341 SkEvent::Term();
2342 } 2342 }
OLDNEW
« no previous file with comments | « dm/DM.cpp ('k') | tests/EGLImageTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698