Merge pull request #6985 from degasus/arm_vertex_loader_fix

VertexLoaderArm: Fix 565 color format.
This commit is contained in:
Markus Wick 2018-05-27 12:11:40 +02:00 committed by GitHub
commit 5de2f960a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -229,7 +229,7 @@ void VertexLoaderARM64::ReadColor(u64 attribute, int format, s32 offset)
LDR(INDEX_UNSIGNED, scratch2_reg, src_reg, offset); LDR(INDEX_UNSIGNED, scratch2_reg, src_reg, offset);
if (format != FORMAT_32B_8888) if (format != FORMAT_32B_8888)
ORR(scratch2_reg, scratch2_reg, 8, 7); // 0xFF000000 ORRI2R(scratch2_reg, scratch2_reg, 0xFF000000);
STR(INDEX_UNSIGNED, scratch2_reg, dst_reg, m_dst_ofs); STR(INDEX_UNSIGNED, scratch2_reg, dst_reg, m_dst_ofs);
load_bytes = 3 + (format != FORMAT_24B_888); load_bytes = 3 + (format != FORMAT_24B_888);
break; break;
@ -264,7 +264,7 @@ void VertexLoaderARM64::ReadColor(u64 attribute, int format, s32 offset)
ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 2)); ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 2));
// A // A
ORR(scratch2_reg, scratch2_reg, 8, 7); // 0xFF000000 ORRI2R(scratch1_reg, scratch1_reg, 0xFF000000);
STR(INDEX_UNSIGNED, scratch1_reg, dst_reg, m_dst_ofs); STR(INDEX_UNSIGNED, scratch1_reg, dst_reg, m_dst_ofs);
load_bytes = 2; load_bytes = 2;