| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 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 #ifndef GrGLTypes_DEFINED | 9 #ifndef GrGLTypes_DEFINED |
| 10 #define GrGLTypes_DEFINED | 10 #define GrGLTypes_DEFINED |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 typedef signed long long int GrGLsizeiptr; | 51 typedef signed long long int GrGLsizeiptr; |
| 52 #else | 52 #else |
| 53 typedef signed long int GrGLintptr; | 53 typedef signed long int GrGLintptr; |
| 54 typedef signed long int GrGLsizeiptr; | 54 typedef signed long int GrGLsizeiptr; |
| 55 #endif | 55 #endif |
| 56 #else | 56 #else |
| 57 typedef signed long int GrGLintptr; | 57 typedef signed long int GrGLintptr; |
| 58 typedef signed long int GrGLsizeiptr; | 58 typedef signed long int GrGLsizeiptr; |
| 59 #endif | 59 #endif |
| 60 typedef void* GrGLeglImage; | 60 typedef void* GrGLeglImage; |
| 61 typedef void* GrGLsync; |
| 61 | 62 |
| 62 struct GrGLDrawArraysIndirectCommand { | 63 struct GrGLDrawArraysIndirectCommand { |
| 63 GrGLuint fCount; | 64 GrGLuint fCount; |
| 64 GrGLuint fInstanceCount; | 65 GrGLuint fInstanceCount; |
| 65 GrGLuint fFirst; | 66 GrGLuint fFirst; |
| 66 GrGLuint fBaseInstance; // Requires EXT_base_instance on ES. | 67 GrGLuint fBaseInstance; // Requires EXT_base_instance on ES. |
| 67 }; | 68 }; |
| 68 | 69 |
| 69 GR_STATIC_ASSERT(16 == sizeof(GrGLDrawArraysIndirectCommand)); | 70 GR_STATIC_ASSERT(16 == sizeof(GrGLDrawArraysIndirectCommand)); |
| 70 | 71 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 */ | 108 */ |
| 108 | 109 |
| 109 struct GrGLTextureInfo { | 110 struct GrGLTextureInfo { |
| 110 GrGLenum fTarget; | 111 GrGLenum fTarget; |
| 111 GrGLuint fID; | 112 GrGLuint fID; |
| 112 }; | 113 }; |
| 113 | 114 |
| 114 GR_STATIC_ASSERT(sizeof(GrBackendObject) >= sizeof(const GrGLTextureInfo*)); | 115 GR_STATIC_ASSERT(sizeof(GrBackendObject) >= sizeof(const GrGLTextureInfo*)); |
| 115 | 116 |
| 116 #endif | 117 #endif |
| OLD | NEW |