ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Pixelflinger: Fix issue of pointers being stored in ints"

Browse source
This commit is contained in:
Elliott Hughes 2013-12-12 21:22:33 +00:00 • committed by Gerrit Code Review
commit a67b39cb61
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/private/pixelflinger/ggl_context.h
View file

@ -121,7 +121,7 @@ template<bool> struct CTA;
template<> struct CTA<true> { }; template<> struct CTA<true> { };
#define GGL_CONTEXT(con, c) context_t *con = static_cast<context_t *>(c) #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_INIT_PROC(p, f) p.f = ggl_ ## f;
#define GGL_BETWEEN(x, L, H) (uint32_t((x)-(L)) <= ((H)-(L))) #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 width;
uint32_t height; uint32_t height;
uint32_t stride; uint32_t stride;
int32_t data; uintptr_t data;
int32_t dsdx; int32_t dsdx;
int32_t dtdx; int32_t dtdx;
int32_t spill[2]; int32_t spill[2];

2
libpixelflinger/buffer.cpp
View file

@ -93,7 +93,7 @@ void ggl_pick_texture(context_t* c)
gen.width = s.width; gen.width = s.width;
gen.height = s.height; gen.height = s.height;
gen.stride = s.stride; gen.stride = s.stride;
gen.data = int32_t(s.data); gen.data = uintptr_t(s.data);
} }
} }

6
libpixelflinger/codeflinger/ARMAssembler.cpp
View file

@ -99,8 +99,8 @@ void ARMAssembler::disassemble(const char* name)
if (comment >= 0) { if (comment >= 0) {
printf("; %s\n", mComments.valueAt(comment)); printf("; %s\n", mComments.valueAt(comment));
} }
printf("%08x: %08x ", int(i), int(i[0])); printf("%08x: %08x ", uintptr_t(i), int(i[0]));
::disassemble((u_int)i); ::disassemble((uintptr_t)i);
i++; i++;
} }
} }
@ -186,7 +186,7 @@ int ARMAssembler::generate(const char* name)
#if defined(WITH_LIB_HARDWARE) #if defined(WITH_LIB_HARDWARE)
if (__builtin_expect(mQemuTracing, 0)) { if (__builtin_expect(mQemuTracing, 0)) {
int err = qemu_add_mapping(int(base()), name); int err = qemu_add_mapping(uintptr_t(base()), name);
mQemuTracing = (err >= 0); mQemuTracing = (err >= 0);
} }
#endif #endif

4
libpixelflinger/scanline.cpp
View file

@ -1717,7 +1717,7 @@ void init_y(context_t* c, int32_t ys)
gen.width = t.surface.width; gen.width = t.surface.width;
gen.height = t.surface.height; gen.height = t.surface.height;
gen.stride = t.surface.stride; gen.stride = t.surface.stride;
gen.data = int32_t(t.surface.data); gen.data = uintptr_t(t.surface.data);
gen.dsdx = ti.dsdx; gen.dsdx = ti.dsdx;
gen.dtdx = ti.dtdx; gen.dtdx = ti.dtdx;
} }
@ -2125,7 +2125,7 @@ void scanline_t32cb16(context_t* c)
int sR, sG, sB; int sR, sG, sB;
uint32_t s, d; uint32_t s, d;
if (ct==1 || uint32_t(dst)&2) { if (ct==1 || uintptr_t(dst)&2) {
last_one: last_one:
s = GGL_RGBA_TO_HOST( *src++ ); s = GGL_RGBA_TO_HOST( *src++ );
*dst++ = convertAbgr8888ToRgb565(s); *dst++ = convertAbgr8888ToRgb565(s);