August 2015 - Wine-Commits - list.winehq.org

Aaryaman Vasishta : d3drm: Add stubs for IDirect3DRMTexture methods.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 9eb5361d5aaa63ffef637e7cc405d7a030b32fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb5361d5aaa63ffef637e7cc… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:38 2015 +0530 d3drm: Add stubs for IDirect3DRMTexture methods. --- dlls/d3drm/texture.c | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 307 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9eb5361d5aaa63ffef637…

1 0

Jacek Caban : d3d11.idl: Added some missing declarations.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 4ca5a3567005ff000ddbc6ed21728ca65598cc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca5a3567005ff000ddbc6ed2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 12:27:52 2015 +0200 d3d11.idl: Added some missing declarations. --- include/d3d11.idl | 393 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 393 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ca5a3567005ff000ddbc…

1 0

Henri Verbeet : d3d10core: Get rid of some redundant includes.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 662cfd41443cd3e47edf2a99cb7ebb95b67f00f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=662cfd41443cd3e47edf2a99c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:45 2015 +0200 d3d10core: Get rid of some redundant includes. d3d11.h includes d3d10_1.h, which includes d3d10.h. --- dlls/d3d10core/d3d10core_main.c | 1 - dlls/d3d10core/tests/device.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index fec2786..44f1e29 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -22,7 +22,6 @@ #include "initguid.h" #define COBJMACROS -#include "d3d10_1.h" #include "d3d11.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 47719e4..b35801c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -18,7 +18,6 @@ #define COBJMACROS #include "initguid.h" -#include "d3d10.h" #include "d3d11.h" #include "wine/test.h" #include <limits.h>

1 0

Henri Verbeet : d3d11: Make "layers" static in D3D11CoreRegisterLayers().
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: b87eb8d94722c021105f28f8487ed9ec992d670d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87eb8d94722c021105f28f84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:47 2015 +0200 d3d11: Make "layers" static in D3D11CoreRegisterLayers(). --- dlls/d3d11/d3d11_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index e3d09a1..40c4a5f 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -103,7 +103,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba HRESULT WINAPI D3D11CoreRegisterLayers(void) { - const struct dxgi_device_layer layers[] = + static const struct dxgi_device_layer layers[] = { {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create}, };

1 0

Henri Verbeet : d3d11: Get rid of a redundant include.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 1a23e2fa0b7aafc1d24ea1a9ba85d418e919329b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a23e2fa0b7aafc1d24ea1a9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:46 2015 +0200 d3d11: Get rid of a redundant include. d3d11_1.h includes d3d11.h, which includes d3d10_1.h. --- dlls/d3d11/d3d11_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index f7f6729..98c0eb1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -29,7 +29,6 @@ #include "winuser.h" #include "objbase.h" -#include "d3d10_1.h" #include "d3d11_1.h" #ifdef D3D11_INIT_GUID #include "initguid.h"

1 0

Henri Verbeet : d3d11: Use the IUnknown implementation from the d3d11 interface.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 2edc9584ba9bd95399e9bdeb2559ee54dede6fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2edc9584ba9bd95399e9bdeb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:48 2015 +0200 d3d11: Use the IUnknown implementation from the d3d11 interface. Mostly just for consistency with other D3D code. --- dlls/d3d11/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 049989e..3a1b573 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -44,15 +44,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *ifa TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_ID3D10Device1) - || IsEqualGUID(riid, &IID_ID3D10Device) + if (IsEqualGUID(riid, &IID_ID3D11Device) || IsEqualGUID(riid, &IID_IUnknown)) { - *out = &device->ID3D10Device1_iface; + *out = &device->ID3D11Device_iface; } - else if (IsEqualGUID(riid, &IID_ID3D11Device)) + else if (IsEqualGUID(riid, &IID_ID3D10Device1) + || IsEqualGUID(riid, &IID_ID3D10Device)) { - *out = &device->ID3D11Device_iface; + *out = &device->ID3D10Device1_iface; } else if (IsEqualGUID(riid, &IID_ID3D10Multithread)) {

1 0

Jacek Caban : ntdll: Added new pid debug channel to append process id to debug output.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 719a7d32c5f016084e254df29f32e3cba6f634de URL: http://source.winehq.org/git/wine.git/?a=commit;h=719a7d32c5f016084e254df29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 12:31:21 2015 +0200 ntdll: Added new pid debug channel to append process id to debug output. --- dlls/ntdll/debugtools.c | 3 +++ libs/wine/debug.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index cbbf744..eb43224 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -39,6 +39,7 @@ #include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(tid); +WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); static struct __wine_debug_functions default_funcs; @@ -170,6 +171,8 @@ static int NTDLL_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_chan ULONG ticks = NtGetTickCount(); ret = wine_dbg_printf( "%3u.%03u:", ticks / 1000, ticks % 1000 ); } + if (TRACE_ON(pid)) + ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); if (TRACE_ON(tid)) ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); if (cls < sizeof(classes)/sizeof(classes[0])) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 548ef22..8b04ef9 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -35,6 +35,7 @@ #if defined(__MINGW32__) || defined(_MSC_VER) WINE_DECLARE_DEBUG_CHANNEL(tid); +WINE_DECLARE_DEBUG_CHANNEL(pid); #endif static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; @@ -407,6 +408,8 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch int ret = 0; #if defined(__MINGW32__) || defined(_MSC_VER) + if (TRACE_ON(pid)) + ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); if (TRACE_ON(tid)) ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif

1 0

Aaryaman Vasishta : d3drm: Thunk IDirect3DRMTexture2:: QueryInterface to version 3.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: 895e4a1f661172c7b18beb4ae3ccaa81a4e04537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895e4a1f661172c7b18beb4ae… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:35 2015 +0530 d3drm: Thunk IDirect3DRMTexture2::QueryInterface to version 3. --- dlls/d3drm/texture.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 3b4ee9e..cc6bc49 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -53,25 +53,7 @@ static HRESULT WINAPI d3drm_texture2_QueryInterface(IDirect3DRMTexture2 *iface, TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2) - || IsEqualGUID(riid, &IID_IDirect3DRMTexture) - || IsEqualGUID(riid, &IID_IUnknown)) - { - *out = &texture->IDirect3DRMTexture2_iface; - } - else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) - { - *out = &texture->IDirect3DRMTexture3_iface; - } - else - { - *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; + return IDirect3DRMTexture3_QueryInterface(&texture->IDirect3DRMTexture3_iface, riid, out); } static ULONG WINAPI d3drm_texture2_AddRef(IDirect3DRMTexture2 *iface)

1 0

Aaryaman Vasishta : d3drm: Thunk IDirect3DRMTexture2:: Release to version 3.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: ed411d970150338b01999b2a72ba43b5c93a04d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed411d970150338b01999b2a7… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:34 2015 +0530 d3drm: Thunk IDirect3DRMTexture2::Release to version 3. --- dlls/d3drm/texture.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 6bdf7c2..3b4ee9e 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -86,14 +86,10 @@ static ULONG WINAPI d3drm_texture2_AddRef(IDirect3DRMTexture2 *iface) static ULONG WINAPI d3drm_texture2_Release(IDirect3DRMTexture2 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - ULONG refcount = InterlockedDecrement(&texture->ref); - - TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!refcount) - HeapFree(GetProcessHeap(), 0, texture); + TRACE("iface %p.\n", iface); - return refcount; + return IDirect3DRMTexture3_Release(&texture->IDirect3DRMTexture3_iface); } static HRESULT WINAPI d3drm_texture2_Clone(IDirect3DRMTexture2 *iface,

1 0

Stefan Dösinger : wined3d: Handle multisample_quality if type == MULTISAMPLE_NON_MASKABLE.
by Alexandre Julliard Aug. 25, 2015

Aug. 25, 2015

Module: wine Branch: master Commit: b471b217b28c8ffbb41015e4cc3b62e6ee7a9c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b471b217b28c8ffbb41015e4c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 25 00:43:39 2015 +0200 wined3d: Handle multisample_quality if type == MULTISAMPLE_NON_MASKABLE. --- dlls/wined3d/directx.c | 1 - dlls/wined3d/surface.c | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f52300..019b415 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4405,7 +4405,6 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if (quality_levels) { if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - /* FIXME: This is probably wrong. */ *quality_levels = gl_info->limits.samples; else *quality_levels = 1; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c6d5a5a..85ad4a4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2844,12 +2844,25 @@ void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl { if (multisample) { + DWORD samples; + if (surface->rb_multisample) return; + /* TODO: Nvidia exposes their Coverage Sample Anti-Aliasing (CSAA) feature + * through type == MULTISAMPLE_XX and quality != 0. This could be mapped + * to GL_NV_framebuffer_multisample_coverage. + * + * AMD has a similar feature called Enhanced Quality Anti-Aliasing (EQAA), + * but it does not have an equivalent OpenGL extension. */ + if (surface->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) + samples = surface->resource.multisample_quality; + else + samples = surface->resource.multisample_type; + gl_info->fbo_ops.glGenRenderbuffers(1, &surface->rb_multisample); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, surface->rb_multisample); - gl_info->fbo_ops.glRenderbufferStorageMultisample(GL_RENDERBUFFER, surface->resource.multisample_type, + gl_info->fbo_ops.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, surface->resource.format->glInternal, surface->pow2Width, surface->pow2Height); checkGLcall("glRenderbufferStorageMultisample()"); TRACE("Created multisample rb %u.\n", surface->rb_multisample); @@ -5395,12 +5408,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text unsigned int resource_size; HRESULT hr; - if (multisample_quality > 0) - { - FIXME("multisample_quality set to %u, substituting 0.\n", multisample_quality); - multisample_quality = 0; - } - /* Quick lockable sanity check. * TODO: remove this after surfaces, usage and lockability have been debugged properly * this function is too deep to need to care about things like this.

1 0