ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Util: Get rid of _to16Bit

This commit is contained in:
Vicki Pfau 2017-08-26 18:23:29 -07:00
parent 323a6326cd
commit 448bc200c3
3 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mgba-util/arm-algo.h
View File

@ -7,8 +7,6 @@
#define ARM_ALGO_H #define ARM_ALGO_H
#ifdef __arm__ #ifdef __arm__
void _to16Bit(uint16_t* dest, uint32_t* src, size_t words);
#if defined(__ARM_NEON) #if defined(__ARM_NEON)
void _neon2x(void* dest, void* src, int width, int height); void _neon2x(void* dest, void* src, int width, int height);
void _neon4x(void* dest, void* src, int width, int height); void _neon4x(void* dest, void* src, int width, int height);

9
src/gba/renderers/video-software.c
View File

@ -641,13 +641,12 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render
} }
#ifdef COLOR_16_BIT #ifdef COLOR_16_BIT
#if defined(__ARM_NEON) && !defined(__APPLE__) for (x = 0; x < VIDEO_HORIZONTAL_PIXELS; x += 4) {
_to16Bit(row, softwareRenderer->row, VIDEO_HORIZONTAL_PIXELS);
#else
for (x = 0; x < VIDEO_HORIZONTAL_PIXELS; ++x) {
row[x] = softwareRenderer->row[x]; row[x] = softwareRenderer->row[x];
row[x + 1] = softwareRenderer->row[x + 1];
row[x + 2] = softwareRenderer->row[x + 2];
row[x + 3] = softwareRenderer->row[x + 3];
} }
#endif
#else #else
memcpy(row, softwareRenderer->row, VIDEO_HORIZONTAL_PIXELS * sizeof(*row)); memcpy(row, softwareRenderer->row, VIDEO_HORIZONTAL_PIXELS * sizeof(*row));
#endif #endif

26
src/util/arm-algo.S
View File

@ -4,32 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
#if defined(__ARM_NEON) && !defined(PSP2) #if defined(__ARM_NEON) && !defined(PSP2)
# r0: Destination
# r1: Source
# r2: Number of words to copy as halfwords
.global _to16Bit
_to16Bit:
push {r4-r10}
mov r8, r0
mov r9, r1
mov r10, r2
.L0:
tst r10, #15
beq .L1
ldr r0, [r9], #4
strh r0, [r8], #2
sub r10, #1
b .L0
.L1:
vld4.16 {d0, d1, d2, d3}, [r9]!
vld4.16 {d4, d5, d6, d7}, [r9]!
vst2.16 {d0, d2}, [r8]!
vst2.16 {d4, d6}, [r8]!
subs r10, #16
bne .L1
pop {r4-r10}
bx lr
# r0: Destination # r0: Destination
# r1: Source # r1: Source
# r2: Width # r2: Width