diff options
| author | Elliott Hughes <enh@google.com> | 2013-12-16 20:03:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-16 20:03:17 +0000 |
| commit | fed76f85154950a4b2c63ac9e749ee23603e4d2b (patch) | |
| tree | cc2516930d9de21b3ea3fecbc7b65e13712eb7a1 /include/private | |
| parent | c29664284b59cf8ebc9bb51d4713ff4280341b5a (diff) | |
| parent | 63824e923aca6fe15942beee00b258ea6119e459 (diff) | |
| download | system_core-fed76f85154950a4b2c63ac9e749ee23603e4d2b.zip system_core-fed76f85154950a4b2c63ac9e749ee23603e4d2b.tar.gz system_core-fed76f85154950a4b2c63ac9e749ee23603e4d2b.tar.bz2 | |
am 63824e92: am 980093ca: am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"
* commit '63824e923aca6fe15942beee00b258ea6119e459':
AArch64: Correction of struct surface_t
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/pixelflinger/ggl_context.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/private/pixelflinger/ggl_context.h b/include/private/pixelflinger/ggl_context.h index 17bb3ed..d43655c 100644 --- a/include/private/pixelflinger/ggl_context.h +++ b/include/private/pixelflinger/ggl_context.h @@ -340,16 +340,18 @@ struct pixel_t { struct surface_t { union { - GGLSurface s; + GGLSurface s; + // Keep the following struct field types in line with the corresponding + // GGLSurface fields to avoid mismatches leading to errors. struct { - uint32_t reserved; - uint32_t width; - uint32_t height; - int32_t stride; - uint8_t* data; - uint8_t format; - uint8_t dirty; - uint8_t pad[2]; + GGLsizei reserved; + GGLuint width; + GGLuint height; + GGLint stride; + GGLubyte* data; + GGLubyte format; + GGLubyte dirty; + GGLubyte pad[2]; }; }; void (*read) (const surface_t* s, context_t* c, |