diff options
| author | Elliott Hughes <enh@google.com> | 2013-12-12 21:33:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-12 21:33:04 +0000 |
| commit | 260854c0b0a19636988a7db5337ab978c2bbbf57 (patch) | |
| tree | 442a9b36fdb380ad6c149982c9af7166a1509af7 /include/private | |
| parent | 79582f1a618f42c695caa3bf0d55d866e1ab4e4d (diff) | |
| parent | ed20fef0630d02395abab6a073a5717ddfbfaa8d (diff) | |
| download | system_core-260854c0b0a19636988a7db5337ab978c2bbbf57.zip system_core-260854c0b0a19636988a7db5337ab978c2bbbf57.tar.gz system_core-260854c0b0a19636988a7db5337ab978c2bbbf57.tar.bz2 | |
am ed20fef0: am a99f0b6e: am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
* commit 'ed20fef0630d02395abab6a073a5717ddfbfaa8d':
Pixelflinger: Fix issue of pointers being stored in ints
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/pixelflinger/ggl_context.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/private/pixelflinger/ggl_context.h b/include/private/pixelflinger/ggl_context.h index 4864d5a..17bb3ed 100644 --- a/include/private/pixelflinger/ggl_context.h +++ b/include/private/pixelflinger/ggl_context.h @@ -121,7 +121,7 @@ template<bool> struct CTA; template<> struct CTA<true> { }; #define GGL_CONTEXT(con, c) context_t *con = static_cast<context_t *>(c) -#define GGL_OFFSETOF(field) int(&(((context_t*)0)->field)) +#define GGL_OFFSETOF(field) uintptr_t(&(((context_t*)0)->field)) #define GGL_INIT_PROC(p, f) p.f = ggl_ ## f; #define GGL_BETWEEN(x, L, H) (uint32_t((x)-(L)) <= ((H)-(L))) @@ -480,7 +480,7 @@ struct generated_tex_vars_t { uint32_t width; uint32_t height; uint32_t stride; - int32_t data; + uintptr_t data; int32_t dsdx; int32_t dtdx; int32_t spill[2]; |