diff options
| -rw-r--r-- | include/private/pixelflinger/ggl_context.h | 4 | ||||
| -rw-r--r-- | libpixelflinger/buffer.cpp | 2 | ||||
| -rw-r--r-- | libpixelflinger/codeflinger/ARMAssembler.cpp | 6 | ||||
| -rw-r--r-- | libpixelflinger/scanline.cpp | 4 |
4 files changed, 8 insertions, 8 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]; diff --git a/libpixelflinger/buffer.cpp b/libpixelflinger/buffer.cpp index af7356b..cbdab5a 100644 --- a/libpixelflinger/buffer.cpp +++ b/libpixelflinger/buffer.cpp @@ -93,7 +93,7 @@ void ggl_pick_texture(context_t* c) gen.width = s.width; gen.height = s.height; gen.stride = s.stride; - gen.data = int32_t(s.data); + gen.data = uintptr_t(s.data); } } diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp index 607ed3c..92243da 100644 --- a/libpixelflinger/codeflinger/ARMAssembler.cpp +++ b/libpixelflinger/codeflinger/ARMAssembler.cpp @@ -99,8 +99,8 @@ void ARMAssembler::disassemble(const char* name) if (comment >= 0) { printf("; %s\n", mComments.valueAt(comment)); } - printf("%08x: %08x ", int(i), int(i[0])); - ::disassemble((u_int)i); + printf("%08x: %08x ", uintptr_t(i), int(i[0])); + ::disassemble((uintptr_t)i); i++; } } @@ -186,7 +186,7 @@ int ARMAssembler::generate(const char* name) #if defined(WITH_LIB_HARDWARE) 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); } #endif diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp index 9663a2b..96a71f3 100644 --- a/libpixelflinger/scanline.cpp +++ b/libpixelflinger/scanline.cpp @@ -1717,7 +1717,7 @@ void init_y(context_t* c, int32_t ys) gen.width = t.surface.width; gen.height = t.surface.height; gen.stride = t.surface.stride; - gen.data = int32_t(t.surface.data); + gen.data = uintptr_t(t.surface.data); gen.dsdx = ti.dsdx; gen.dtdx = ti.dtdx; } @@ -2125,7 +2125,7 @@ void scanline_t32cb16(context_t* c) int sR, sG, sB; uint32_t s, d; - if (ct==1 || uint32_t(dst)&2) { + if (ct==1 || uintptr_t(dst)&2) { last_one: s = GGL_RGBA_TO_HOST( *src++ ); *dst++ = convertAbgr8888ToRgb565(s); |