November 2015 - Wine-Commits

Riccardo Bortolato : wined3d: Make wined3d_device_copy_sub_resource_region return an error code.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 4a4efc35062ad5d99ba344a48d4d6111f6287abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4efc35062ad5d99ba344a48… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Oct 29 16:49:28 2015 +0100 wined3d: Make wined3d_device_copy_sub_resource_region return an error code. 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/wined3d/device.c | 16 +++++++++------- include/wine/wined3d.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d00f263..4806e3d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3867,7 +3867,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, } } -void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device, +HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) @@ -3886,7 +3886,7 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx) { WARN("Source and destination are the same sub-resource.\n"); - return; + return WINED3DERR_INVALIDCALL; } if (src_resource->type != dst_resource->type) @@ -3894,7 +3894,7 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device WARN("Resource types (%s / %s) don't match.\n", debug_d3dresourcetype(dst_resource->type), debug_d3dresourcetype(src_resource->type)); - return; + return WINED3DERR_INVALIDCALL; } if (src_resource->format->id != dst_resource->format->id) @@ -3902,20 +3902,20 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device WARN("Resource formats (%s / %s) don't match.\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id)); - return; + return WINED3DERR_INVALIDCALL; } if (dst_resource->type != WINED3D_RTYPE_TEXTURE) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); - return; + return WINED3DERR_INVALIDCALL; } dst_texture = wined3d_texture_from_resource(dst_resource); if (!(tmp = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx))) { WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); - return; + return WINED3DERR_INVALIDCALL; } dst_surface = surface_from_resource(tmp); @@ -3923,7 +3923,7 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device if (!(tmp = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx))) { WARN("Invalid src_sub_resource_idx %u.\n", src_sub_resource_idx); - return; + return WINED3DERR_INVALIDCALL; } src_surface = surface_from_resource(tmp); @@ -3939,6 +3939,8 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) ERR("Failed to blit, hr %#x.\n", hr); + + return hr; } void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9cc1e1c..52c822e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2130,7 +2130,7 @@ HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *de struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color); void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource); -void __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box);

1 0

Matteo Bruni : wined3d: Cleanup extension check for shader model 4 support.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 905261ab40dbf5e3be4664e210d6b3bfd2bb3dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905261ab40dbf5e3be4664e21… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 29 15:09:53 2015 +0100 wined3d: Cleanup extension check for shader model 4 support. This essentially enables shader model 4 support with Mesa or OS X when using 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/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 6 ++---- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d7f0512..046c6eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3553,6 +3553,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (gl_version >= MAKEDWORD_VERSION(2, 0)) gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; + if (gl_version >= MAKEDWORD_VERSION(3, 2)) + gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; if (gl_info->supported[APPLE_FENCE]) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a95e44..44e7090 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7761,10 +7761,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s { UINT shader_model; - if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_SHADER_BIT_ENCODING] - && gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) - && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED] - && gl_info->supported[ARB_TEXTURE_RG] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] + && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2be7262..437f62f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -165,6 +165,7 @@ enum wined3d_gl_extension WINED3D_GL_NORMALIZED_TEXRECT, WINED3D_GL_LEGACY_CONTEXT, WINED3D_GL_VERSION_2_0, + WINED3D_GL_VERSION_3_2, WINED3D_GL_EXT_COUNT, };

1 0

Andrew Eikum : xaudio2/tests: Fix memory leaks.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 23a0c7f677079dd5f6aa4c51319140f045eee26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a0c7f677079dd5f6aa4c513… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 30 08:55:39 2015 -0500 xaudio2/tests: Fix memory leaks. Spotted by Nikolay Sivov. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 3f03cc6..c7ae982 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -766,6 +766,13 @@ static void test_looping(IXAudio2 *xa) ok(played - running_total == 22050 + 44100 * 2, "Got wrong samples played: %u\n", played - running_total); ok(nloopends == (played - running_total) / 88200 + 1, "Got wrong OnLoopEnd calls: %u\n", nloopends); running_total = played; + + if(xaudio27) + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + else + IXAudio2SourceVoice_DestroyVoice(src); + IXAudio2MasteringVoice_DestroyVoice(master); + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); } static UINT32 test_DeviceDetails(IXAudio27 *xa)

1 0