diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-03-17 17:15:47 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 09:29:29 -0700 |
| commit | 83b65486beffc7c86f24c428fbb7b50bbbe189f9 (patch) | |
| tree | ab343e30dd96348d35b0957453fbf6b7b0bac56d /libpixelflinger | |
| parent | 4a4c9f6f98055918f1ebff06b3cc1ed622c058fe (diff) | |
| parent | e037fd7e193ecccbb5c0888e49f6d58c224bc11d (diff) | |
| download | system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.zip system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.gz system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.bz2 | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
init/devices.c
libpixelflinger/Android.mk
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/Android.mk | 12 | ||||
| -rw-r--r-- | libpixelflinger/format.cpp | 12 | ||||
| -rw-r--r-- | libpixelflinger/scanline.cpp | 4 |
3 files changed, 12 insertions, 16 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 63a5c84..0cc85d9 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -48,9 +48,7 @@ ifeq ($(TARGET_ARCH),arm) PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer endif -LOCAL_SHARED_LIBRARIES := \ - libhardware_legacy \ - libcutils +LOCAL_SHARED_LIBRARIES := libcutils ifneq ($(TARGET_ARCH),arm) # Required to define logging functions on the simulator. @@ -68,11 +66,9 @@ LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES) LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) ifneq ($(BUILD_TINY_ANDROID),true) -# this is for some qemu-tracing cruft, which -# 1. should not depend on libhardware -# 2. should not be build except in emulator builds -# but this at least stops it from breaking the tiny android build -LOCAL_SHARED_LIBRARIES += libhardware +# Really this should go away entirely or at least not depend on +# libhardware, but this at least gets us built. +LOCAL_SHARED_LIBRARIES += libhardware_legacy LOCAL_CFLAGS += -DWITH_LIB_HARDWARE endif diff --git a/libpixelflinger/format.cpp b/libpixelflinger/format.cpp index cbbd91a..161e6d6 100644 --- a/libpixelflinger/format.cpp +++ b/libpixelflinger/format.cpp @@ -40,12 +40,12 @@ static GGLFormat const gPixelFormatInfos[] = { 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE { 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE - { 1, 16, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR },// PIXEL_FORMAT_YCbCr_422_SP - { 1, 12, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR },// PIXEL_FORMAT_YCbCr_420_SP - { 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE - { 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE - { 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE - { 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE + { 1, 16, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_SP },// PIXEL_FORMAT_YCbCr_422_SP + { 1, 12, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_SP },// PIXEL_FORMAT_YCbCr_420_SP + { 1, 16, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_P }, // PIXEL_FORMAT_YCbCr_422_P + { 1, 12, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_P }, // PIXEL_FORMAT_YCbCr_420_P + { 1, 16, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_I }, // PIXEL_FORMAT_YCbCr_422_I + { 1, 12, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_I }, // PIXEL_FORMAT_YCbCr_420_I { 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE { 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp index 75b668d..f700306 100644 --- a/libpixelflinger/scanline.cpp +++ b/libpixelflinger/scanline.cpp @@ -1256,7 +1256,7 @@ finish: void scanline_t32cb16(context_t* c) { int32_t x = c->iterators.xl; - size_t ct = c->iterators.xr - x; + size_t ct = c->iterators.xr - x; int32_t y = c->iterators.y; surface_t* cb = &(c->state.buffers.color); union { @@ -1282,7 +1282,7 @@ last_one: ct--; } - while (ct > 0) { + while (ct >= 2) { s = GGL_RGBA_TO_HOST( *src++ ); sR = (s >> ( 3))&0x1F; sG = (s >> ( 8+2))&0x3F; |