[PATCH 4/5] ddraw: Remove support for V16U16.
Stefan Dösinger
stefan at codeweavers.com
Wed Mar 11 04:33:45 CDT 2015
None of my Windows drivers support this format. At best this will
confuse applications trying to pick X8L8V8U8.
---
dlls/ddraw/device.c | 1 -
dlls/ddraw/utils.c | 17 -----------------
2 files changed, 18 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index f0dcf16..582a1d4 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -1066,7 +1066,6 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface,
WINED3DFMT_R8G8_SNORM,
WINED3DFMT_R5G5_SNORM_L6_UNORM,
WINED3DFMT_R8G8_SNORM_L8X8_UNORM,
- WINED3DFMT_R16G16_SNORM,
WINED3DFMT_R10G11B11_SNORM,
WINED3DFMT_R10G10B10_SNORM_A2_UNORM
};
diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c
index f22db3e..c85abb5 100644
--- a/dlls/ddraw/utils.c
+++ b/dlls/ddraw/utils.c
@@ -299,16 +299,6 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_f
DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000;
break;
- case WINED3DFMT_R16G16_SNORM:
- DDPixelFormat->dwFlags = DDPF_BUMPDUDV;
- DDPixelFormat->dwFourCC = 0;
- DDPixelFormat->u1.dwBumpBitCount = 32;
- DDPixelFormat->u2.dwBumpDuBitMask = 0x0000ffff;
- DDPixelFormat->u3.dwBumpDvBitMask = 0xffff0000;
- DDPixelFormat->u4.dwBumpLuminanceBitMask = 0x00000000;
- DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000;
- break;
-
case WINED3DFMT_R5G5_SNORM_L6_UNORM:
DDPixelFormat->dwFlags = DDPF_BUMPDUDV | DDPF_BUMPLUMINANCE;
DDPixelFormat->dwFourCC = 0;
@@ -551,13 +541,6 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix
{
return WINED3DFMT_R8G8_SNORM;
}
- else if ( (DDPixelFormat->u1.dwBumpBitCount == 32 ) &&
- (DDPixelFormat->u2.dwBumpDuBitMask == 0x0000ffff) &&
- (DDPixelFormat->u3.dwBumpDvBitMask == 0xffff0000) &&
- (DDPixelFormat->u4.dwBumpLuminanceBitMask == 0x00000000) )
- {
- return WINED3DFMT_R16G16_SNORM;
- }
else if ( (DDPixelFormat->u1.dwBumpBitCount == 16 ) &&
(DDPixelFormat->u2.dwBumpDuBitMask == 0x0000001f) &&
(DDPixelFormat->u3.dwBumpDvBitMask == 0x000003e0) &&
--
2.3.0
More information about the wine-patches
mailing list