- wine-devel - winehq.org

[PATCH] wine/debug.h: Avoid narrowing conversions in struct initializers.
by Jacek Caban 08 Jan '19

08 Jan '19

Fixes using the header from C++. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The error is: wine-git/include/wine/debug.h:365:69: error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned char’ inside { } [-Wnarrowing] static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch }; \ ^ test.cpp:6:1: note: in expansion of macro ‘WINE_DEFAULT_DEBUG_CHANNEL’ include/wine/debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v2 2/2] d3d8: Avoid calling wined3d_device_process_vertices() with unmappable source buffers.
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebased onto test changes. This supersedes patch 156415. dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 334812540e8..b2a6e48da09 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2592,14 +2592,54 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertexbuffer *dst = unsafe_impl_from_IDirect3DVertexBuffer8(dst_buffer); + struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_buffer *wined3d_buffer; + unsigned int i, offset, stride, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, flags); wined3d_mutex_lock(); + + /* Note that an alternative approach would be to simply create these + * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we + * do for draws. In some regards that would be easier, but it seems less + * than optimal to upload data to the GPU only to subsequently download it + * again. */ + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d8_buffer->wined3d_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst->wined3d_buffer, NULL, flags, dst->fvf); + + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d8_buffer->draw_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cbe6c975e08..43b286b0373 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10596,12 +10596,12 @@ static void test_sysmem_draw(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer8_Lock(dst_vb, 0, 0, (BYTE **)&dst_data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(quad); ++i) { - todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 4), "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); -- 2.11.0

2 1

[PATCH v2 1/2] d3d8/tests: Add a test for ProcessVertices() on D3DPOOL_SYSTEMMEM buffers.
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Increased tolerance from 1 to 4 for testbot WARP. This supersedes patch 156417. dlls/d3d8/tests/visual.c | 82 ++++++++++++++++++++++++++++++++++++++++++++---- include/d3d8.h | 2 +- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cdb46708763..cbe6c975e08 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -19,6 +19,7 @@ /* See comment in dlls/d3d9/tests/visual.c for general guidelines */ +#include <limits.h> #include <math.h> #define COBJMACROS @@ -62,6 +63,30 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) { return !strcmp(identifier->Driver, "d3d10warp.dll"); @@ -10448,11 +10473,14 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { - IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1; + IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1, *dst_vb; + D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DIndexBuffer8 *ib; IDirect3DDevice8 *device; + struct vec4 *dst_data; IDirect3D8 *d3d; D3DCOLOR colour; + unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -10474,10 +10502,10 @@ static void test_sysmem_draw(void) } quad[] = { - {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, - {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, - {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + {{-0.5f, -0.5f, 0.0f}, 0xffff0000}, + {{-0.5f, 0.5f, 0.0f}, 0xff00ff00}, + {{ 0.5f, -0.5f, 0.0f}, 0xff0000ff}, + {{ 0.5f, 0.5f, 0.0f}, 0xffffffff}, }; static const struct vec3 quad_s0[] = { @@ -10510,7 +10538,17 @@ static void test_sysmem_draw(void) d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, window, TRUE))) + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + if (FAILED(hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_MIXED_VERTEXPROCESSING, &present_parameters, &device))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d); @@ -10547,6 +10585,37 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice8_CreateVertexBuffer(device, ARRAY_SIZE(quad) * sizeof(*dst_data), + 0, D3DFVF_XYZRHW, D3DPOOL_SYSTEMMEM, &dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SOFTWAREVERTEXPROCESSING, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(dst_vb, 0, 0, (BYTE **)&dst_data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 4), + "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", + i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); + } + hr = IDirect3DVertexBuffer8_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SOFTWAREVERTEXPROCESSING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -10633,6 +10702,7 @@ static void test_sysmem_draw(void) IDirect3DVertexBuffer8_Release(vb_s0); IDirect3DDevice8_DeleteVertexShader(device, vs); IDirect3DIndexBuffer8_Release(ib); + IDirect3DVertexBuffer8_Release(dst_vb); IDirect3DVertexBuffer8_Release(vb); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/include/d3d8.h b/include/d3d8.h index d56e67fed79..51eed8b7dda 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -1014,7 +1014,7 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) #define IDirect3DDevice8_DrawIndexedPrimitive(p,a,b,c,d,e) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e) #define IDirect3DDevice8_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) #define IDirect3DDevice8_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) -#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->processVertices(p,a,b,c,d,e) +#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e) #define IDirect3DDevice8_CreateVertexShader(p,a,b,c,d) (p)->lpVtbl->CreateVertexShader(p,a,b,c,d) #define IDirect3DDevice8_SetVertexShader(p,a) (p)->lpVtbl->SetVertexShader(p,a) #define IDirect3DDevice8_GetVertexShader(p,a) (p)->lpVtbl->GetVertexShader(p,a) -- 2.11.0

1 0

[PATCH 5/5] d3d9/tests: Add test for clearing surfaces with different sizes.
by Józef Kucia 08 Jan '19

08 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 110 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51229f2b8268..3db61db12c7e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1324,6 +1324,115 @@ done: DestroyWindow(window); } +static void test_clear_different_size_surfaces(void) +{ + IDirect3DSurface9 *ds, *rt, *rt2; + struct surface_readback rb; + IDirect3DDevice9 *device; + D3DLOCKED_RECT lr; + unsigned int x, y; + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + D3DCAPS9 caps; + WORD *depth; + HWND window; + DWORD color; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 1, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 2, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt2, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + { + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, D3DFMT_D16_LOCKABLE, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(hr == D3D_OK, "Failed to create depth surface, hr %#x.\n", hr); + } + else + { + skip("D3DFMT_D16_LOCKABLE is not supported.\n"); + ds = NULL; + } + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs >= 2) + { + hr = IDirect3DDevice9_SetRenderTarget(device, 1, rt2); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + } + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 640; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.5f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 0, 0); + ok(color == 0xffff0000, "Got color 0x%08x.\n", color); + release_surface_readback(&rb); + + if (caps.NumSimultaneousRTs >= 2) + { + get_rt_readback(rt2, &rb); + for (y = 0; y < 2; ++y) + { + color = get_readback_color(&rb, 0, y); + ok(color == 0xffff0000, "Got color 0x%08x at %u.\n", color, y); + } + release_surface_readback(&rb); + } + + if (ds) + { + hr = IDirect3DSurface9_LockRect(ds, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock rect, hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); + for (x = 0; x < 4; ++x) + { + ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + } + } + hr = IDirect3DSurface9_UnlockRect(ds); + ok(hr == D3D_OK, "Failed to unlock rect, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + } + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(rt2); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void color_fill_test(void) { IDirect3DSurface9 *surface; @@ -24420,6 +24529,7 @@ START_TEST(visual) lighting_test(); test_specular_lighting(); clear_test(); + test_clear_different_size_surfaces(); color_fill_test(); fog_test(); test_cube_wrap(); -- 2.19.2

2 1

[PATCH 5/5] dxdiagn: Handle Red Hat and VMware in vendor_id_to_manufacturer_string().
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxdiagn/provider.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index ec30574b840..ede7344f95a 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -920,31 +920,37 @@ static BOOL get_texture_memory(GUID *adapter, DWORD *available_mem) static const WCHAR *vendor_id_to_manufacturer_string(DWORD vendor_id) { + unsigned int i; + static const WCHAR atiW[] = {'A','T','I',' ','T','e','c','h','n','o','l','o','g','i','e','s',' ','I','n','c','.',0}; static const WCHAR nvidiaW[] = {'N','V','I','D','I','A',0}; static const WCHAR intelW[] = {'I','n','t','e','l',' ','C','o','r','p','o','r','a','t','i','o','n',0}; + static const WCHAR vmwareW[] = {'V','M','w','a','r','e',0}; + static const WCHAR redhatW[] = {'R','e','d',' ','H','a','t',0}; static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',0}; - - /* Enumeration copied from dlls/wined3d/wined3d_private.h and slightly modified. */ - enum pci_vendor + static const struct { - HW_VENDOR_AMD = 0x1002, - HW_VENDOR_NVIDIA = 0x10de, - HW_VENDOR_INTEL = 0x8086, + DWORD id; + const WCHAR *name; + } + vendors[] = + { + {0x1002, atiW}, + {0x10de, nvidiaW}, + {0x15ad, vmwareW}, + {0x1af4, redhatW}, + {0x8086, intelW}, }; - switch (vendor_id) + for (i = 0; i < ARRAY_SIZE(vendors); ++i) { - case HW_VENDOR_AMD: - return atiW; - case HW_VENDOR_NVIDIA: - return nvidiaW; - case HW_VENDOR_INTEL: - return intelW; - default: - FIXME("Unknown PCI vendor ID 0x%04x\n", vendor_id); - return unknownW; + if (vendors[i].id == vendor_id) + return vendors[i].name; } + + FIXME("Unknown PCI vendor ID 0x%04x.\n", vendor_id); + + return unknownW; } static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node) -- 2.11.0

2 1

[PATCH 4/5] d3d8: Avoid calling wined3d_device_process_vertices() with unmappable source buffers.
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 334812540e8..b2a6e48da09 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2592,14 +2592,54 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertexbuffer *dst = unsafe_impl_from_IDirect3DVertexBuffer8(dst_buffer); + struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_buffer *wined3d_buffer; + unsigned int i, offset, stride, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, flags); wined3d_mutex_lock(); + + /* Note that an alternative approach would be to simply create these + * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we + * do for draws. In some regards that would be easier, but it seems less + * than optimal to upload data to the GPU only to subsequently download it + * again. */ + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d8_buffer->wined3d_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst->wined3d_buffer, NULL, flags, dst->fvf); + + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d8_buffer->draw_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b9e974f2ec0..960a3b16072 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10596,12 +10596,12 @@ static void test_sysmem_draw(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer8_Lock(dst_vb, 0, 0, (BYTE **)&dst_data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(quad); ++i) { - todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 1), "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); -- 2.11.0

2 1

[PATCH 3/5] d3d9: Avoid calling wined3d_device_process_vertices() with unmappable source buffers.
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e28b48e88d2..9ebaebab969 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3082,15 +3082,55 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *dst_impl = unsafe_impl_from_IDirect3DVertexBuffer9(dst_buffer); struct d3d9_vertex_declaration *decl_impl = unsafe_impl_from_IDirect3DVertexDeclaration9(declaration); + struct d3d9_vertexbuffer *d3d9_buffer; + struct wined3d_buffer *wined3d_buffer; + unsigned int i, offset, stride, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, declaration %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, declaration, flags); wined3d_mutex_lock(); + + /* Note that an alternative approach would be to simply create these + * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we + * do for draws. In some regards that would be easier, but it seems less + * than optimal to upload data to the GPU only to subsequently download it + * again. */ + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d9_buffer->wined3d_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst_impl->wined3d_buffer, decl_impl ? decl_impl->wined3d_declaration : NULL, flags, dst_impl->fvf); + + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d9_buffer->draw_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 677286e981f..b4f512ed0af 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24327,12 +24327,12 @@ static void test_sysmem_draw(void) 0, D3DFVF_XYZRHW, D3DPOOL_SYSTEMMEM, &dst_vb, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, NULL, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer9_Lock(dst_vb, 0, 0, (void **)&dst_data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(quad); ++i) { - todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 1), "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); -- 2.11.0

