OLD | NEW |
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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 SkSafeUnref(fCurIntf); | 264 SkSafeUnref(fCurIntf); |
265 fCurIntf = NULL; | 265 fCurIntf = NULL; |
266 | 266 |
267 SkSafeUnref(fCurRenderTarget); | 267 SkSafeUnref(fCurRenderTarget); |
268 fCurRenderTarget = NULL; | 268 fCurRenderTarget = NULL; |
269 #endif | 269 #endif |
270 win->detach(); | 270 win->detach(); |
271 fBackend = kNone_BackEndType; | 271 fBackend = kNone_BackEndType; |
272 } | 272 } |
273 | 273 |
274 virtual SkCanvas* createCanvas(SampleWindow::DeviceType dType, | 274 virtual SkSurface* createSurface(SampleWindow::DeviceType dType, |
275 SampleWindow* win) { | 275 SampleWindow* win) SK_OVERRIDE { |
276 #if SK_SUPPORT_GPU | 276 #if SK_SUPPORT_GPU |
277 if (IsGpuDeviceType(dType) && fCurContext) { | 277 if (IsGpuDeviceType(dType) && fCurContext) { |
278 SkAutoTUnref<SkBaseDevice> device(SkGpuDevice::Create(fCurRenderTarg
et)); | 278 return SkSurface::NewRenderTargetDirect(fCurRenderTarget); |
279 return new SkCanvas(device); | 279 } |
280 } else | |
281 #endif | 280 #endif |
282 { | 281 return NULL; |
283 return NULL; | |
284 } | |
285 } | 282 } |
286 | 283 |
287 virtual void publishCanvas(SampleWindow::DeviceType dType, | 284 virtual void publishCanvas(SampleWindow::DeviceType dType, |
288 SkCanvas* canvas, | 285 SkCanvas* canvas, |
289 SampleWindow* win) { | 286 SampleWindow* win) { |
290 #if SK_SUPPORT_GPU | 287 #if SK_SUPPORT_GPU |
291 if (fCurContext) { | 288 if (fCurContext) { |
292 // in case we have queued drawing calls | 289 // in case we have queued drawing calls |
293 fCurContext->flush(); | 290 fCurContext->flush(); |
294 | 291 |
(...skipping 2101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2396 setenv("ANDROID_ROOT", "/android/device/data", 0); | 2393 setenv("ANDROID_ROOT", "/android/device/data", 0); |
2397 #endif | 2394 #endif |
2398 SkGraphics::Init(); | 2395 SkGraphics::Init(); |
2399 SkEvent::Init(); | 2396 SkEvent::Init(); |
2400 } | 2397 } |
2401 | 2398 |
2402 void application_term() { | 2399 void application_term() { |
2403 SkEvent::Term(); | 2400 SkEvent::Term(); |
2404 SkGraphics::Term(); | 2401 SkGraphics::Term(); |
2405 } | 2402 } |
OLD | NEW |