| Index: simd/jdmermmx.asm
|
| ===================================================================
|
| --- simd/jdmermmx.asm (revision 106486)
|
| +++ simd/jdmermmx.asm (working copy)
|
| @@ -57,10 +57,10 @@
|
| %undef RGB_GREEN
|
| %undef RGB_BLUE
|
| %undef RGB_PIXELSIZE
|
| -%define RGB_RED 0
|
| -%define RGB_GREEN 1
|
| -%define RGB_BLUE 2
|
| -%define RGB_PIXELSIZE 3
|
| +%define RGB_RED EXT_RGB_RED
|
| +%define RGB_GREEN EXT_RGB_GREEN
|
| +%define RGB_BLUE EXT_RGB_BLUE
|
| +%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
|
| %define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extrgb_merged_upsample_mmx
|
| %define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extrgb_merged_upsample_mmx
|
| %include "jdmrgmmx.asm"
|
| @@ -69,10 +69,10 @@
|
| %undef RGB_GREEN
|
| %undef RGB_BLUE
|
| %undef RGB_PIXELSIZE
|
| -%define RGB_RED 0
|
| -%define RGB_GREEN 1
|
| -%define RGB_BLUE 2
|
| -%define RGB_PIXELSIZE 4
|
| +%define RGB_RED EXT_RGBX_RED
|
| +%define RGB_GREEN EXT_RGBX_GREEN
|
| +%define RGB_BLUE EXT_RGBX_BLUE
|
| +%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
|
| %define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extrgbx_merged_upsample_mmx
|
| %define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extrgbx_merged_upsample_mmx
|
| %include "jdmrgmmx.asm"
|
| @@ -81,10 +81,10 @@
|
| %undef RGB_GREEN
|
| %undef RGB_BLUE
|
| %undef RGB_PIXELSIZE
|
| -%define RGB_RED 2
|
| -%define RGB_GREEN 1
|
| -%define RGB_BLUE 0
|
| -%define RGB_PIXELSIZE 3
|
| +%define RGB_RED EXT_BGR_RED
|
| +%define RGB_GREEN EXT_BGR_GREEN
|
| +%define RGB_BLUE EXT_BGR_BLUE
|
| +%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
|
| %define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extbgr_merged_upsample_mmx
|
| %define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extbgr_merged_upsample_mmx
|
| %include "jdmrgmmx.asm"
|
| @@ -93,10 +93,10 @@
|
| %undef RGB_GREEN
|
| %undef RGB_BLUE
|
| %undef RGB_PIXELSIZE
|
| -%define RGB_RED 2
|
| -%define RGB_GREEN 1
|
| -%define RGB_BLUE 0
|
| -%define RGB_PIXELSIZE 4
|
| +%define RGB_RED EXT_BGRX_RED
|
| +%define RGB_GREEN EXT_BGRX_GREEN
|
| +%define RGB_BLUE EXT_BGRX_BLUE
|
| +%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
|
| %define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extbgrx_merged_upsample_mmx
|
| %define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extbgrx_merged_upsample_mmx
|
| %include "jdmrgmmx.asm"
|
| @@ -105,10 +105,10 @@
|
| %undef RGB_GREEN
|
| %undef RGB_BLUE
|
| %undef RGB_PIXELSIZE
|
| -%define RGB_RED 3
|
| -%define RGB_GREEN 2
|
| -%define RGB_BLUE 1
|
| -%define RGB_PIXELSIZE 4
|
| +%define RGB_RED EXT_XBGR_RED
|
| +%define RGB_GREEN EXT_XBGR_GREEN
|
| +%define RGB_BLUE EXT_XBGR_BLUE
|
| +%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
|
| %define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extxbgr_merged_upsample_mmx
|
| %define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extxbgr_merged_upsample_mmx
|
| %include "jdmrgmmx.asm"
|
| @@ -117,10 +117,10 @@
|
| %undef RGB_GREEN
|
| %undef RGB_BLUE
|
| %undef RGB_PIXELSIZE
|
| -%define RGB_RED 1
|
| -%define RGB_GREEN 2
|
| -%define RGB_BLUE 3
|
| -%define RGB_PIXELSIZE 4
|
| +%define RGB_RED EXT_XRGB_RED
|
| +%define RGB_GREEN EXT_XRGB_GREEN
|
| +%define RGB_BLUE EXT_XRGB_BLUE
|
| +%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
|
| %define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extxrgb_merged_upsample_mmx
|
| %define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extxrgb_merged_upsample_mmx
|
| %include "jdmrgmmx.asm"
|
|
|