Commit 82372235c1e6333fb5c7bdc24e22ad886fb063d6

Fix last merge commit 95391b2522f6121927eb7d651354f1f908f5de7f

Fix merging from beagle-donut-0x3 to master.
src/core/SkBlitRow_D16.cpp
(10 / 12)
  
247247 extern "C" void s32a_d565_opaque_arm(uint16_t*, uint32_t*, size_t);
248248#endif
249249
250static const SkBlitRow::Proc gDefault_565_Procs[] = {
250#ifdef USE_T32CB16BLEND_ASM
251 extern "C" void scanline_t32cb16blend_arm(uint16_t*, uint32_t*, size_t);
252#endif
253
254static const SkBlitRow::Proc gProcs16[] = {
251255 // no dither
252256 S32_D565_Opaque,
253257 S32_D565_Blend,
……
264264 (SkBlitRow::Proc)scanline_t32cb16blend_arm,
265265#else
266266 S32A_D565_Opaque,
267#endif
268
267269 S32A_D565_Blend,
268270
269271 // dither
……
283283
284284 switch (config) {
285285 case SkBitmap::kRGB_565_Config:
286 proc = gPlatform_565_Procs[flags];
287 if (NULL == proc) {
288 proc = gDefault_565_Procs[flags];
289 }
290 break;
286 return gProcs16[flags];
291287 case SkBitmap::kARGB_4444_Config:
292 proc = gPlatform_4444_Procs[flags];
293 if (NULL == proc) {
294 proc = SkBlitRow_Factory_4444(flags);
295 }
296 break;
288 return SkBlitRow_Factory_4444(flags);
297289 default:
298290 break;
299291 }
300 return proc;
292 return NULL;
301293}