diff options
| author | Ashok Bhat <ashok.bhat@arm.com> | 2013-11-14 11:13:41 +0000 |
|---|---|---|
| committer | David Butcher <david.butcher@arm.com> | 2013-12-12 17:30:13 +0000 |
| commit | d10afb17486f87a56baf97a893b4e4533eb5b851 (patch) | |
| tree | 72990f9b077ffadaf412e91397bde6b614a01bfc /include/private | |
| parent | 8779c4eab43956ecf626bbece3f6f3bc54970d6a (diff) | |
| download | system_core-d10afb17486f87a56baf97a893b4e4533eb5b851.zip system_core-d10afb17486f87a56baf97a893b4e4533eb5b851.tar.gz system_core-d10afb17486f87a56baf97a893b4e4533eb5b851.tar.bz2 | |
Pixelflinger: Fix issue of pointers being stored in ints
Pixelflinger's code makes assumptions, at certain places,
that pointers can be stored as ints. This patch makes use
of uintptr_t wherever pointers are stored as int or cast
to int.
Change-Id: Ie76f425cbc82ac038a747f77a95bd31774f4a8e8
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
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]; |