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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
292 | 292 |
293 if (!IsGpuDeviceType(dType)) { | 293 if (!IsGpuDeviceType(dType)) { |
294 // need to send the raster bits to the (gpu) window | 294 // need to send the raster bits to the (gpu) window |
295 fCurContext->setRenderTarget(fCurRenderTarget); | 295 fCurContext->setRenderTarget(fCurRenderTarget); |
296 const SkBitmap& bm = win->getBitmap(); | 296 const SkBitmap& bm = win->getBitmap(); |
297 fCurRenderTarget->writePixels(0, 0, bm.width(), bm.height(), | 297 fCurRenderTarget->writePixels(0, 0, bm.width(), bm.height(), |
298 SkImageInfo2GrPixelConfig(bm.colorT
ype(), | 298 SkImageInfo2GrPixelConfig(bm.colorT
ype(), |
299 bm.alphaT
ype()), | 299 bm.alphaT
ype()), |
300 bm.getPixels(), | 300 bm.getPixels(), |
301 bm.rowBytes()); | 301 bm.rowBytes()); |
| 302 |
| 303 // extra flush call, until Brian can figure out what's going on. |
| 304 fCurContext->flush(); |
302 } | 305 } |
303 } | 306 } |
304 #endif | 307 #endif |
305 | 308 |
306 win->present(); | 309 win->present(); |
307 } | 310 } |
308 | 311 |
309 virtual void windowSizeChanged(SampleWindow* win) { | 312 virtual void windowSizeChanged(SampleWindow* win) { |
310 #if SK_SUPPORT_GPU | 313 #if SK_SUPPORT_GPU |
311 if (fCurContext) { | 314 if (fCurContext) { |
(...skipping 2103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2415 setenv("ANDROID_ROOT", "/android/device/data", 0); | 2418 setenv("ANDROID_ROOT", "/android/device/data", 0); |
2416 #endif | 2419 #endif |
2417 SkGraphics::Init(); | 2420 SkGraphics::Init(); |
2418 SkEvent::Init(); | 2421 SkEvent::Init(); |
2419 } | 2422 } |
2420 | 2423 |
2421 void application_term() { | 2424 void application_term() { |
2422 SkEvent::Term(); | 2425 SkEvent::Term(); |
2423 SkGraphics::Term(); | 2426 SkGraphics::Term(); |
2424 } | 2427 } |
OLD | NEW |