From c3cdebcf441343775a4ce715f673aa3daea971cb Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Sun, 22 Aug 2010 23:35:37 +0200 Subject: [PATCH] ddraw: Make some lookup tables const. --- dlls/ddraw/ddraw.c | 5 +++-- dlls/ddraw/device.c | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 73b88b61984..d80dc1e0f74 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1255,7 +1255,8 @@ static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *s static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes, DWORD *Codes) { IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - WINED3DFORMAT formats[] = { + static const WINED3DFORMAT formats[] = + { WINED3DFMT_YUY2, WINED3DFMT_UYVY, WINED3DFMT_YV12, WINED3DFMT_DXT1, WINED3DFMT_DXT2, WINED3DFMT_DXT3, WINED3DFMT_DXT4, WINED3DFMT_DXT5, WINED3DFMT_ATI2N, WINED3DFMT_NVHU, WINED3DFMT_NVHS @@ -1948,7 +1949,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, WINED3DDISPLAYMODE *enum_modes = NULL; unsigned enum_mode_count = 0, enum_mode_array_size = 0; - WINED3DFORMAT checkFormatList[] = + static const WINED3DFORMAT checkFormatList[] = { WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B5G6R5_UNORM, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index bfd98a788c3..3b39177c296 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1122,7 +1122,8 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DDISPLAYMODE mode; unsigned int i; - WINED3DFORMAT FormatList[] = { + static const WINED3DFORMAT FormatList[] = + { /* 32 bit */ WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, @@ -1142,7 +1143,8 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_DXT5, }; - WINED3DFORMAT BumpFormatList[] = { + static const WINED3DFORMAT BumpFormatList[] = + { WINED3DFMT_R8G8_SNORM, WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, @@ -1286,7 +1288,8 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, unsigned int i; WINED3DDISPLAYMODE mode; - WINED3DFORMAT FormatList[] = { + static const WINED3DFORMAT FormatList[] = + { /* 32 bit */ WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM,