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

Józef Kucia : winex11: Get rid of unnecessary assignments.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 1e37d61eb934a64ee917e08b584292f7560cb779 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e37d61eb934a64ee917e08b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 13:00:27 2018 +0200 winex11: Get rid of unnecessary assignments. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xvidmode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index f055c3a..ba9cdf7 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -368,7 +368,7 @@ static void interpolate_gamma_ramp(WORD *dst_r, WORD *dst_g, WORD *dst_b, unsign static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) { WORD *red, *green, *blue; - BOOL ret = FALSE; + BOOL ret; if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) { @@ -378,7 +378,7 @@ static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) } else { - if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + if (!(red = heap_calloc(xf86vm_gammaramp_size, 3 * sizeof(*red)))) return FALSE; green = red + xf86vm_gammaramp_size; blue = green + xf86vm_gammaramp_size; @@ -397,7 +397,7 @@ static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) { WORD *red, *green, *blue; - BOOL ret = FALSE; + BOOL ret; if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) { @@ -407,7 +407,7 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) } else { - if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + if (!(red = heap_calloc(xf86vm_gammaramp_size, 3 * sizeof(*red)))) return FALSE; green = red + xf86vm_gammaramp_size; blue = green + xf86vm_gammaramp_size;

1 0

Józef Kucia : dxgi: Add FIXME() for ignored output parameter in dxgi_factory_CreateSwapChainForHwnd().
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: d0126f263166388684d25bbca2db5b7466582871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0126f263166388684d25bbc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 12:18:32 2018 +0200 dxgi: Add FIXME() for ignored output parameter in dxgi_factory_CreateSwapChainForHwnd(). 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/dxgi/factory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a3eb108..4fe684b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -294,6 +294,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_INVALID_CALL; } + if (output) + FIXME("Ignoring output %p.\n", output); + if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { hr = d3d11_swapchain_create(dxgi_device, window, swapchain_desc, fullscreen_desc, swapchain);

1 0

Józef Kucia : dxgi: Use DXGI_MAX_SWAP_CHAIN_BUFFERS.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: cc07f20965e936b1334423105af5fe87ce19cf21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc07f20965e936b133442310… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 12:18:33 2018 +0200 dxgi: Use DXGI_MAX_SWAP_CHAIN_BUFFERS. 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/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 4fe684b..57ce3e1 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -288,7 +288,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_INVALID_CALL; } - if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > 16) + if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > DXGI_MAX_SWAP_CHAIN_BUFFERS) { WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); return DXGI_ERROR_INVALID_CALL;

1 0

Francois Gouget : testbot/build: Always rebuild the native tools.
by Alexandre Julliard 30 May '18

30 May '18

Module: tools Branch: master Commit: aa2a4355b05cdcbbc5f0a1184859f0eeaa6c83c1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aa2a4355b05cdcbbc5f0a11… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 30 08:05:15 2018 +0200 testbot/build: Always rebuild the native tools. It does not take long and it is actually hard to really know when to rebuild them if taking into account their libs/ and include/ dependencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 20 ++++++++------------ testbot/lib/WineTestBot/PatchUtils.pm | 6 +----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 5e6b370..03733ce 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -83,7 +83,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return -1; + return 0; } my $Impacts = GetPatchImpact($PatchFile, "nounits"); @@ -96,7 +96,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return -1; + return 0; } } @@ -109,11 +109,11 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Autoconf failed\n"; - return -1; + return 0; } } - return $Impacts->{Tools}; + return 1; } my $ncpus; @@ -249,21 +249,17 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } -my $NeedBuildNative = ApplyPatch($PatchFile); -if ($NeedBuildNative < 0) +if (!ApplyPatch($PatchFile)) { exit(1); } CountCPUs(); -if ($NeedBuildNative) +InfoMsg "Building tools\n"; +if (!BuildNative()) { - InfoMsg "Building tools\n"; - if (!BuildNative()) - { - exit(1); - } + exit(1); } if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32)) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 2000c90..6c72e16 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -142,11 +142,7 @@ sub GetPatchImpact($;$) } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{Makefiles} = $Impacts->{Tools} = 1; - } - elsif ($Line =~ m=^--- \w+/tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)$=) - { - $Impacts->{Tools} = 1; + $Impacts->{Makefiles} = 1; } elsif ($Line =~ m=^--- /dev/null$=) {

1 0

Francois Gouget : testbot/build: Fix handling of directory addition / removal.
by Alexandre Julliard 30 May '18

