Wine-Commits

wine-commits@list.winehq.org

January 2017

2 participants
492 discussions

Andrew Eikum : dsound: Use the value from SetVolume when 3D processing is disabled.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: d961f5ac7e75ccb1a5aac4f20596bf954f2d8500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d961f5ac7e75ccb1a5aac4f20… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 28 14:03:25 2016 -0600 dsound: Use the value from SetVolume when 3D processing is disabled. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/sound3d.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 4f07125..a3a5b41 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -185,6 +185,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) default: TRACE("3D processing disabled\n"); /* this one is here only to eliminate annoying warning message */ + dsb->volpan.lVolume = dsb->ds3db_lVolume; DSOUND_RecalcVolPan (&dsb->volpan); return; }

1 0

Józef Kucia : ddraw: Subtract framebuffer size from reported available video memory.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: 90909951154e1d663bebc134263b4025eacbdabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=90909951154e1d663bebc1342… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 2 10:44:38 2017 +0100 ddraw: Subtract framebuffer size from reported available video memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c9efba6..6afa6dd 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1895,7 +1895,9 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total, DWORD *free) { + unsigned int framebuffer_size, total_vidmem, free_vidmem; struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct wined3d_display_mode mode; HRESULT hr = DD_OK; TRACE("iface %p, caps %p, total %p, free %p.\n", iface, Caps, total, free); @@ -1918,14 +1920,34 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C return DDERR_INVALIDPARAMS; } + /* Some applications (e.g. 3DMark 2000) assume that the reported amount of + * video memory doesn't include the memory used by the default framebuffer. + */ + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + mode.format_id, mode.width); + framebuffer_size *= mode.height; + if (free) - *free = wined3d_device_get_available_texture_mem(ddraw->wined3d_device); + { + free_vidmem = wined3d_device_get_available_texture_mem(ddraw->wined3d_device); + *free = framebuffer_size > free_vidmem ? 0 : free_vidmem - framebuffer_size; + TRACE("Free video memory %#x.\n", *free); + } + if (total) { struct wined3d_adapter_identifier desc = {0}; hr = wined3d_get_adapter_identifier(ddraw->wined3d, WINED3DADAPTER_DEFAULT, 0, &desc); - *total = min(UINT_MAX, desc.video_memory); + total_vidmem = min(UINT_MAX, desc.video_memory); + *total = framebuffer_size > total_vidmem ? 0 : total_vidmem - framebuffer_size; + TRACE("Total video memory %#x.\n", *total); } wined3d_mutex_unlock();

1 0

Jump to page: