March 2018 - Wine-commits - list.winehq.org

Roderick Colenbrander : winevulkan: Implement vkDestroyDevice.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 563f1b22005519037cd68bc39f71f61db1597798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=563f1b22005519037cd68bc3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:50 2018 -0800 winevulkan: Implement vkDestroyDevice. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 10 ++++++++++ dlls/winevulkan/vulkan_thunks.c | 5 ----- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 208d26b..04896da 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -94,6 +94,7 @@ FUNCTION_OVERRIDES = { "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, # Device functions + "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : False}, } diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ee877e0..678506f 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -271,6 +271,16 @@ err: return res; } +void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *allocator) +{ + TRACE("%p %p\n", device, allocator); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + wine_vk_device_free(device); +} + void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *allocator) { TRACE("%p, %p\n", instance, allocator); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 13a5d5d..3670926 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -570,11 +570,6 @@ static void WINAPI wine_vkDestroyDescriptorSetLayout(VkDevice device, VkDescript FIXME("stub: %p, 0x%s, %p\n", device, wine_dbgstr_longlong(descriptorSetLayout), pAllocator); } -static void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator) -{ - FIXME("stub: %p, %p\n", device, pAllocator); -} - static void WINAPI wine_vkDestroyEvent(VkDevice device, VkEvent event, const VkAllocationCallbacks *pAllocator) { FIXME("stub: %p, 0x%s, %p\n", device, wine_dbgstr_longlong(event), pAllocator); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 9f5edf5..daf679b 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -14,6 +14,7 @@ void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) DECLSPEC_HIDDEN; +void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Avoid pushl %esp instruction in RtlUnwind prolog.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 342e2cabd21c5a836683ac30e260ec4944eeac6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=342e2cabd21c5a836683ac30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 13:47:01 2018 -0600 ntdll: Avoid pushl %esp instruction in RtlUnwind prolog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 71eff66..17c42cd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2441,7 +2441,9 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16, "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "leal -(0x2cc+8)(%esp),%esp\n\t" /* sizeof(CONTEXT) + alignment */ - "pushl %esp\n\t" /* context */ + "pushl %eax\n\t" + "leal 4(%esp),%eax\n\t" /* context */ + "xchgl %eax,(%esp)\n\t" "call " __ASM_NAME("RtlCaptureContext") __ASM_STDCALL(4) "\n\t" "leal 24(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */

1 0

Alexandre Julliard : ntdll: Fix extra comma in x86_64 relay traces.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: dfde1195385df5ddb11f1104a0e744596b99477f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfde1195385df5ddb11f1104… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 14:13:05 2018 -0600 ntdll: Fix extra comma in x86_64 relay traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 22ce172..255a525 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -745,7 +745,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi TRACE( "%08lx", stack[i] ); break; } - if (!is_ret_val( arg_types[i] )) TRACE( "," ); + if (!is_ret_val( arg_types[i+1] )) TRACE( "," ); } *nb_args = i; TRACE( ") ret=%08lx\n", stack[-1] );

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_blt_special().
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 286f4cd2a4b7e6856babdc16cc172ac8d19678fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=286f4cd2a4b7e6856babdc16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 9 10:19:54 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_blt_special(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 65 ++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21511f0..d14a3df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1922,19 +1922,17 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } -static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, - const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) +static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { - struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_device *device = dst_texture->resource.device; - const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); struct wined3d_swapchain *src_swapchain, *dst_swapchain; - struct wined3d_texture *src_texture; + const struct wined3d_rendertarget_view *rtv; - TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), - flags, fx, debug_d3dtexturefiltertype(filter)); + TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " + "src_sub_resource_idx %u, src_rect %s, flags %#x, fx %p, filter %s.\n", + dst_texture, dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), src_texture, src_sub_resource_idx, + wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); /* Get the swapchain. One of the surfaces has to be a primary surface. */ if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) @@ -1943,27 +1941,19 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE return WINED3DERR_INVALIDCALL; } - dst_swapchain = dst_texture->swapchain; - - if (src_surface) + if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - src_texture = src_surface->container; - if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) - { - WARN("Source resource is not GPU accessible, rejecting GL blit.\n"); - return WINED3DERR_INVALIDCALL; - } - - src_swapchain = src_texture->swapchain; - } - else - { - src_texture = NULL; - src_swapchain = NULL; + WARN("Source resource is not GPU accessible, rejecting GL blit.\n"); + return WINED3DERR_INVALIDCALL; } + src_swapchain = src_texture->swapchain; + dst_swapchain = dst_texture->swapchain; + /* Early sort out of cases where no render target is used */ - if (!dst_swapchain && !src_swapchain && src_surface != rt && dst_surface != rt) + if (!(rtv = dst_texture->resource.device->fb.render_targets[0]) || (!src_swapchain && !dst_swapchain + && (&src_texture->resource != rtv->resource || src_sub_resource_idx != rtv->sub_resource_idx) + && (&dst_texture->resource != rtv->resource || dst_sub_resource_idx != rtv->sub_resource_idx))) { TRACE("No surface is render target, not using hardware blit.\n"); return WINED3DERR_INVALIDCALL; @@ -1992,16 +1982,18 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (dst_swapchain) { /* Handled with regular texture -> swapchain blit */ - if (src_surface == rt) + if (&src_texture->resource == rtv->resource && src_sub_resource_idx == rtv->sub_resource_idx) TRACE("Blit from active render target to a swapchain\n"); } - else if (src_swapchain && dst_surface == rt) + else if (src_swapchain && &dst_texture->resource == rtv->resource + && dst_sub_resource_idx == rtv->sub_resource_idx) { FIXME("Implement blit from a swapchain to the active render target\n"); return WINED3DERR_INVALIDCALL; } - if ((src_swapchain || src_surface == rt) && !dst_swapchain) + if (!dst_swapchain && (src_swapchain || (&src_texture->resource == rtv->resource + && src_sub_resource_idx == rtv->sub_resource_idx))) { unsigned int src_level, src_width, src_height; /* Blit from render target to texture */ @@ -2037,21 +2029,21 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * pixel by pixel. */ - src_level = surface_get_sub_resource_idx(src_surface) % src_texture->level_count; + src_level = src_sub_resource_idx % src_texture->level_count; src_width = wined3d_texture_get_level_width(src_texture, src_level); src_height = wined3d_texture_get_level_height(src_texture, src_level); if (!stretchx || dst_rect->right - dst_rect->left > src_width || dst_rect->bottom - dst_rect->top > src_height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); - fb_copy_to_texture_direct(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, - src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); + fb_copy_to_texture_direct(dst_texture, dst_sub_resource_idx, dst_rect, + src_texture, src_sub_resource_idx, src_rect, filter); } else { TRACE("Using hardware stretching to flip / stretch the texture.\n"); - fb_copy_to_texture_hwstretch(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, - src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); + fb_copy_to_texture_hwstretch(dst_texture, dst_sub_resource_idx, dst_rect, + src_texture, src_sub_resource_idx, src_rect, filter); } return WINED3D_OK; @@ -3928,7 +3920,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wi fallback: /* Special cases for render targets. */ - if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter))) + if (SUCCEEDED(wined3d_texture_blt_special(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, flags, fx, filter))) return WINED3D_OK; cpu:

