Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63824e92 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 980093ca: am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"

* commit '980093ca':
  AArch64: Correction of struct surface_t
parents 49a88c3c 980093ca
Loading
Loading
Loading
Loading
+11 −9
Original line number Diff line number Diff line
@@ -341,15 +341,17 @@ struct pixel_t {
struct surface_t {
    union {
        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,