| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 | 10 |
| 11 #ifndef GrGLConfig_DEFINED | 11 #ifndef GrGLConfig_DEFINED |
| 12 #define GrGLConfig_DEFINED | 12 #define GrGLConfig_DEFINED |
| 13 | 13 |
| 14 #include "GrTypes.h" | 14 #include "GrTypes.h" |
| 15 | 15 |
| 16 /** | 16 /** |
| 17 * Optional GL config file. | 17 * Optional GL config file. |
| 18 */ | 18 */ |
| 19 #ifdef GR_GL_CUSTOM_SETUP_HEADER | 19 #ifdef GR_GL_CUSTOM_SETUP_HEADER |
| 20 #include GR_GL_CUSTOM_SETUP_HEADER | 20 #include GR_GL_CUSTOM_SETUP_HEADER |
| 21 #endif | 21 #endif |
| 22 | 22 |
| 23 #if !defined(GR_GL_FUNCTION_TYPE) | 23 #if !defined(GR_GL_FUNCTION_TYPE) |
| 24 #define GR_GL_FUNCTION_TYPE | 24 #if defined(SK_BUILD_FOR_WIN32) |
| 25 #define GR_GL_FUNCTION_TYPE __stdcall |
| 26 #else |
| 27 #define GR_GL_FUNCTION_TYPE |
| 28 #endif |
| 25 #endif | 29 #endif |
| 26 | 30 |
| 27 /** | 31 /** |
| 28 * The following are optional defines that can be enabled at the compiler | 32 * The following are optional defines that can be enabled at the compiler |
| 29 * command line, in a IDE project, in a GrUserConfig.h file, or in a GL custom | 33 * command line, in a IDE project, in a GrUserConfig.h file, or in a GL custom |
| 30 * file (if one is in use). If a GR_GL_CUSTOM_SETUP_HEADER is used they can | 34 * file (if one is in use). If a GR_GL_CUSTOM_SETUP_HEADER is used they can |
| 31 * also be placed there. | 35 * also be placed there. |
| 32 * | 36 * |
| 33 * GR_GL_LOG_CALLS: if 1 Gr can print every GL call using SkDebugf. Defaults to | 37 * GR_GL_LOG_CALLS: if 1 Gr can print every GL call using SkDebugf. Defaults to |
| 34 * 0. Logging can be enabled and disabled at runtime using a debugger via to | 38 * 0. Logging can be enabled and disabled at runtime using a debugger via to |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 120 |
| 117 #if !defined(GR_GL_MUST_USE_VBO) | 121 #if !defined(GR_GL_MUST_USE_VBO) |
| 118 #define GR_GL_MUST_USE_VBO 0 | 122 #define GR_GL_MUST_USE_VBO 0 |
| 119 #endif | 123 #endif |
| 120 | 124 |
| 121 #if !defined(GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE) | 125 #if !defined(GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE) |
| 122 #define GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE 0 | 126 #define GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE 0 |
| 123 #endif | 127 #endif |
| 124 | 128 |
| 125 #endif | 129 #endif |
| OLD | NEW |