wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Józef Kucia : libs/vkd3d-shader: Use unified SPIR-V headers.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: vkd3d Branch: master Commit: ccc49fe00d4ee6319a912b7f64e3ae386297fa04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ccc49fe00d4ee6319a912b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 16 12:16:22 2018 +0200 libs/vkd3d-shader: Use unified SPIR-V headers. 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> --- configure.ac | 6 +++--- libs/vkd3d-shader/spirv.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index d00630b..820783a 100644 --- a/configure.ac +++ b/configure.ac @@ -48,11 +48,11 @@ VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no]) dnl Check for headers -AC_CHECK_HEADERS([pthread.h vulkan/vulkan.h spirv/1.0/spirv.h spirv/1.0/GLSL.std.450.h]) +AC_CHECK_HEADERS([pthread.h vulkan/vulkan.h spirv/unified1/spirv.h spirv/unified1/GLSL.std.450.h]) AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])]) AS_IF([test "x$ac_cv_header_vulkan_vulkan_h" != "xyes"], [AC_MSG_ERROR([vulkan.h not found.])]) -AS_IF([test "x$ac_cv_header_spirv_1_0_spirv_h" != "xyes"], [AC_MSG_ERROR([spirv.h not found.])]) -AS_IF([test "x$ac_cv_header_spirv_1_0_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) +AS_IF([test "x$ac_cv_header_spirv_unified1_spirv_h" != "xyes"], [AC_MSG_ERROR([spirv.h not found.])]) +AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 89b1187..8a1fdf4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -21,8 +21,8 @@ #include <stdarg.h> #include <stdio.h> -#include "spirv/1.0/spirv.h" -#include "spirv/1.0/GLSL.std.450.h" +#include "spirv/unified1/spirv.h" +#include "spirv/unified1/GLSL.std.450.h" #ifdef HAVE_SPIRV_TOOLS # include "spirv-tools/libspirv.h" #endif /* HAVE_SPIRV_TOOLS */ @@ -87,6 +87,7 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} #endif /* HAVE_SPIRV_TOOLS */ +#define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 0 #define VKD3D_SPIRV_GENERATOR_MAGIC ((VKD3D_SPIRV_GENERATOR_ID << 16) | VKD3D_SPIRV_GENERATOR_VERSION) @@ -1543,7 +1544,7 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_stream_init(&stream); vkd3d_spirv_build_word(&stream, SpvMagicNumber); - vkd3d_spirv_build_word(&stream, SpvVersion); + vkd3d_spirv_build_word(&stream, VKD3D_SPIRV_VERSION); vkd3d_spirv_build_word(&stream, VKD3D_SPIRV_GENERATOR_MAGIC); vkd3d_spirv_build_word(&stream, builder->current_id); /* bound */ vkd3d_spirv_build_word(&stream, 0); /* schema, reserved */

1 0

Józef Kucia : libs/vkd3d: Mark device as removed when command list in recording state is executed.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: vkd3d Branch: master Commit: f0a1e1411363da4c139fc75bcb9fcc0171cb5d32 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0a1e1411363da4c139fc75… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 16 12:16:21 2018 +0200 libs/vkd3d: Mark device as removed when command list in recording state is executed. Fixes a GPU hang in test_device_removed_reason() on RADV. 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> --- include/private/vkd3d_debug.h | 3 +++ libs/vkd3d-common/debug.c | 17 ++++++++++++----- libs/vkd3d/command.c | 13 ++++++++++++- libs/vkd3d/device.c | 21 +++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 4 ++++ tests/d3d12.c | 4 ++-- 6 files changed, 52 insertions(+), 10 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index b9d4bcd..e5e938d 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -21,6 +21,8 @@ #include "vkd3d_common.h" +#include <stdarg.h> + enum vkd3d_dbg_level { VKD3D_DBG_LEVEL_NONE, @@ -36,6 +38,7 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2) DECLSPEC_HIDDEN; +const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args) DECLSPEC_HIDDEN; const char *debugstr_a(const char *str) DECLSPEC_HIDDEN; const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 9cdf2a9..b838045 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -20,7 +20,6 @@ #include <assert.h> #include <ctype.h> -#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -89,19 +88,27 @@ static char *get_buffer(void) return buffers[current_index]; } -const char *vkd3d_dbg_sprintf(const char *fmt, ...) +const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args) { char *buffer; - va_list args; buffer = get_buffer(); - va_start(args, fmt); vsnprintf(buffer, VKD3D_DEBUG_BUFFER_SIZE, fmt, args); - va_end(args); buffer[VKD3D_DEBUG_BUFFER_SIZE - 1] = '\0'; return buffer; } +const char *vkd3d_dbg_sprintf(const char *fmt, ...) +{ + const char *buffer; + va_list args; + + va_start(args, fmt); + buffer = vkd3d_dbg_vsprintf(fmt, args); + va_end(args); + return buffer; +} + const char *debugstr_a(const char *str) { char *buffer, *ptr; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b7b774b..82a99fd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4191,6 +4191,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_command_list *cmd_list; struct VkSubmitInfo submit_desc; VkCommandBuffer *buffers; VkQueue vk_queue; @@ -4210,7 +4211,17 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm for (i = 0; i < command_list_count; ++i) { - buffers[i] = unsafe_impl_from_ID3D12CommandList(command_lists[i])->vk_command_buffer; + cmd_list = unsafe_impl_from_ID3D12CommandList(command_lists[i]); + + if (cmd_list->is_recording) + { + d3d12_device_mark_as_removed(command_queue->device, DXGI_ERROR_INVALID_CALL, + "Command list %p is in recording state.\n", command_lists[i]); + vkd3d_free(buffers); + return; + } + + buffers[i] = cmd_list->vk_command_buffer; } submit_desc.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 805d477..48ad7c5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1943,9 +1943,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_GetDeviceRemovedReason(ID3D12Device *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d12_device *device = impl_from_ID3D12Device(iface); - return S_OK; + TRACE("iface %p.\n", iface); + + return device->removed_reason; } static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *iface, @@ -2245,6 +2247,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); + device->removed_reason = S_OK; + return S_OK; } @@ -2270,6 +2274,19 @@ HRESULT d3d12_device_create(struct vkd3d_instance *instance, return S_OK; } +void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, + const char *message, ...) +{ + va_list args; + + va_start(args, message); + WARN("Device %p is lost (reason %#x, message \"%s\").\n", + device, reason, vkd3d_dbg_vsprintf(message, args)); + va_end(args); + + device->removed_reason = reason; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 246c42b..4a359db 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -683,10 +683,14 @@ struct d3d12_device IUnknown *parent; LUID adapter_luid; + + HRESULT removed_reason; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN; +void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, + const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; HRESULT vkd3d_create_buffer(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index 7dfee87..ea7d24d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4598,7 +4598,7 @@ static void test_device_removed_reason(void) exec_command_list(queue, command_list); hr = ID3D12Device_GetDeviceRemovedReason(device); - todo(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, (void **)&tmp_queue); @@ -4607,7 +4607,7 @@ static void test_device_removed_reason(void) ID3D12CommandQueue_Release(tmp_queue); hr = ID3D12Device_GetDeviceRemovedReason(device); - todo(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ID3D12GraphicsCommandList_Release(command_list); ID3D12CommandAllocator_Release(command_allocator);

1 0

Józef Kucia : build: Remove rpc.h and rpcndr.h includes from generated headers.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: vkd3d Branch: master Commit: ce9ec9a44a62eee4ddc8c3551e4fd41cf80f37f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce9ec9a44a62eee4ddc8c35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:44 2018 +0200 build: Remove rpc.h and rpcndr.h includes from generated headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +-- include/dummy/rpc.h | 30 ------------------------------ include/dummy/rpcndr.h | 25 ------------------------- include/vkd3d_windows.h | 1 + 4 files changed, 2 insertions(+), 57 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8f0fc5f..aa2e2f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,8 +14,6 @@ widl_headers = \ include/vkd3d_dxgitype.h vkd3d_public_headers = \ - include/dummy/rpc.h \ - include/dummy/rpcndr.h \ include/vkd3d.h \ include/vkd3d_d3d12.h \ include/vkd3d_d3dcommon.h \ @@ -149,6 +147,7 @@ EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL $(VKD3D_V_WIDL)$(WIDL) -o $@ $< + sed -e '/#include <$rpc.h\|rpcndr.h$>/d' -i $@ else echo "widl is required to generate $<" endif diff --git a/include/dummy/rpc.h b/include/dummy/rpc.h deleted file mode 100644 index 259a37a..0000000 --- a/include/dummy/rpc.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2016 Józef Kucia for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* XXX: This is a dummy header required by files generated by widl. */ -#ifndef __VKD3D_RPC_H__ -#define __VKD3D_RPC_H__ - -#define __RPC_STUB - -typedef struct IRpcStubBuffer IRpcStubBuffer; -typedef struct IRpcChannelBuffer IRpcChannelBuffer; - -typedef struct PRPC_MESSAGE PRPC_MESSAGE; - -#endif /* __VKD3D_RPC_H__ */ diff --git a/include/dummy/rpcndr.h b/include/dummy/rpcndr.h deleted file mode 100644 index 8d9b82c..0000000 --- a/include/dummy/rpcndr.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2016 Józef Kucia for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* XXX: This is a dummy header required by files generated by widl. */ -#ifndef __VKD3D_RPCNDR_H -#define __VKD3D_RPCNDR_H - -#define MIDL_INTERFACE(x) struct - -#endif /* __VKD3D_RPCNDR_H */ diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 425d139..9cea6b4 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -182,6 +182,7 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; # define interface struct # define BEGIN_INTERFACE # define END_INTERFACE +# define MIDL_INTERFACE(x) struct # ifdef __cplusplus # define EXTERN_C extern "C"

1 0

Alexandre Julliard : Wine release 3.6
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: website Branch: master Commit: 6d083cc25f7690741e4a8bb273a2488f8d57a6b2 URL: https://source.winehq.org/git/website.git/?a=commit;h=6d083cc25f7690741e4a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 22:55:07 2018 +0200 Wine release 3.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018041301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018041301.xml b/news/en/2018041301.xml new file mode 100644 index 0000000..70cd49e --- /dev/null +++ b/news/en/2018041301.xml @@ -0,0 +1,16 @@ +<news> +<date>April 13, 2018</date> +<title>Wine 3.6 Released</title> +<body> + The Wine development release 3.6 is now available. + <a href="{$root}/announce/3.6">What's new</a> in this release: +<ul> + <li>Support for PNG format icons.</li> + <li>Support for 1D textures.</li> + <li>More infrastructure for high DPI support.</li> + <li>OLE data cache improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.6 : Alexandre Julliard : Release 3.6
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: refs/tags/wine-3.6 Tag: ca045dc2098ec9516a5909a733504bebdf226943 URL: https://source.winehq.org/git/wine.git/?a=tag;h=ca045dc2098ec9516a5909a7335… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 22:52:23 2018 +0200 Release 3.6

1 0

Alexandre Julliard : Release 3.6.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 3f281a3baad9f5f8f875da902718a1d5d3dc0d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f281a3baad9f5f8f875da90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 22:52:23 2018 +0200 Release 3.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 754 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 349 insertions(+), 429 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f281a3baad9f5f8f875…

1 0

Matteo Bruni : ddraw/tests: Remove a few unnecessary render state settings.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 267bd0d3ead26bbe297a467366aa290fd0f714f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=267bd0d3ead26bbe297a4673… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 13 00:07:45 2018 +0200 ddraw/tests: Remove a few unnecessary render state settings. 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/ddraw/tests/ddraw1.c | 2 -- dlls/ddraw/tests/ddraw2.c | 13 ------------- dlls/ddraw/tests/ddraw4.c | 22 ---------------------- 3 files changed, 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=267bd0d3ead26bbe297a…

1 0

Matteo Bruni : ddraw: Forbid setting viewport extents larger than the render target in SetViewport2 ().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 7df2060167a8df4020191d3eb17c245b617ac764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df2060167a8df4020191d3e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 13 00:07:43 2018 +0200 ddraw: Forbid setting viewport extents larger than the render target in SetViewport2(). 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/ddraw/viewport.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 61b3138..0bc746e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -915,7 +915,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); struct d3d_device *device = viewport->active_device; + struct wined3d_sub_resource_desc rt_desc; + struct wined3d_rendertarget_view *rtv; IDirect3DViewport3 *current_viewport; + struct ddraw_surface *surface; TRACE("iface %p, vp %p.\n", iface, vp); @@ -928,20 +931,42 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI _dump_D3DVIEWPORT2(vp); } + if (!device) + { + WARN("Viewport not bound to a device, returning D3DERR_VIEWPORTHASNODEVICE.\n"); + return D3DERR_VIEWPORTHASNODEVICE; + } + wined3d_mutex_lock(); + if (device->version > 1) + { + if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + { + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); + + if (vp->dwX > rt_desc.width || vp->dwWidth > rt_desc.width - vp->dwX + || vp->dwY > rt_desc.height || vp->dwHeight > rt_desc.height - vp->dwY) + { + WARN("Invalid viewport, returning DDERR_INVALIDPARAMS.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + } + viewport->use_vp2 = 1; memset(&viewport->viewports.vp2, 0, sizeof(viewport->viewports.vp2)); memcpy(&viewport->viewports.vp2, vp, vp->dwSize); - if (device) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) { - if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) - { - if (current_viewport == iface) - viewport_activate(viewport, FALSE); - IDirect3DViewport3_Release(current_viewport); - } + if (current_viewport == iface) + viewport_activate(viewport, FALSE); + IDirect3DViewport3_Release(current_viewport); } wined3d_mutex_unlock();

1 0

Matteo Bruni : ddraw: Return error on NULL viewport in {Get, Set}Viewport[ 2]().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 233af364828639f9d79525b59a2e9957a775af8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=233af364828639f9d79525b5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 13 00:07:42 2018 +0200 ddraw: Return error on NULL viewport in {Get, Set}Viewport[2](). 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/ddraw/viewport.c | 197 +++++++++++++++++++++----------------------------- 1 file changed, 82 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=233af364828639f9d795…

1 0

Matteo Bruni : d3d9: Don' t store currently used textures in the d3d9 device.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 6cfab2f7adf8d8a32b5fad6bf75f9859e6fa0b01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cfab2f7adf8d8a32b5fad6b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 13 00:07:41 2018 +0200 d3d9: Don't store currently used textures in the d3d9 device. The texture tracking in d3d9 was not correct for applications using stateblocks. 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/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 23 ++++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 38fe06c..c50aabf 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -101,7 +101,6 @@ struct d3d9_device UINT index_buffer_size; UINT index_buffer_pos; - struct d3d9_texture *textures[D3D9_MAX_TEXTURE_UNITS]; struct d3d9_surface *render_targets[D3D_MAX_SIMULTANEOUS_RENDERTARGETS]; LONG device_state; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2265c1d..d533afb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -981,10 +981,6 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->device_state = D3D9_DEVICE_STATE_OK; } - if (!device->d3d_parent->extended) - for (i = 0; i < ARRAY_SIZE(device->textures); ++i) - device->textures[i] = NULL; - rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent(rtv); for (i = 1; i < ARRAY_SIZE(device->render_targets); ++i) @@ -2402,13 +2398,6 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, texture_impl ? texture_impl->wined3d_texture : NULL); - if (SUCCEEDED(hr)) - { - unsigned int i = stage >= D3DVERTEXTEXTURESAMPLER0 ? stage - D3DVERTEXTEXTURESAMPLER0 + 16 : stage; - - if (stage < ARRAY_SIZE(device->textures)) - device->textures[i] = texture_impl; - } wined3d_mutex_unlock(); return hr; @@ -2652,11 +2641,15 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) /* wined3d critical section must be taken by the caller. */ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { - unsigned int i; + struct wined3d_texture *texture; + unsigned int i, stage; - for (i = 0; i < ARRAY_SIZE(device->textures); ++i) - if (device->textures[i]) - d3d9_texture_gen_auto_mipmap(device->textures[i]); + for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + { + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; + if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) + d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); + } } static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface,

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018