October 2015 - Wine-commits

Riccardo Bortolato : d3d9: Avoid using a wined3d_surface in get_desc calls inside d3d9_device_StretchRect.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 46b717c509f0c92a768ef3f3b192ad6a20c4697a URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b717c509f0c92a768ef3f3b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 21 15:09:45 2015 +0200 d3d9: Avoid using a wined3d_surface in get_desc calls inside d3d9_device_StretchRect. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f8ce284..4af6ffb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1302,17 +1302,17 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); HRESULT hr = D3DERR_INVALIDCALL; struct wined3d_resource_desc src_desc, dst_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", iface, src_surface, src_rect, dst_surface, dst_rect, filter); wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(dst->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &dst_desc); + sub_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &dst_desc); - wined3d_resource = wined3d_surface_get_resource(src->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &src_desc); + sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &src_desc); if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) {

1 0

Riccardo Bortolato : d3d9: In surface_init check for GetDC supported at texture level ( avoid using a subresource).
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 1745c5f9604675b111cb05c4cf3a22eb83f48a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1745c5f9604675b111cb05c4c… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 21 15:09:46 2015 +0200 d3d9: In surface_init check for GetDC supported at texture level (avoid using a subresource). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 9a9c838..23bb43c 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -379,7 +379,7 @@ void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_ IDirect3DBaseTexture9_Release(texture); } - wined3d_resource_get_desc(wined3d_surface_get_resource(wined3d_surface), &desc); + wined3d_resource_get_desc(wined3d_texture_get_resource(wined3d_texture), &desc); switch (d3dformat_from_wined3dformat(desc.format)) { case D3DFMT_A8R8G8B8:

1 0

Matteo Bruni : wined3d: Allow FBO blits for depth formats with swizzle fixups.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: b2e1b5968cc85c12549e75d5852f5e28e669a38a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e1b5968cc85c12549e75d58… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 22 00:20:56 2015 +0200 wined3d: Allow FBO blits for depth formats with swizzle fixups. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 15 ++++++++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 320f269..d08259d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1008,6 +1008,10 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; + if (!(src_format->id == dst_format->id + || (is_identity_fixup(src_format->color_fixup) + && is_identity_fixup(dst_format->color_fixup)))) + return FALSE; break; case WINED3D_BLIT_OP_DEPTH_BLIT: @@ -1015,17 +1019,18 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; if (!(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) return FALSE; + /* Accept pure swizzle fixups for depth formats. In general we + * ignore the stencil component (if present) at the moment and the + * swizzle is not relevant with just the depth component. */ + if (is_complex_fixup(src_format->color_fixup) || is_complex_fixup(dst_format->color_fixup) + || is_scaling_fixup(src_format->color_fixup) || is_scaling_fixup(dst_format->color_fixup)) + return FALSE; break; default: return FALSE; } - if (!(src_format->id == dst_format->id - || (is_identity_fixup(src_format->color_fixup) - && is_identity_fixup(dst_format->color_fixup)))) - return FALSE; - return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d75169c..d30b59d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -145,6 +145,11 @@ static inline BOOL is_complex_fixup(struct color_fixup_desc fixup) return fixup.x_source == CHANNEL_SOURCE_COMPLEX0 || fixup.x_source == CHANNEL_SOURCE_COMPLEX1; } +static inline BOOL is_scaling_fixup(struct color_fixup_desc fixup) +{ + return fixup.x_sign_fixup || fixup.y_sign_fixup || fixup.z_sign_fixup || fixup.w_sign_fixup; +} + static inline BOOL is_same_fixup(struct color_fixup_desc f1, struct color_fixup_desc f2) { return f1.x_sign_fixup == f2.x_sign_fixup && f1.x_source == f2.x_source

1 0

Matteo Bruni : wined3d: Add a format fixup for INTZ on core profile.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 59cb65b1531962b4e5eaa98292c9b82c88bf4b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cb65b1531962b4e5eaa9829… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 22 00:20:57 2015 +0200 wined3d: Add a format fixup for INTZ on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9c4fdd9..e7f9cbd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2533,6 +2533,13 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].height_scale.denominator = 2; gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + idx = getFmtIdx(WINED3DFMT_INTZ); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); + } + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { idx = getFmtIdx(WINED3DFMT_P8_UINT);

1 0

Matteo Bruni : d3d8/tests: Extend the INTZ test a bit.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: e7d94a3adc087b9a42ace8c4777bf22122045ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d94a3adc087b9a42ace8c47… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 22 00:20:58 2015 +0200 d3d8/tests: Extend the INTZ test a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 50c763f..9ca3946 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3535,6 +3535,7 @@ done: static void intz_test(void) { IDirect3DSurface8 *original_rt, *rt; + struct surface_readback rb; IDirect3DTexture8 *texture; IDirect3DDevice8 *device; IDirect3DSurface8 *ds; @@ -3549,15 +3550,12 @@ static void intz_test(void) static const DWORD ps_code[] = { 0xffff0101, /* ps_1_1 */ - 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 1.0, 0.0, 0.0, 0.0 */ + 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x3f800000, 0x3f800000, /* def c0, 1.0, 0.0, 1.0, 1.0 */ 0x00000051, 0xa00f0001, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c1, 0.0, 1.0, 0.0, 0.0 */ - 0x00000051, 0xa00f0002, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, /* def c2, 0.0, 0.0, 1.0, 0.0 */ 0x00000042, 0xb00f0000, /* tex t0 */ 0x00000042, 0xb00f0001, /* tex t1 */ - 0x00000008, 0xb0070001, 0xa0e40000, 0xb0e40001, /* dp3 t1.xyz, c0, t1 */ - 0x00000005, 0x80070000, 0xa0e40001, 0xb0e40001, /* mul r0.xyz, c1, t1 */ - 0x00000004, 0x80070000, 0xa0e40000, 0xb0e40000, 0x80e40000, /* mad r0.xyz, c0, t0, r0 */ - 0x40000001, 0x80080000, 0xa0aa0002, /* +mov r0.w, c2.z */ + 0x00000005, 0xb00f0000, 0xa0e40000, 0xb0e40000, /* mul t0, c0, t0 */ + 0x00000004, 0x800f0000, 0xa0e40001, 0xb0e40001, 0xb0e40000, /* mad r0, c1, t1, t0 */ 0x0000ffff, /* end */ }; static const struct @@ -3594,14 +3592,14 @@ static void intz_test(void) } expected_colors[] = { - { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, - {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, - {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, - {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, - { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, - {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, - {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, - {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, + { 80, 100, 0x20204020}, + {240, 100, 0x6060bf60}, + {400, 100, 0x9f9f409f}, + {560, 100, 0xdfdfbfdf}, + { 80, 450, 0x20204020}, + {240, 450, 0x6060bf60}, + {400, 450, 0x9f9f409f}, + {560, 450, 0xdfdfbfdf}, }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -3722,13 +3720,15 @@ static void intz_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); @@ -3778,13 +3778,15 @@ static void intz_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); @@ -3844,13 +3846,15 @@ static void intz_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d8/tests: Extend the shadow test a bit.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: a3432432a07e6d4ec5ed83764acf66843623b9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3432432a07e6d4ec5ed83764… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 22 00:20:59 2015 +0200 d3d8/tests: Extend the shadow test a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 9ca3946..088fe76 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3874,6 +3874,7 @@ done: static void shadow_test(void) { IDirect3DSurface8 *original_rt, *rt; + struct surface_readback rb; IDirect3DDevice8 *device; IDirect3D8 *d3d; ULONG refcount; @@ -3886,15 +3887,12 @@ static void shadow_test(void) static const DWORD ps_code[] = { 0xffff0101, /* ps_1_1 */ - 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 1.0, 0.0, 0.0, 0.0 */ + 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x3f800000, 0x3f800000, /* def c0, 1.0, 0.0, 1.0, 1.0 */ 0x00000051, 0xa00f0001, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c1, 0.0, 1.0, 0.0, 0.0 */ - 0x00000051, 0xa00f0002, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, /* def c2, 0.0, 0.0, 1.0, 0.0 */ 0x00000042, 0xb00f0000, /* tex t0 */ 0x00000042, 0xb00f0001, /* tex t1 */ - 0x00000008, 0xb0070001, 0xa0e40000, 0xb0e40001, /* dp3 t1.xyz, c0, t1 */ - 0x00000005, 0x80070000, 0xa0e40001, 0xb0e40001, /* mul r0.xyz, c1, t1 */ - 0x00000004, 0x80070000, 0xa0e40000, 0xb0e40000, 0x80e40000, /* mad r0.xyz, c0, t0, r0 */ - 0x40000001, 0x80080000, 0xa0aa0002, /* +mov r0.w, c2.z */ + 0x00000005, 0xb00f0000, 0xa0e40000, 0xb0e40000, /* mul t0, c0, t0 */ + 0x00000004, 0x800f0000, 0xa0e40001, 0xb0e40001, 0xb0e40000, /* mad r0, c1, t1, t0 */ 0x0000ffff, /* end */ }; static const struct @@ -3932,14 +3930,14 @@ static void shadow_test(void) } expected_colors[] = { - {400, 60, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - {560, 180, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00)}, - {560, 300, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00)}, - {400, 420, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00)}, - {240, 420, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00)}, - { 80, 300, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - { 80, 180, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - {240, 60, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, + {400, 60, 0x00000000}, + {560, 180, 0xffff00ff}, + {560, 300, 0xffff00ff}, + {400, 420, 0xffffffff}, + {240, 420, 0xffffffff}, + { 80, 300, 0x00000000}, + { 80, 180, 0x00000000}, + {240, 60, 0x00000000}, }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -4066,14 +4064,16 @@ static void shadow_test(void) ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); IDirect3DTexture8_Release(texture); + get_rt_readback(original_rt, &rb); for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { - D3DCOLOR color = getPixelColor(device, expected_colors[j].x, expected_colors[j].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); ok(color_match(color, expected_colors[j].color, 0), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color); } + release_surface_readback(&rb); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0

Matteo Bruni : wined3d: Use the core version of the debug messages functions.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 08bd0ba28c1d56e6a159d9dc1388be40c7dcafcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=08bd0ba28c1d56e6a159d9dc1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 22 00:21:00 2015 +0200 wined3d: Use the core version of the debug messages functions. Reported and tested by Andrey Gusev. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/directx.c | 8 ++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index eee0274..e324875 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1676,27 +1676,27 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (context_debug_output_enabled(gl_info)) { - GL_EXTCALL(glDebugMessageCallbackARB(wined3d_debug_callback, ret)); + GL_EXTCALL(glDebugMessageCallback(wined3d_debug_callback, ret)); if (TRACE_ON(d3d_synchronous)) - gl_info->gl_ops.gl.p_glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB); - GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_FALSE)); + gl_info->gl_ops.gl.p_glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); + GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_FALSE)); if (ERR_ON(d3d)) { - GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_ERROR_ARB, + GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_ERROR, GL_DONT_CARE, 0, NULL, GL_TRUE)); } if (FIXME_ON(d3d)) { - GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB, + GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR, GL_DONT_CARE, 0, NULL, GL_TRUE)); - GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB, + GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR, GL_DONT_CARE, 0, NULL, GL_TRUE)); - GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_PORTABILITY_ARB, + GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_PORTABILITY, GL_DONT_CARE, 0, NULL, GL_TRUE)); } if (WARN_ON(d3d_perf)) { - GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_PERFORMANCE_ARB, + GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_PERFORMANCE, GL_DONT_CARE, 0, NULL, GL_TRUE)); } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a4ccceb..d7f0512 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2924,6 +2924,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */ USE_GL_FUNC(glCreateProgram) /* OpenGL 2.0 */ USE_GL_FUNC(glCreateShader) /* OpenGL 2.0 */ + USE_GL_FUNC(glDebugMessageCallback) /* OpenGL 4.3 */ + USE_GL_FUNC(glDebugMessageControl) /* OpenGL 4.3 */ + USE_GL_FUNC(glDebugMessageInsert) /* OpenGL 4.3 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glDeleteProgram) /* OpenGL 2.0 */ USE_GL_FUNC(glDeleteQueries) /* OpenGL 1.5 */ @@ -2944,6 +2947,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetAttribLocation) /* OpenGL 2.0 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ + USE_GL_FUNC(glGetDebugMessageLog) /* OpenGL 4.3 */ USE_GL_FUNC(glGetProgramInfoLog) /* OpenGL 2.0 */ USE_GL_FUNC(glGetProgramiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetQueryiv) /* OpenGL 1.5 */ @@ -3041,6 +3045,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB); MAP_GL_FUNCTION(glCreateProgram, glCreateProgramObjectARB); MAP_GL_FUNCTION(glCreateShader, glCreateShaderObjectARB); + MAP_GL_FUNCTION(glDebugMessageCallback, glDebugMessageCallbackARB); + MAP_GL_FUNCTION(glDebugMessageControl, glDebugMessageControlARB); + MAP_GL_FUNCTION(glDebugMessageInsert, glDebugMessageInsertARB); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); MAP_GL_FUNCTION(glDeleteProgram, glDeleteObjectARB); MAP_GL_FUNCTION(glDeleteQueries, glDeleteQueriesARB); @@ -3058,6 +3065,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glGetAttribLocation, glGetAttribLocationARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB); + MAP_GL_FUNCTION(glGetDebugMessageLog, glGetDebugMessageLogARB); MAP_GL_FUNCTION(glGetProgramInfoLog, glGetInfoLogARB); MAP_GL_FUNCTION(glGetProgramiv, glGetObjectParameterivARB); MAP_GL_FUNCTION(glGetQueryiv, glGetQueryivARB);

