Skip to content

W
wine-winehq
Commit c3cdebcf authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

ddraw: Make some lookup tables const.

parent 517059f3
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
dlls/ddraw/ddraw.c
View file @ c3cdebcf
...@@ -1255,7 +1255,8 @@ static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *s ...@@ -1255,7 +1255,8 @@ static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *s
static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes, DWORD *Codes) static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes, DWORD *Codes)
{ {
IDirectDrawImpl *This = (IDirectDrawImpl *)iface; IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
WINED3DFORMAT formats[] = { static const WINED3DFORMAT formats[] =
{
WINED3DFMT_YUY2, WINED3DFMT_UYVY, WINED3DFMT_YV12, WINED3DFMT_YUY2, WINED3DFMT_UYVY, WINED3DFMT_YV12,
WINED3DFMT_DXT1, WINED3DFMT_DXT2, WINED3DFMT_DXT3, WINED3DFMT_DXT4, WINED3DFMT_DXT5, WINED3DFMT_DXT1, WINED3DFMT_DXT2, WINED3DFMT_DXT3, WINED3DFMT_DXT4, WINED3DFMT_DXT5,
WINED3DFMT_ATI2N, WINED3DFMT_NVHU, WINED3DFMT_NVHS WINED3DFMT_ATI2N, WINED3DFMT_NVHU, WINED3DFMT_NVHS
...@@ -1948,7 +1949,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, ...@@ -1948,7 +1949,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags,
WINED3DDISPLAYMODE *enum_modes = NULL; WINED3DDISPLAYMODE *enum_modes = NULL;
unsigned enum_mode_count = 0, enum_mode_array_size = 0; unsigned enum_mode_count = 0, enum_mode_array_size = 0;
WINED3DFORMAT checkFormatList[] = static const WINED3DFORMAT checkFormatList[] =
{ {
WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_UNORM,
WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B5G6R5_UNORM,
......
dlls/ddraw/device.c
View file @ c3cdebcf
...@@ -1122,7 +1122,8 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, ...@@ -1122,7 +1122,8 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
WINED3DDISPLAYMODE mode; WINED3DDISPLAYMODE mode;
unsigned int i; unsigned int i;
WINED3DFORMAT FormatList[] = { static const WINED3DFORMAT FormatList[] =
{
/* 32 bit */ /* 32 bit */
WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_UNORM,
WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_UNORM,
...@@ -1142,7 +1143,8 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, ...@@ -1142,7 +1143,8 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
WINED3DFMT_DXT5, WINED3DFMT_DXT5,
}; };
WINED3DFORMAT BumpFormatList[] = { static const WINED3DFORMAT BumpFormatList[] =
{
WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_SNORM,
WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R5G5_SNORM_L6_UNORM,
WINED3DFMT_R8G8_SNORM_L8X8_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM,
...@@ -1286,7 +1288,8 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, ...@@ -1286,7 +1288,8 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface,
unsigned int i; unsigned int i;
WINED3DDISPLAYMODE mode; WINED3DDISPLAYMODE mode;
WINED3DFORMAT FormatList[] = { static const WINED3DFORMAT FormatList[] =
{
/* 32 bit */ /* 32 bit */
WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_UNORM,
WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_UNORM,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment