November 2015 - Wine-commits

Riccardo Bortolato : wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_cs_exec_set_depth_stencil_view().
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: bb70c73205a35e03366897c8b6181bb8b9348bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb70c73205a35e03366897c8b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:36 2015 +0100 wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_cs_exec_set_depth_stencil_view(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3c4ea8c..316ccb8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -430,7 +430,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const surface_modify_ds_location(prev_surface, WINED3D_LOCATION_DISCARDED, prev->width, prev->height); if (prev_surface == device->onscreen_depth_stencil) { - wined3d_surface_decref(device->onscreen_depth_stencil); + wined3d_texture_decref(device->onscreen_depth_stencil->container); device->onscreen_depth_stencil = NULL; } }

1 0

Riccardo Bortolato : wined3d: Call wined3d_texture_{inc, dec}ref() instead of wined3d_surface_{inc, dec}ref() in device_switch_onscreen_ds() .
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 9af54e742a70924fbb010cc46e7afd56038c024e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af54e742a70924fbb010cc46… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:37 2015 +0100 wined3d: Call wined3d_texture_{inc, dec}ref() instead of wined3d_surface_{inc, dec}ref() in device_switch_onscreen_ds(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4806e3d..caf1c32 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -208,10 +208,10 @@ void device_switch_onscreen_ds(struct wined3d_device *device, surface_modify_ds_location(device->onscreen_depth_stencil, WINED3D_LOCATION_TEXTURE_RGB, device->onscreen_depth_stencil->ds_current_size.cx, device->onscreen_depth_stencil->ds_current_size.cy); - wined3d_surface_decref(device->onscreen_depth_stencil); + wined3d_texture_decref(device->onscreen_depth_stencil->container); } device->onscreen_depth_stencil = depth_stencil; - wined3d_surface_incref(device->onscreen_depth_stencil); + wined3d_texture_incref(device->onscreen_depth_stencil->container); } static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect)

1 0

Riccardo Bortolato : wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_device_uninit_3d().
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: ff3f729e88041d3c1f39c6f1b37e4d7b43d7160c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3f729e88041d3c1f39c6f1b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:38 2015 +0100 wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_device_uninit_3d(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index caf1c32..241c52b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1102,7 +1102,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { surface = device->onscreen_depth_stencil; device->onscreen_depth_stencil = NULL; - wined3d_surface_decref(surface); + wined3d_texture_decref(surface->container); } if (device->fb.depth_stencil)

1 0

Riccardo Bortolato : wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_device_reset().
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: b6c7cd972013c7bffc0c13e398412e5da09c560f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c7cd972013c7bffc0c13e39… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:39 2015 +0100 wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_device_reset(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 241c52b..2960e08 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4525,7 +4525,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->onscreen_depth_stencil) { - wined3d_surface_decref(device->onscreen_depth_stencil); + wined3d_texture_decref(device->onscreen_depth_stencil->container); device->onscreen_depth_stencil = NULL; }

1 0

Riccardo Bortolato : wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in swapchain_gl_present().
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: e15e2569a8f91fdedd4b7e55f326ca2e4a122503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15e2569a8f91fdedd4b7e55f… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:40 2015 +0100 wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in swapchain_gl_present(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e965bda..e45fe17 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -583,7 +583,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT fb->depth_stencil->width, fb->depth_stencil->height); if (ds == swapchain->device->onscreen_depth_stencil) { - wined3d_surface_decref(swapchain->device->onscreen_depth_stencil); + wined3d_texture_decref(swapchain->device->onscreen_depth_stencil->container); swapchain->device->onscreen_depth_stencil = NULL; } }

1 0