1 0

Henri Verbeet : usp10: Use heap_calloc() in requires_fallback().
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 9140256ba860adc9890635b3fc1b790f1000718f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9140256ba860adc9890635b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 9 10:19:55 2018 +0330 usp10: Use heap_calloc() in requires_fallback(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index cf42c93..5442830 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1948,8 +1948,7 @@ static BOOL requires_fallback(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, if (SHAPE_CheckFontForRequiredFeatures(hdc, (ScriptCache *)*psc, psa) != S_OK) return TRUE; - glyphs = heap_alloc(sizeof(WORD) * cChars); - if (!glyphs) + if (!(glyphs = heap_calloc(cChars, sizeof(*glyphs)))) return FALSE; if (ScriptGetCMap(hdc, psc, pwcInChars, cChars, 0, glyphs) != S_OK) {

1 0

Matteo Bruni : wined3d: Only copy the source/ destination rectangles when needed in texture2d_blt_fbo().
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: acf8c4b76cbb639a839265cb569a1b78279aefff URL: https://source.winehq.org/git/wine.git/?a=commit;h=acf8c4b76cbb639a839265cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 10:19:56 2018 +0330 wined3d: Only copy the source/destination rectangles when needed in texture2d_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d14a3df..fa25b03 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -368,25 +368,22 @@ static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD * Depth / stencil is not supported. Context activation is done by the caller. */ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3d_context *context, enum wined3d_texture_filter_type filter, struct wined3d_texture *src_texture, - unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect_in, + unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, - const RECT *dst_rect_in) + const RECT *dst_rect) { struct wined3d_texture *required_texture, *restore_texture; unsigned int required_idx, restore_idx; const struct wined3d_gl_info *gl_info; - RECT src_rect, dst_rect; GLenum gl_filter; GLenum buffer; + RECT s, d; TRACE("device %p, context %p, filter %s, src_texture %p, src_sub_resource_idx %u, src_location %s, " "src_rect %s, dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s.\n", device, context, debug_d3dtexturefiltertype(filter), src_texture, src_sub_resource_idx, - wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect_in), dst_texture, - dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect_in)); - - src_rect = *src_rect_in; - dst_rect = *dst_rect_in; + wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), dst_texture, + dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); switch (filter) { @@ -405,8 +402,8 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 /* Resolve the source surface first if needed. */ if (is_multisample_location(src_texture, src_location) && (src_texture->resource.format->id != dst_texture->resource.format->id - || abs(src_rect.bottom - src_rect.top) != abs(dst_rect.bottom - dst_rect.top) - || abs(src_rect.right - src_rect.left) != abs(dst_rect.right - dst_rect.left))) + || abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) + || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left))) src_location = WINED3D_LOCATION_RB_RESOLVED; /* Make sure the locations are up-to-date. Loading the destination @@ -414,7 +411,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); - if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) + if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); @@ -456,7 +453,9 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 { TRACE("Source texture %p is onscreen.\n", src_texture); buffer = wined3d_texture_get_gl_buffer(src_texture); - wined3d_texture_translate_drawable_coords(src_texture, context->win_handle, &src_rect); + s = *src_rect; + wined3d_texture_translate_drawable_coords(src_texture, context->win_handle, &s); + src_rect = &s; } else { @@ -474,7 +473,9 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 { TRACE("Destination texture %p is onscreen.\n", dst_texture); buffer = wined3d_texture_get_gl_buffer(dst_texture); - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &dst_rect); + d = *dst_rect; + wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &d); + dst_rect = &d; } else { @@ -497,8 +498,8 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE)); - gl_info->fbo_ops.glBlitFramebuffer(src_rect.left, src_rect.top, src_rect.right, src_rect.bottom, - dst_rect.left, dst_rect.top, dst_rect.right, dst_rect.bottom, GL_COLOR_BUFFER_BIT, gl_filter); + gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, + dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, GL_COLOR_BUFFER_BIT, gl_filter); checkGLcall("glBlitFramebuffer()"); if (wined3d_settings.strict_draw_ordering || (dst_location == WINED3D_LOCATION_DRAWABLE

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_load_fb_texture().
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 2179e99120ae5c77ff8531d971620864f3b7cc28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2179e99120ae5c77ff8531d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 9 10:19:51 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_load_fb_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 25 ++++++++++++------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87a233f..23f4d04 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7832,7 +7832,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl * flip in the blitter, we don't actually need that flip anyway. So we * use the surface's texture as scratch texture, and flip the source * rectangle instead. */ - surface_load_fb_texture(src_surface, FALSE, context); + texture2d_load_fb_texture(src_texture, src_sub_resource_idx, FALSE, context); s = *src_rect; s.top = wined3d_texture_get_level_height(src_texture, src_level) - s.top; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 201a563..c2b1cd5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1479,22 +1479,21 @@ error: * * Context activation is done by the caller. This function may temporarily * switch to a different context and restore the original one before return. */ -void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *old_ctx) +void texture2d_load_fb_texture(struct wined3d_texture *texture, + unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; + struct wined3d_texture *restore_texture; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context = old_ctx; - struct wined3d_surface *restore_rt = NULL; - unsigned int level; + unsigned int restore_idx, level; GLenum target; - restore_rt = context_get_rt_surface(old_ctx); - if (restore_rt != surface) + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) context = context_acquire(device, texture, sub_resource_idx); else - restore_rt = NULL; + restore_texture = NULL; gl_info = context->gl_info; device_invalidate_state(device, STATE_FRAMEBUFFER); @@ -1502,7 +1501,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); - TRACE("Reading back offscreen render target %p.\n", surface); + TRACE("Reading back offscreen render target %p, %u.\n", texture, sub_resource_idx); if (wined3d_resource_is_offscreen(&texture->resource)) gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); @@ -1517,8 +1516,8 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_texture_get_level_height(texture, level)); checkGLcall("glCopyTexSubImage2D"); - if (restore_rt) - context_restore(context, restore_rt); + if (restore_texture) + context_restore(context, restore_texture->sub_resources[sub_resource_idx].u.surface); } /* Does a direct frame buffer -> texture copy. Stretching is done with single @@ -2184,7 +2183,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re && wined3d_resource_is_offscreen(&texture->resource) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - surface_load_fb_texture(sub_resource->u.surface, srgb, context); + texture2d_load_fb_texture(texture, sub_resource_idx, srgb, context); return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 853f9e2..e3d669a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3236,6 +3236,8 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) DECLSPEC_HIDDEN; +void texture2d_load_fb_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, + BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -3346,8 +3348,6 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wined3d_box *dst_box, struct wined3d_surface *src_surface, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, - struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb,

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_direct().
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 628cd4425b512e2ad5463d4ea51b855f5e086b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=628cd4425b512e2ad5463d4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 9 10:19:52 2018 +0330 wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c2b1cd5..b5129d5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1522,13 +1522,10 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, /* Does a direct frame buffer -> texture copy. Stretching is done with single * pixel copy calls. */ -static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, - const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) +static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect_in, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, enum wined3d_texture_filter_type filter) { - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; - struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; unsigned int src_height, src_level, dst_level; const struct wined3d_gl_info *gl_info; @@ -2050,7 +2047,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE || dst_rect->bottom - dst_rect->top > src_height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); - fb_copy_to_texture_direct(dst_surface, src_surface, src_rect, dst_rect, filter); + fb_copy_to_texture_direct(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, + src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); } else {

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_hwstretch().
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 21e6abc8a0fbd5cff5e3b7b7fd829bc1bcba851e URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e6abc8a0fbd5cff5e3b7b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 9 10:19:53 2018 +0330 wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b5129d5..21511f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1639,14 +1639,11 @@ static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsig } /* Uses the hardware to stretch and flip the image */ -static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, - const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) +static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect_in, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, enum wined3d_texture_filter_type filter) { unsigned int src_width, src_height, src_pow2_width, src_pow2_height, src_level; - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; - struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; GLenum src_target, dst_target, texture_target; GLuint src, backup = 0; @@ -1718,7 +1715,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st checkGLcall("glEnable(texture_target)"); /* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */ - surface_get_sub_resource(src_surface)->locations &= ~WINED3D_LOCATION_TEXTURE_RGB; + src_texture->sub_resources[src_sub_resource_idx].locations &= ~WINED3D_LOCATION_TEXTURE_RGB; } /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag @@ -2053,7 +2050,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE else { TRACE("Using hardware stretching to flip / stretch the texture.\n"); - fb_copy_to_texture_hwstretch(dst_surface, src_surface, src_rect, dst_rect, filter); + fb_copy_to_texture_hwstretch(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, + src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); } return WINED3D_OK;

1 0

Francois Gouget : testbot: Remove an unneeded EnumPropertyDescriptor import.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: tools Branch: master Commit: fc623cc0e611a7d46226cedb267a055c57a5455b URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc623cc0e611a7d46226ced… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 9 13:34:49 2018 +0100 testbot: Remove an unneeded EnumPropertyDescriptor import. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/RecordGroups.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index cde1a8d..dfa83ae 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -57,7 +57,6 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects =cut use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Records;

1 0