| 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 #include "SkOSWindow_SDL.h" | 7 #include "SkOSWindow_SDL.h" | 
| 8 #include "SkCanvas.h" | 8 #include "SkCanvas.h" | 
| 9 | 9 | 
| 10 #if defined(SK_BUILD_FOR_ANDROID) | 10 #if defined(SK_BUILD_FOR_ANDROID) | 
| 11 #include <GLES/gl.h> | 11 #include <GLES/gl.h> | 
| 12 #elif defined(SK_BUILD_FOR_LINUX) | 12 #elif defined(SK_BUILD_FOR_UNIX) | 
| 13 #include <GL/gl.h> | 13 #include <GL/gl.h> | 
| 14 #elif defined(SK_BUILD_FOR_MAC) | 14 #elif defined(SK_BUILD_FOR_MAC) | 
| 15 #include <gl.h> | 15 #include <gl.h> | 
| 16 #endif | 16 #endif | 
| 17 | 17 | 
| 18 const int SCREEN_WIDTH = 640; | 18 const int SCREEN_WIDTH = 640; | 
| 19 const int SCREEN_HEIGHT = 480; | 19 const int SCREEN_HEIGHT = 480; | 
| 20 | 20 | 
| 21 static void handle_error() { | 21 static void handle_error() { | 
| 22     const char* error = SDL_GetError(); | 22     const char* error = SDL_GetError(); | 
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 282 | 282 | 
| 283     // Start normal Skia sequence | 283     // Start normal Skia sequence | 
| 284     application_init(); | 284     application_init(); | 
| 285 | 285 | 
| 286     window->loop(); | 286     window->loop(); | 
| 287 | 287 | 
| 288     delete window; | 288     delete window; | 
| 289     application_term(); | 289     application_term(); | 
| 290     return 0; | 290     return 0; | 
| 291 } | 291 } | 
| OLD | NEW | 
|---|