2 1

[PATCH 2/5] d3d8/tests: Add a test for ProcessVertices() on D3DPOOL_SYSTEMMEM buffers.
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 82 ++++++++++++++++++++++++++++++++++++++++++++---- include/d3d8.h | 2 +- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cdb46708763..b9e974f2ec0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -19,6 +19,7 @@ /* See comment in dlls/d3d9/tests/visual.c for general guidelines */ +#include <limits.h> #include <math.h> #define COBJMACROS @@ -62,6 +63,30 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) { return !strcmp(identifier->Driver, "d3d10warp.dll"); @@ -10448,11 +10473,14 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { - IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1; + IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1, *dst_vb; + D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DIndexBuffer8 *ib; IDirect3DDevice8 *device; + struct vec4 *dst_data; IDirect3D8 *d3d; D3DCOLOR colour; + unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -10474,10 +10502,10 @@ static void test_sysmem_draw(void) } quad[] = { - {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, - {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, - {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + {{-0.5f, -0.5f, 0.0f}, 0xffff0000}, + {{-0.5f, 0.5f, 0.0f}, 0xff00ff00}, + {{ 0.5f, -0.5f, 0.0f}, 0xff0000ff}, + {{ 0.5f, 0.5f, 0.0f}, 0xffffffff}, }; static const struct vec3 quad_s0[] = { @@ -10510,7 +10538,17 @@ static void test_sysmem_draw(void) d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, window, TRUE))) + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + if (FAILED(hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_MIXED_VERTEXPROCESSING, &present_parameters, &device))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d); @@ -10547,6 +10585,37 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice8_CreateVertexBuffer(device, ARRAY_SIZE(quad) * sizeof(*dst_data), + 0, D3DFVF_XYZRHW, D3DPOOL_SYSTEMMEM, &dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SOFTWAREVERTEXPROCESSING, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(dst_vb, 0, 0, (BYTE **)&dst_data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 1), + "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", + i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); + } + hr = IDirect3DVertexBuffer8_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SOFTWAREVERTEXPROCESSING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -10633,6 +10702,7 @@ static void test_sysmem_draw(void) IDirect3DVertexBuffer8_Release(vb_s0); IDirect3DDevice8_DeleteVertexShader(device, vs); IDirect3DIndexBuffer8_Release(ib); + IDirect3DVertexBuffer8_Release(dst_vb); IDirect3DVertexBuffer8_Release(vb); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/include/d3d8.h b/include/d3d8.h index d56e67fed79..51eed8b7dda 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -1014,7 +1014,7 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) #define IDirect3DDevice8_DrawIndexedPrimitive(p,a,b,c,d,e) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e) #define IDirect3DDevice8_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) #define IDirect3DDevice8_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) -#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->processVertices(p,a,b,c,d,e) +#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e) #define IDirect3DDevice8_CreateVertexShader(p,a,b,c,d) (p)->lpVtbl->CreateVertexShader(p,a,b,c,d) #define IDirect3DDevice8_SetVertexShader(p,a) (p)->lpVtbl->SetVertexShader(p,a) #define IDirect3DDevice8_GetVertexShader(p,a) (p)->lpVtbl->GetVertexShader(p,a) -- 2.11.0

