d3dx9: Remove some redundant and compiler-unfriendly pixel format checking code.

Spotted by Gerald Pfeifer and Nicolas Le Cam.
This commit is contained in:
Matteo Bruni 2011-04-05 17:26:57 +02:00 committed by Alexandre Julliard
parent b17fd2a3af
commit e1ac6078b5
1 changed files with 6 additions and 10 deletions

View File

@ -702,13 +702,11 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize,
for(x = 0;x < minwidth;x++) {
/* extract source color components */
if(srcformat->type == FORMAT_ARGB) {
pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel);
get_relevant_argb_components(&conv_info, pixel, channels);
}
pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel);
get_relevant_argb_components(&conv_info, pixel, channels);
/* recombine the components */
if(destformat->type == FORMAT_ARGB) val = make_argb_color(&conv_info, channels);
val = make_argb_color(&conv_info, channels);
if(colorkey) {
get_relevant_argb_components(&ck_conv_info, pixel, channels);
@ -769,13 +767,11 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsi
DWORD val = 0;
/* extract source color components */
if(srcformat->type == FORMAT_ARGB) {
pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel);
get_relevant_argb_components(&conv_info, pixel, channels);
}
pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel);
get_relevant_argb_components(&conv_info, pixel, channels);
/* recombine the components */
if(destformat->type == FORMAT_ARGB) val = make_argb_color(&conv_info, channels);
val = make_argb_color(&conv_info, channels);
if(colorkey) {
get_relevant_argb_components(&ck_conv_info, pixel, channels);