Skip to content

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

ddraw: Just set the palette caps in ddraw7_GetCaps().

parent b9ab54a0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
dlls/ddraw/ddraw.c
View file @ 89dedf64
...@@ -1493,7 +1493,7 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD ...@@ -1493,7 +1493,7 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps2 = winecaps.ddraw_caps.caps2; caps.dwCaps2 = winecaps.ddraw_caps.caps2;
caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps; caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps;
caps.dwFXCaps = winecaps.ddraw_caps.fx_caps; caps.dwFXCaps = winecaps.ddraw_caps.fx_caps;
caps.dwPalCaps = winecaps.ddraw_caps.pal_caps; caps.dwPalCaps = DDPCAPS_8BIT | DDPCAPS_PRIMARYSURFACE;
caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps; caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps;
caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps; caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps;
caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps; caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps;
......
dlls/wined3d/directx.c
View file @ 89dedf64
...@@ -4105,7 +4105,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte ...@@ -4105,7 +4105,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
struct shader_caps shader_caps; struct shader_caps shader_caps;
struct fragment_caps fragment_caps; struct fragment_caps fragment_caps;
struct wined3d_vertex_caps vertex_caps; struct wined3d_vertex_caps vertex_caps;
DWORD ckey_caps, blit_caps, fx_caps, pal_caps; DWORD ckey_caps, blit_caps, fx_caps;
TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n",
wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps);
...@@ -4629,8 +4629,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte ...@@ -4629,8 +4629,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINEDDCAPS_COLORKEY | WINEDDCAPS_COLORKEY |
WINEDDCAPS_COLORKEYHWASSIST | WINEDDCAPS_COLORKEYHWASSIST |
WINEDDCAPS_ALIGNBOUNDARYSRC; WINEDDCAPS_ALIGNBOUNDARYSRC;
pal_caps = WINEDDPCAPS_8BIT |
WINEDDPCAPS_PRIMARYSURFACE;
/* Fill the ddraw caps structure */ /* Fill the ddraw caps structure */
caps->ddraw_caps.caps = WINEDDCAPS_GDI | caps->ddraw_caps.caps = WINEDDCAPS_GDI |
...@@ -4643,7 +4641,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte ...@@ -4643,7 +4641,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINEDDCAPS2_CANRENDERWINDOWED; WINEDDCAPS2_CANRENDERWINDOWED;
caps->ddraw_caps.color_key_caps = ckey_caps; caps->ddraw_caps.color_key_caps = ckey_caps;
caps->ddraw_caps.fx_caps = fx_caps; caps->ddraw_caps.fx_caps = fx_caps;
caps->ddraw_caps.pal_caps = pal_caps;
caps->ddraw_caps.svb_caps = blit_caps; caps->ddraw_caps.svb_caps = blit_caps;
caps->ddraw_caps.svb_color_key_caps = ckey_caps; caps->ddraw_caps.svb_color_key_caps = ckey_caps;
caps->ddraw_caps.svb_fx_caps = fx_caps; caps->ddraw_caps.svb_fx_caps = fx_caps;
......
include/wine/wined3d.h
View file @ 89dedf64
...@@ -1737,7 +1737,6 @@ struct wined3d_ddraw_caps ...@@ -1737,7 +1737,6 @@ struct wined3d_ddraw_caps
DWORD color_key_caps; DWORD color_key_caps;
DWORD fx_caps; DWORD fx_caps;
DWORD fx_alpha_caps; DWORD fx_alpha_caps;
DWORD pal_caps;
DWORD sv_caps; DWORD sv_caps;
DWORD svb_caps; DWORD svb_caps;
DWORD svb_color_key_caps; DWORD svb_color_key_caps;
......
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