reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 12:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Silence R16 and AL16 fourcc warnings.

Browse Source
This commit is contained in:
Stefan Dösinger 2011-06-02 23:42:21 +02:00 committed by Alexandre Julliard
parent 663fac5bcd
commit 2e3cf68e0b
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/directx.c
View File

@ -3410,6 +3410,8 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const
case WINED3DFMT_R16G16B16A16_SNORM:
case WINED3DFMT_R10G10B10_SNORM_A2_UNORM:
case WINED3DFMT_R10G11B11_SNORM:
case WINED3DFMT_R16:
case WINED3DFMT_AL16:
TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */
return FALSE;

5
dlls/wined3d/utils.c
View File

@ -134,6 +134,9 @@ static const struct StaticPixelFormatDesc formats[] =
{WINED3DFMT_NVHU, 0x0, 0x0, 0x0, 0x0, 2, 0, 0},
{WINED3DFMT_NVHS, 0x0, 0x0, 0x0, 0x0, 2, 0, 0},
{WINED3DFMT_NULL, 0xff000000, 0x000000ff, 0x0000ff00, 0x00ff0000, 4, 0, 0},
/* Unsure about them, could not find a Windows driver that supports them */
{WINED3DFMT_R16, 0x0, 0x0000ffff, 0x0, 0x0, 2, 0, 0},
{WINED3DFMT_AL16, 0xffff0000, 0x0, 0x0, 0x0, 4, 0, 0},
};
struct wined3d_format_base_flags
@ -1765,6 +1768,8 @@ const char *debug_d3dformat(enum wined3d_format_id format_id)
FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM);
FMT_TO_STR(WINED3DFMT_INTZ);
FMT_TO_STR(WINED3DFMT_NULL);
FMT_TO_STR(WINED3DFMT_R16);
FMT_TO_STR(WINED3DFMT_AL16);
#undef FMT_TO_STR
default:
{

2
include/wine/wined3d.h
View File

@ -252,6 +252,8 @@ enum wined3d_format_id
WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'),
WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'),
WINED3DFMT_NULL = WINEMAKEFOURCC('N','U','L','L'),
WINED3DFMT_R16 = WINEMAKEFOURCC(' ','R','1','6'),
WINED3DFMT_AL16 = WINEMAKEFOURCC('A','L','1','6'),
WINED3DFMT_FORCE_DWORD = 0xffffffff
};