diff options
| author | Colin Cross <ccross@android.com> | 2014-01-24 21:24:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-24 21:24:52 +0000 |
| commit | 892af2303f4d7ca628bdd538fc372fc06b26228f (patch) | |
| tree | 84b022aefe851fb8001c98f47c8c42f3e89a1657 /libpixelflinger/scanline.cpp | |
| parent | 9c34e9646d081d4174a2df801ccf94b9678539b5 (diff) | |
| parent | 9222d911a89d30a9b0537e8cdb95401be3a4999e (diff) | |
| download | system_core-892af2303f4d7ca628bdd538fc372fc06b26228f.zip system_core-892af2303f4d7ca628bdd538fc372fc06b26228f.tar.gz system_core-892af2303f4d7ca628bdd538fc372fc06b26228f.tar.bz2 | |
am 9222d911: am c8518616: am 02f68c4b: am 4800e20e: Merge "system/core: rename aarch64 target to arm64"
* commit '9222d911a89d30a9b0537e8cdb95401be3a4999e':
system/core: rename aarch64 target to arm64
Diffstat (limited to 'libpixelflinger/scanline.cpp')
| -rw-r--r-- | libpixelflinger/scanline.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp index bc774f3..aa23ca6 100644 --- a/libpixelflinger/scanline.cpp +++ b/libpixelflinger/scanline.cpp @@ -34,7 +34,7 @@ #if defined(__arm__) #include "codeflinger/ARMAssembler.h" #elif defined(__aarch64__) -#include "codeflinger/Aarch64Assembler.h" +#include "codeflinger/Arm64Assembler.h" #elif defined(__mips__) #include "codeflinger/MIPSAssembler.h" #endif @@ -128,8 +128,8 @@ extern "C" void scanline_t32cb16_arm(uint16_t *dst, uint32_t *src, size_t ct); extern "C" void scanline_col32cb16blend_neon(uint16_t *dst, uint32_t *col, size_t ct); extern "C" void scanline_col32cb16blend_arm(uint16_t *dst, uint32_t col, size_t ct); #elif defined(__aarch64__) -extern "C" void scanline_t32cb16blend_aarch64(uint16_t*, uint32_t*, size_t); -extern "C" void scanline_col32cb16blend_aarch64(uint16_t *dst, uint32_t col, size_t ct); +extern "C" void scanline_t32cb16blend_arm64(uint16_t*, uint32_t*, size_t); +extern "C" void scanline_col32cb16blend_arm64(uint16_t *dst, uint32_t col, size_t ct); #elif defined(__mips__) extern "C" void scanline_t32cb16blend_mips(uint16_t*, uint32_t*, size_t); #endif @@ -405,7 +405,7 @@ static void pick_scanline(context_t* c) #if defined(__mips__) GGLAssembler assembler( new ArmToMipsAssembler(a) ); #elif defined(__aarch64__) - GGLAssembler assembler( new ArmToAarch64Assembler(a) ); + GGLAssembler assembler( new ArmToArm64Assembler(a) ); #endif // generate the scanline code for the given needs int err = assembler.scanline(c->state.needs, c); @@ -2098,7 +2098,7 @@ void scanline_col32cb16blend(context_t* c) scanline_col32cb16blend_arm(dst, GGL_RGBA_TO_HOST(c->packed8888), ct); #endif // defined(__ARM_HAVE_NEON) && BYTE_ORDER == LITTLE_ENDIAN #elif ((ANDROID_CODEGEN >= ANDROID_CODEGEN_ASM) && defined(__aarch64__)) - scanline_col32cb16blend_aarch64(dst, GGL_RGBA_TO_HOST(c->packed8888), ct); + scanline_col32cb16blend_arm64(dst, GGL_RGBA_TO_HOST(c->packed8888), ct); #else uint32_t s = GGL_RGBA_TO_HOST(c->packed8888); int sA = (s>>24); @@ -2186,7 +2186,7 @@ void scanline_t32cb16blend(context_t* c) #ifdef __arm__ scanline_t32cb16blend_arm(dst, src, ct); #elif defined(__aarch64__) - scanline_t32cb16blend_aarch64(dst, src, ct); + scanline_t32cb16blend_arm64(dst, src, ct); #elif defined(__mips__) scanline_t32cb16blend_mips(dst, src, ct); #endif |