30 May '18

Module: tools Branch: master Commit: f9501a1f91a5e2a5da2649d1e74ca678c950d375 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f9501a1f91a5e2a5da2649d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 30 08:05:35 2018 +0200 testbot/build: Fix handling of directory addition / removal. When a directory is added or removed we must re-run make_makefiles. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 6c72e16..a466df3 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -87,7 +87,16 @@ sub _AddTest($$$) } # Assume makefile modifications may break the build but not the tests - return if ($File eq "Makefile.in" or $Impacts->{NoUnits}); + if ($File eq "Makefile.in") + { + if ($Change eq "new" or $Change eq "rm") + { + # This adds / removes a directory + $Impacts->{Makefiles} = 1; + } + return; + } + return if ($Impacts->{NoUnits}); if (!$Tests->{$Module}->{Files}) {

1 0

Francois Gouget : testbot: Fix error checking on a Steps::Save() call.
by Alexandre Julliard 30 May '18

30 May '18

Module: tools Branch: master Commit: a0e2d911c1a47e910bab11fcd0137d3a33389f42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a0e2d911c1a47e910bab11f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 30 15:27:43 2018 +0200 testbot: Fix error checking on a Steps::Save() call. Collection::Save() returns three values, unlike Item::Save() which only returns two! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 6be271b..ef0d98e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -98,7 +98,7 @@ sub OnDelete($) my $Steps = $self->Steps; map { $_->PreviousNo(undef) } @{$Steps->GetItems()}; - my ($_ErrProperty, $ErrMessage) = $Steps->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Steps->Save(); return $ErrMessage || $self->SUPER::OnDelete(); }

1 0

Pablo Martin : wined3d: Expose wined3d_shader_type enum and wined3d_device_*_constant_buffer methods.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: a7a2d617920378b137aa0b277e0e945e2568acab URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a2d617920378b137aa0b27… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 29 08:39:54 2018 +0200 wined3d: Expose wined3d_shader_type enum and wined3d_device_*_constant_buffer methods. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_private.h | 14 -------------- include/wine/wined3d.h | 18 ++++++++++++++++++ 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec77a56..4124004 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2227,11 +2227,13 @@ struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wine return device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; } -static void wined3d_device_set_constant_buffer(struct wined3d_device *device, +void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) { struct wined3d_buffer *prev; + TRACE("device %p, type %#x, idx %u, buffer %p.\n", device, type, idx, buffer); + if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); @@ -2258,9 +2260,11 @@ void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, str wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx, buffer); } -static struct wined3d_buffer *wined3d_device_get_constant_buffer(const struct wined3d_device *device, +struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wined3d_device *device, enum wined3d_shader_type shader_type, unsigned int idx) { + TRACE("device %p, shader_type %#x, idx %u.\n", device, shader_type, idx); + if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index db50a44..c397f67 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -61,6 +61,7 @@ @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) +@ cdecl wined3d_device_get_constant_buffer(ptr long long) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_cs_cb(ptr long) @ cdecl wined3d_device_get_cs_resource_view(ptr long) @@ -137,6 +138,7 @@ @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_compute_shader(ptr ptr) +@ cdecl wined3d_device_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_set_cs_cb(ptr long ptr) @ cdecl wined3d_device_set_cs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_cs_sampler(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2c4cd6..c30bb13 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -926,20 +926,6 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TABLE_SIZE }; -enum wined3d_shader_type -{ - WINED3D_SHADER_TYPE_PIXEL, - WINED3D_SHADER_TYPE_VERTEX, - WINED3D_SHADER_TYPE_GEOMETRY, - WINED3D_SHADER_TYPE_HULL, - WINED3D_SHADER_TYPE_DOMAIN, - WINED3D_SHADER_TYPE_GRAPHICS_COUNT, - - WINED3D_SHADER_TYPE_COMPUTE = WINED3D_SHADER_TYPE_GRAPHICS_COUNT, - WINED3D_SHADER_TYPE_COUNT, - WINED3D_SHADER_TYPE_INVALID = WINED3D_SHADER_TYPE_COUNT, -}; - struct wined3d_shader_version { enum wined3d_shader_type type; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e15269f..17cc3b8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -843,6 +843,20 @@ enum wined3d_shader_byte_code_format WINED3D_SHADER_BYTE_CODE_FORMAT_SM4 = 1, }; +enum wined3d_shader_type +{ + WINED3D_SHADER_TYPE_PIXEL, + WINED3D_SHADER_TYPE_VERTEX, + WINED3D_SHADER_TYPE_GEOMETRY, + WINED3D_SHADER_TYPE_HULL, + WINED3D_SHADER_TYPE_DOMAIN, + WINED3D_SHADER_TYPE_GRAPHICS_COUNT, + + WINED3D_SHADER_TYPE_COMPUTE = WINED3D_SHADER_TYPE_GRAPHICS_COUNT, + WINED3D_SHADER_TYPE_COUNT, + WINED3D_SHADER_TYPE_INVALID = WINED3D_SHADER_TYPE_COUNT, +}; + #define WINED3DCOLORWRITEENABLE_RED (1u << 0) #define WINED3DCOLORWRITEENABLE_GREEN (1u << 1) #define WINED3DCOLORWRITEENABLE_BLUE (1u << 2) @@ -2247,6 +2261,8 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_constant_buffer(const struct wined3d_device *device, + enum wined3d_shader_type shader_type, unsigned int idx); void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx); @@ -2365,6 +2381,8 @@ HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const struct wined3d_clip_status *clip_status); void __cdecl wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_constant_buffer(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, + struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_cs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view);