1 0

Józef Kucia : d3d11: Remove outdated FIXME comment.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 7e4453c4fb6d190dc85048a1dcff8eb94a6e49ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4453c4fb6d190dc85048a1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:22 2015 +0200 d3d11: Remove outdated FIXME comment. 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/d3d11/d3d11_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index efc346e..9dd0823 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -347,8 +347,7 @@ cleanup: *obtained_feature_level = 0; if (immediate_context) { - /* FIXME: Remove the following NULL check once the d3d11_device_GetImmediateContext() is implemented. */ - if (*immediate_context) ID3D11DeviceContext_Release(*immediate_context); + ID3D11DeviceContext_Release(*immediate_context); *immediate_context = NULL; }

1 0

Józef Kucia : d3d11: Use CreateDXGIFactory1 to create factory in D3D11CreateDevice.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 22c28d9f5c49fec13854b804df03582ebd132582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c28d9f5c49fec13854b804d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:23 2015 +0200 d3d11: Use CreateDXGIFactory1 to create factory in D3D11CreateDevice. 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/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 9dd0823..8602f00 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -176,7 +176,7 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t } else { - hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + hr = CreateDXGIFactory1(&IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { WARN("Failed to create dxgi factory, returning %#x.\n", hr);

1 0

Józef Kucia : d3d11/tests: Add test for ID3D11Device parents.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: b6462c18daa49d07e7281091355d39e92615532f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6462c18daa49d07e72810913… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:24 2015 +0200 d3d11/tests: Add test for ID3D11Device parents. 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/d3d11/tests/d3d11.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bd9ad64..f54e6e3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -248,6 +248,8 @@ static void test_create_device(void) static void test_device_interfaces(void) { + IDXGIAdapter *dxgi_adapter; + IDXGIDevice *dxgi_device; ID3D11Device *device; IUnknown *iface; ULONG refcount; @@ -270,9 +272,21 @@ static void test_device_interfaces(void) ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); IUnknown_Release(iface); - hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement IDXGIDevice interface, hr %#x.\n", hr); + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory.\n"); + IUnknown_Release(iface); + IDXGIAdapter_Release(dxgi_adapter); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter1, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter1.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory1, (void **)&iface); + ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory1.\n"); IUnknown_Release(iface); + IDXGIAdapter_Release(dxgi_adapter); + IDXGIDevice_Release(dxgi_device); hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,

1 0