2 1

[PATCH 1/5] d3d9/tests: Add a test for ProcessVertices() on D3DPOOL_SYSTEMMEM buffers.
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 55 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51229f2b826..677286e981f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -28,6 +28,7 @@ * causes visible results in games can be tested in a way that does not depend on pixel exactness */ +#include <limits.h> #include <math.h> #define COBJMACROS @@ -73,6 +74,30 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) { return !strcmp(identifier->Driver, "d3d10warp.dll"); @@ -24199,12 +24224,14 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { + IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1, *dst_vb; IDirect3DVertexDeclaration9 *vertex_declaration; - IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1; IDirect3DIndexBuffer9 *ib; IDirect3DDevice9 *device; + struct vec4 *dst_data; IDirect3D9 *d3d; D3DCOLOR colour; + unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -24223,10 +24250,10 @@ static void test_sysmem_draw(void) } quad[] = { - {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, - {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, - {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + {{-0.5f, -0.5f, 0.0f}, 0xffff0000}, + {{-0.5f, 0.5f, 0.0f}, 0xff00ff00}, + {{ 0.5f, -0.5f, 0.0f}, 0xff0000ff}, + {{ 0.5f, 0.5f, 0.0f}, 0xffffffff}, }; static const struct vec3 quad_s0[] = { @@ -24296,6 +24323,23 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice9_CreateVertexBuffer(device, ARRAY_SIZE(quad) * sizeof(*dst_data), + 0, D3DFVF_XYZRHW, D3DPOOL_SYSTEMMEM, &dst_vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, NULL, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(dst_vb, 0, 0, (void **)&dst_data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 1), + "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", + i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); + } + hr = IDirect3DVertexBuffer9_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -24379,6 +24423,7 @@ static void test_sysmem_draw(void) IDirect3DVertexBuffer9_Release(vb_s0); IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(dst_vb); IDirect3DVertexBuffer9_Release(vb); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.11.0