Francois Gouget : configure: The libtiff pkg-config name is libtiff-4.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 6274d97229f66ca94e776814fcf71521ecfbf573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6274d97229f66ca94e776814f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 5 18:58:44 2015 +0100 configure: The libtiff pkg-config name is libtiff-4. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++------ configure.ac | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 31f54a3..6da7b76 100755 --- a/configure +++ b/configure @@ -2290,8 +2290,8 @@ Some influential environment variables: JPEG_LIBS Linker flags for libjpeg, overriding pkg-config PNG_CFLAGS C compiler flags for libpng, overriding pkg-config PNG_LIBS Linker flags for libpng, overriding pkg-config - TIFF_CFLAGS C compiler flags for libtiff, overriding pkg-config - TIFF_LIBS Linker flags for libtiff, overriding pkg-config + TIFF_CFLAGS C compiler flags for libtiff-4, overriding pkg-config + TIFF_LIBS Linker flags for libtiff-4, overriding pkg-config MPG123_CFLAGS C compiler flags for libmpg123, overriding pkg-config MPG123_LIBS Linker flags for libmpg123, overriding pkg-config @@ -13512,19 +13512,19 @@ if test "x$with_tiff" != "xno" then if ${TIFF_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : - TIFF_CFLAGS=`$PKG_CONFIG --cflags libtiff 2>/dev/null` + TIFF_CFLAGS=`$PKG_CONFIG --cflags libtiff-4 2>/dev/null` fi fi if ${TIFF_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : - TIFF_LIBS=`$PKG_CONFIG --libs libtiff 2>/dev/null` + TIFF_LIBS=`$PKG_CONFIG --libs libtiff-4 2>/dev/null` fi fi -$as_echo "$as_me:${as_lineno-$LINENO}: libtiff cflags: $TIFF_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: libtiff libs: $TIFF_LIBS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libtiff-4 cflags: $TIFF_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libtiff-4 libs: $TIFF_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $TIFF_CFLAGS" for ac_header in tiffio.h diff --git a/configure.ac b/configure.ac index 296a15f..68fd411 100644 --- a/configure.ac +++ b/configure.ac @@ -1711,7 +1711,7 @@ WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], dnl **** Check for libtiff **** if test "x$with_tiff" != "xno" then - WINE_PACKAGE_FLAGS(TIFF,[libtiff],,,, + WINE_PACKAGE_FLAGS(TIFF,[libtiff-4],,,, [AC_CHECK_HEADERS([tiffio.h]) if test "$ac_cv_header_tiffio_h" = "yes" then

1 0

Józef Kucia : d3d11/tests: Add test for resource mapping.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 7fbf33f1a4c43b13d5878458aecd1a3742317e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbf33f1a4c43b13d5878458a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 4 23:37:13 2015 +0100 d3d11/tests: Add test for resource mapping. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 22bf187..453fb52 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2443,6 +2443,148 @@ static void test_private_data(void) ok(!refcount, "Test object has %u references left.\n", refcount); } +static void test_resource_map(void) +{ + D3D11_MAPPED_SUBRESOURCE mapped_subresource; + D3D11_TEXTURE3D_DESC texture3d_desc; + D3D11_TEXTURE2D_DESC texture2d_desc; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11Texture3D *texture3d; + ID3D11Texture2D *texture2d; + ID3D11Buffer *buffer; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + DWORD data; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + ID3D11Device_GetImmediateContext(device, &context); + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffer, 1, D3D11_MAP_READ, 0, &mapped_subresource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map buffer, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 1024, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 1024, "Got unexpected depth pitch %u.\n", mapped_subresource.DepthPitch); + *((DWORD *)mapped_subresource.pData) = 0xdeadbeef; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)buffer, 0); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffer, 0, D3D11_MAP_READ, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map buffer, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 1024, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 1024, "Got unexpected depth pitch %u.\n", mapped_subresource.DepthPitch); + data = *((DWORD *)mapped_subresource.pData); + ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)buffer, 0); + + refcount = ID3D11Buffer_Release(buffer); + ok(!refcount, "Buffer has %u references left.\n", refcount); + + texture2d_desc.Width = 512; + texture2d_desc.Height = 512; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_STAGING; + texture2d_desc.BindFlags = 0; + texture2d_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE; + texture2d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture2d, 1, D3D11_MAP_READ, 0, &mapped_subresource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture2d, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 4 * 512, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 4 * 512 * 512, "Got unexpected depth pitch %u.\n", + mapped_subresource.DepthPitch); + *((DWORD *)mapped_subresource.pData) = 0xdeadbeef; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture2d, 0); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture2d, 0, D3D11_MAP_READ, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 4 * 512, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 4 * 512 * 512, "Got unexpected depth pitch %u.\n", + mapped_subresource.DepthPitch); + data = *((DWORD *)mapped_subresource.pData); + ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture2d, 0); + + refcount = ID3D11Texture2D_Release(texture2d); + ok(!refcount, "2D texture has %u references left.\n", refcount); + + texture3d_desc.Width = 64; + texture3d_desc.Height = 64; + texture3d_desc.Depth = 64; + texture3d_desc.MipLevels = 1; + texture3d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture3d_desc.Usage = D3D11_USAGE_STAGING; + texture3d_desc.BindFlags = 0; + texture3d_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE; + texture3d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &texture3d); + ok(SUCCEEDED(hr), "Failed to create 3d texture, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture3d, 1, D3D11_MAP_READ, 0, &mapped_subresource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture3d, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); + todo_wine ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + if (FAILED(hr)) goto done; + ok(mapped_subresource.RowPitch == 4 * 64, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 4 * 64 * 64, "Got unexpected depth pitch %u.\n", + mapped_subresource.DepthPitch); + *((DWORD *)mapped_subresource.pData) = 0xdeadbeef; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture3d, 0); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture3d, 0, D3D11_MAP_READ, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 4 * 64, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 4 * 64 * 64, "Got unexpected depth pitch %u.\n", + mapped_subresource.DepthPitch); + data = *((DWORD *)mapped_subresource.pData); + ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture3d, 0); + +done: + refcount = ID3D11Texture3D_Release(texture3d); + ok(!refcount, "3D texture has %u references left.\n", refcount); + + ID3D11DeviceContext_Release(context); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -2465,4 +2607,5 @@ START_TEST(d3d11) test_create_predicate(); test_device_removed_reason(); test_private_data(); + test_resource_map(); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSSetViewports().
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: c390d78618c963bf891d0ebcd18ad5676c4dc7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c390d78618c963bf891d0ebcd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 4 23:37:14 2015 +0100 d3d11: Implement d3d11_immediate_context_RSSetViewports(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ca8b0ef..f655a3e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -482,7 +482,33 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext *iface, UINT viewport_count, const D3D11_VIEWPORT *viewports) { - FIXME("iface %p, viewport_count %u, viewports %p stub!\n", iface, viewport_count, viewports); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_viewport wined3d_vp; + + TRACE("iface %p, viewport_count %u, viewports %p.\n", iface, viewport_count, viewports); + + if (viewport_count > 1) + FIXME("Multiple viewports not implemented.\n"); + + if (!viewport_count) + return; + + if (viewports[0].TopLeftX != (UINT)viewports[0].TopLeftX + || viewports[0].TopLeftY != (UINT)viewports[0].TopLeftY + || viewports[0].Width != (UINT)viewports[0].Width + || viewports[0].Height != (UINT)viewports[0].Height) + FIXME("Floating-point viewports not implemented.\n"); + + wined3d_vp.x = viewports[0].TopLeftX; + wined3d_vp.y = viewports[0].TopLeftY; + wined3d_vp.width = viewports[0].Width; + wined3d_vp.height = viewports[0].Height; + wined3d_vp.min_z = viewports[0].MinDepth; + wined3d_vp.max_z = viewports[0].MaxDepth; + + wined3d_mutex_lock(); + wined3d_device_set_viewport(device->wined3d_device, &wined3d_vp); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMSetRenderTargets().
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: fa05d30dc5d2a85385da43f8dace0b4dbcaa07f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa05d30dc5d2a85385da43f8d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 4 23:37:15 2015 +0100 d3d11: Implement d3d11_immediate_context_OMSetRenderTargets(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 21 ++++++++++++++++++++- dlls/d3d11/view.c | 9 +++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 932d518..fb3bb45 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -169,6 +169,7 @@ struct d3d_depthstencil_view HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view) DECLSPEC_HIDDEN; +struct d3d_depthstencil_view *unsafe_impl_from_ID3D11DepthStencilView(ID3D11DepthStencilView *iface) DECLSPEC_HIDDEN; struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN; /* ID3D11RenderTargetView, ID3D10RenderTargetView */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f655a3e..4560f52 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -406,8 +406,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargets(ID3D11D UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views, ID3D11DepthStencilView *depth_stencil_view) { - FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_depthstencil_view *dsv; + unsigned int i; + + TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p.\n", iface, render_target_view_count, render_target_views, depth_stencil_view); + + wined3d_mutex_lock(); + for (i = 0; i < render_target_view_count; ++i) + { + struct d3d_rendertarget_view *rtv = unsafe_impl_from_ID3D11RenderTargetView(render_target_views[i]); + wined3d_device_set_rendertarget_view(device->wined3d_device, i, rtv ? rtv->wined3d_view : NULL, FALSE); + } + for (; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + wined3d_device_set_rendertarget_view(device->wined3d_device, i, NULL, FALSE); + } + + dsv = unsafe_impl_from_ID3D11DepthStencilView(depth_stencil_view); + wined3d_device_set_depth_stencil_view(device->wined3d_device, dsv ? dsv->wined3d_view : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnorderedAccessViews( diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index ca53764..33c7a07 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -757,6 +757,15 @@ HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource * return S_OK; } +struct d3d_depthstencil_view *unsafe_impl_from_ID3D11DepthStencilView(ID3D11DepthStencilView *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_depthstencil_view_vtbl); + + return impl_from_ID3D11DepthStencilView(iface); +} + struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) { if (!iface)

1 0

Józef Kucia : d3d11/tests: Port test_il_append_aligned() from d3d10core.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 0d9732a9b5b6d979d5ee9591d16f31737e115d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9732a9b5b6d979d5ee9591d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 4 23:37:16 2015 +0100 d3d11/tests: Port test_il_append_aligned() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 343 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 343 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d9732a9b5b6d979d5ee9…

1 0