Henri Verbeet : ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D().
Alexandre Julliard
julliard at winehq.org
Tue Sep 13 12:18:07 CDT 2011
Module: wine
Branch: master
Commit: f2115004d551e337799b03b9739546536fa2619a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2115004d551e337799b03b9739546536fa2619a
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Sep 12 19:51:16 2011 +0200
ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D().
Most of these would just be the result of the application giving us invalid
pixel formats.
---
dlls/ddraw/utils.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c
index d2a4194..b341a78 100644
--- a/dlls/ddraw/utils.c
+++ b/dlls/ddraw/utils.c
@@ -426,7 +426,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
{
return WINED3DFMT_B2G3R3A8_UNORM;
}
- ERR("16 bit RGB Pixel format does not match\n");
+ WARN("16 bit RGB Pixel format does not match.\n");
return WINED3DFMT_UNKNOWN;
case 24:
@@ -445,10 +445,10 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
return WINED3DFMT_B8G8R8X8_UNORM;
}
- ERR("32 bit RGB pixel format does not match\n");
+ WARN("32 bit RGB pixel format does not match.\n");
default:
- ERR("Invalid dwRGBBitCount in Pixelformat structure\n");
+ WARN("Invalid dwRGBBitCount in Pixelformat structure.\n");
return WINED3DFMT_UNKNOWN;
}
}
@@ -460,12 +460,12 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
case 1:
case 2:
case 4:
- ERR("Unsupported Alpha-Only bit depth 0x%x\n", DDPixelFormat->u1.dwAlphaBitDepth);
+ FIXME("Unsupported Alpha-Only bit depth 0x%x.\n", DDPixelFormat->u1.dwAlphaBitDepth);
case 8:
return WINED3DFMT_A8_UNORM;
default:
- ERR("Invalid AlphaBitDepth in Alpha-Only Pixelformat\n");
+ WARN("Invalid AlphaBitDepth in Alpha-Only Pixelformat.\n");
return WINED3DFMT_UNKNOWN;
}
}
@@ -480,17 +480,17 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
case 4:
if(DDPixelFormat->u1.dwAlphaBitDepth == 4)
return WINED3DFMT_L4A4_UNORM;
- ERR("Unknown Alpha / Luminance bit depth combination\n");
+ WARN("Unknown Alpha / Luminance bit depth combination.\n");
return WINED3DFMT_UNKNOWN;
case 6:
- ERR("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!\n");
+ FIXME("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.\n");
return WINED3DFMT_R5G5_SNORM_L6_UNORM;
case 8:
if(DDPixelFormat->u1.dwAlphaBitDepth == 8)
return WINED3DFMT_L8A8_UNORM;
- ERR("Unknown Alpha / Lumincase bit depth combination\n");
+ WARN("Unknown Alpha / Lumincase bit depth combination.\n");
return WINED3DFMT_UNKNOWN;
}
}
@@ -500,14 +500,14 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
switch(DDPixelFormat->u1.dwLuminanceBitCount)
{
case 6:
- ERR("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!\n");
+ FIXME("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.\n");
return WINED3DFMT_R5G5_SNORM_L6_UNORM;
case 8:
return WINED3DFMT_L8_UNORM;
default:
- ERR("Unknown luminance-only bit depth 0x%x\n", DDPixelFormat->u1.dwLuminanceBitCount);
+ WARN("Unknown luminance-only bit depth 0x%x.\n", DDPixelFormat->u1.dwLuminanceBitCount);
return WINED3DFMT_UNKNOWN;
}
}
@@ -599,7 +599,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
}
}
- ERR("Unknown Pixelformat!\n");
+ WARN("Unknown Pixelformat.\n");
return WINED3DFMT_UNKNOWN;
}
More information about the wine-cvs
mailing list