2 1

[PATCH 4/5] wined3d: Emit separate clear ops per resource when needed.
by Józef Kucia 08 Jan '19

08 Jan '19

We use separate clear operations because our blitters do not support clearing resources of different sizes properly. In the case of the OpenGL blitter, we cannot reliably clear attachments of different sizes using a single glClear() command. The OpenGL spec says: "If the attachment sizes are not all identical, the results of rendering are defined only within the largest area that can fit in all of the attachments. This area is defined as the intersection of rectangles having a lower left of (0, 0) and an upper right of (width, height) for each attachment. Contents of attachments outside this area are undefined after execution of a rendering command (as defined in section 2.4)." Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 105 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 84 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index aa8eef7a2e01..4a0ca3386bc1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -600,48 +600,111 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { + RECT initial_draw_rect, draw_rect, previous_draw_rect, view_rect; + BOOL have_previous_draw_rect = FALSE, have_identical_size = TRUE; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; unsigned int rt_count, i; - RECT view_rect; - rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; - - op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), - WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; - op->rt_count = rt_count; - op->fb = &cs->fb; - SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); + SetRect(&initial_draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) - IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); - op->color = *color; - op->depth = depth; - op->stencil = stencil; - op->rect_count = rect_count; - memcpy(op->rects, rects, sizeof(*rects) * rect_count); + IntersectRect(&initial_draw_rect, &initial_draw_rect, &state->scissor_rects[0]); + rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; for (i = 0; i < rt_count; ++i) { if ((view = state->fb->render_targets[i])) { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); + + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&draw_rect, &initial_draw_rect, &view_rect); + if (have_previous_draw_rect && !EqualRect(&previous_draw_rect, &draw_rect)) + have_identical_size = FALSE; + previous_draw_rect = draw_rect; + have_previous_draw_rect = TRUE; } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = state->fb->depth_stencil; - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); + + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&draw_rect, &initial_draw_rect, &view_rect); + if (have_previous_draw_rect && !EqualRect(&previous_draw_rect, &draw_rect)) + have_identical_size = FALSE; + previous_draw_rect = draw_rect; + have_previous_draw_rect = TRUE; } - wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); + if (have_identical_size) + { + op = wined3d_cs_require_space(cs, + FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_CLEAR; + op->flags = flags; + op->rt_count = rt_count; + op->fb = &cs->fb; + op->draw_rect = draw_rect; + op->color = *color; + op->depth = depth; + op->stencil = stencil; + op->rect_count = rect_count; + memcpy(op->rects, rects, sizeof(*rects) * rect_count); + + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); + return; + } + + /* Emit a separate clear operation per resource, if the resource sizes are not all identical. + * The CPU blitter and the OpenGL blitter assume that all regions to clear are identical. */ + for (i = 0; i < rt_count; ++i) + { + if ((view = state->fb->render_targets[i])) + { + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]) + + sizeof(struct wined3d_fb_state), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_CLEAR; + op->flags = WINED3DCLEAR_TARGET; + op->rt_count = 1; + op->fb = (void *)&op->rects[rect_count]; + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &initial_draw_rect, &view_rect); + op->color = *color; + op->rect_count = rect_count; + memcpy(op->rects, rects, sizeof(*rects) * rect_count); + + op->fb->render_targets[0] = view; + op->fb->depth_stencil = NULL; + + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); + } + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + view = state->fb->depth_stencil; + + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]) + + sizeof(struct wined3d_fb_state), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_CLEAR; + op->flags = flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); + op->rt_count = 0; + op->fb = (void *)&op->rects[rect_count]; + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &initial_draw_rect, &view_rect); + op->depth = depth; + op->stencil = stencil; + op->rect_count = rect_count; + memcpy(op->rects, rects, sizeof(*rects) * rect_count); + + op->fb->render_targets[0] = NULL; + op->fb->depth_stencil = view; + + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); + } } void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, -- 2.19.2

1 0

[PATCH] shcore: Fix double free on error path (Coverity).
by Nikolay Sivov 08 Jan '19

08 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index ac625fb746..973b7c7a03 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1244,7 +1244,6 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, const WCHAR *subkey, const WCHAR * } } - heap_free(buff); if (hStrKey) RegCloseKey(hStrKey); -- 2.20.1

1 0

[PATCH] server: Fix process trace_data initialization race on Mac.
by Piotr Caban 08 Jan '19

08 Jan '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/server.c | 7 ++++--- server/process.c | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH] ntoskrnl.exe: Fix service handle leak in ZwLoadDriver() (Coverity).
by Józef Kucia 08 Jan '19

08 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 48b309f3d694..d8a87a6ad01e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3523,6 +3523,7 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) { TRACE( "driver %s already loaded\n", debugstr_us(&drv_name) ); RtlFreeUnicodeString( &drv_name ); + CloseServiceHandle( (void *)service_handle ); return STATUS_IMAGE_ALREADY_LOADED; } -- 2.19.2

1 0