1 0

Pablo Martin : d3d11: Make d3d11 *SetConstantBuffers use a helper method.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 537c9dab9f8c0bc962385fa41c848690240b9cd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=537c9dab9f8c0bc962385fa4… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 29 08:39:55 2018 +0200 d3d11: Make d3d11 *SetConstantBuffers use a helper method. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 101 +++++++++++++++------------------------------------- 1 file changed, 29 insertions(+), 72 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 36ed44b..5b5449c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -97,6 +97,23 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte return refcount; } +static void d3d11_immediate_context_set_constant_buffers(ID3D11DeviceContext1 *iface, + enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) +{ + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + unsigned int i; + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_constant_buffer(device->wined3d_device, type, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); +} + static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceContext1 *iface, ID3D11Device **device) { struct d3d_device *device_object = device_from_immediate_ID3D11DeviceContext1(iface); @@ -140,21 +157,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_vs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_VERTEX, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D11DeviceContext1 *iface, @@ -302,21 +309,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_ps_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_PIXEL, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext1 *iface, @@ -405,21 +402,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_gs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_GEOMETRY, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceContext1 *iface, @@ -1260,21 +1247,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_hs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_HULL, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D11DeviceContext1 *iface, @@ -1337,21 +1314,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_ds_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_DOMAIN, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D11DeviceContext1 *iface, @@ -1434,21 +1401,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_cs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_COMPUTE, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D11DeviceContext1 *iface,

1 0

Pablo Martin : d3d11: Make d3d11 *GetConstantBuffers use a helper method.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 7d9e02fc948edbfe7712d81d3077a1279b7b2728 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d9e02fc948edbfe7712d81d… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 29 08:39:56 2018 +0200 d3d11: Make d3d11 *GetConstantBuffers use a helper method. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 155 +++++++++++++--------------------------------------- 1 file changed, 38 insertions(+), 117 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5b5449c..a35b82f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -97,6 +97,32 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte return refcount; } +static void d3d11_immediate_context_get_constant_buffers(ID3D11DeviceContext1 *iface, + enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) +{ + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + unsigned int i; + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_constant_buffer(device->wined3d_device, + type, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D11Buffer_iface; + ID3D11Buffer_AddRef(buffers[i]); + } + wined3d_mutex_unlock(); +} + static void d3d11_immediate_context_set_constant_buffers(ID3D11DeviceContext1 *iface, enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { @@ -1411,29 +1437,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct wined3d_buffer *wined3d_buffer; - struct d3d_buffer *buffer_impl; - - if (!(wined3d_buffer = wined3d_device_get_vs_cb(device->wined3d_device, start_slot + i))) - { - buffers[i] = NULL; - continue; - } - - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); - buffers[i] = &buffer_impl->ID3D11Buffer_iface; - ID3D11Buffer_AddRef(buffers[i]); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_get_constant_buffers(iface, WINED3D_SHADER_TYPE_VERTEX, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D11DeviceContext1 *iface, @@ -1553,29 +1561,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct wined3d_buffer *wined3d_buffer; - struct d3d_buffer *buffer_impl; - - if (!(wined3d_buffer = wined3d_device_get_ps_cb(device->wined3d_device, start_slot + i))) - { - buffers[i] = NULL; - continue; - } - - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); - buffers[i] = &buffer_impl->ID3D11Buffer_iface; - ID3D11Buffer_AddRef(buffers[i]); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_get_constant_buffers(iface, WINED3D_SHADER_TYPE_PIXEL, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(ID3D11DeviceContext1 *iface, @@ -1666,29 +1656,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11Dev static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct wined3d_buffer *wined3d_buffer; - struct d3d_buffer *buffer_impl; - - if (!(wined3d_buffer = wined3d_device_get_gs_cb(device->wined3d_device, start_slot + i))) - { - buffers[i] = NULL; - continue; - } - - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); - buffers[i] = &buffer_impl->ID3D11Buffer_iface; - ID3D11Buffer_AddRef(buffers[i]); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_get_constant_buffers(iface, WINED3D_SHADER_TYPE_GEOMETRY, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceContext1 *iface, @@ -2193,28 +2165,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct wined3d_buffer *wined3d_buffer; - struct d3d_buffer *buffer_impl; - - if (!(wined3d_buffer = wined3d_device_get_hs_cb(device->wined3d_device, start_slot + i))) - { - buffers[i] = NULL; - continue; - } - - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); - ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_get_constant_buffers(iface, WINED3D_SHADER_TYPE_HULL, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D11DeviceContext1 *iface, @@ -2302,28 +2257,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct wined3d_buffer *wined3d_buffer; - struct d3d_buffer *buffer_impl; - - if (!(wined3d_buffer = wined3d_device_get_ds_cb(device->wined3d_device, start_slot + i))) - { - buffers[i] = NULL; - continue; - } - - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); - ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_get_constant_buffers(iface, WINED3D_SHADER_TYPE_DOMAIN, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D11DeviceContext1 *iface, @@ -2436,28 +2374,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct wined3d_buffer *wined3d_buffer; - struct d3d_buffer *buffer_impl; - - if (!(wined3d_buffer = wined3d_device_get_cs_cb(device->wined3d_device, start_slot + i))) - { - buffers[i] = NULL; - continue; - } - - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); - ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_get_constant_buffers(iface, WINED3D_SHADER_TYPE_COMPUTE, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext1 *iface)

1 0

Pablo Martin : d3d11: Make d3d10 *SetConstantBuffers use a helper method.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 095964c4391736a9772e1e860eec2d600988af4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=095964c4391736a9772e1e86… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 29 08:39:57 2018 +0200 d3d11: Make d3d10 *SetConstantBuffers use a helper method. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a35b82f..0fdbb3c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3890,26 +3890,33 @@ static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device1 *iface) /* ID3D10Device methods */ -static void STDMETHODCALLTYPE d3d10_device_VSSetConstantBuffers(ID3D10Device1 *iface, - UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) +static void d3d10_device_set_constant_buffers(ID3D10Device1 *iface, + enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { struct d3d_device *device = impl_from_ID3D10Device(iface); unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", - iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); for (i = 0; i < buffer_count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - wined3d_device_set_vs_cb(device->wined3d_device, start_slot + i, + wined3d_device_set_constant_buffer(device->wined3d_device, type, start_slot + i, buffer ? buffer->wined3d_buffer : NULL); } wined3d_mutex_unlock(); } +static void STDMETHODCALLTYPE d3d10_device_VSSetConstantBuffers(ID3D10Device1 *iface, + UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) +{ + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", + iface, start_slot, buffer_count, buffers); + + d3d10_device_set_constant_buffers(iface, WINED3D_SHADER_TYPE_VERTEX, start_slot, + buffer_count, buffers); +} + static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView *const *views) { @@ -4006,21 +4013,11 @@ static void STDMETHODCALLTYPE d3d10_device_Draw(ID3D10Device1 *iface, UINT verte static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device1 *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { - struct d3d_device *device = impl_from_ID3D10Device(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - - wined3d_device_set_ps_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d10_device_set_constant_buffers(iface, WINED3D_SHADER_TYPE_PIXEL, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device1 *iface, @@ -4110,21 +4107,11 @@ static void STDMETHODCALLTYPE d3d10_device_DrawInstanced(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device1 *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { - struct d3d_device *device = impl_from_ID3D10Device(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - - wined3d_device_set_gs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d10_device_set_constant_buffers(iface, WINED3D_SHADER_TYPE_GEOMETRY, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device1 *iface, ID3D10GeometryShader *shader)

1 0