wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Henri Verbeet : ddraw: Return early in d3d_device7_DrawIndexedPrimitive() with a 0 vertex or index count.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: af4e471ef125cfcca7a2412ce2d5f3ef2251903d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4e471ef125cfcca7a2412ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:49 2016 +0200 ddraw: Return early in d3d_device7_DrawIndexedPrimitive() with a 0 vertex or index count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f5197d6..583cd07 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3689,6 +3689,12 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, "indices %p, index_count %u, flags %#x.\n", iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags); + if (!vertex_count || !index_count) + { + WARN("0 vertex or index count.\n"); + return D3D_OK; + } + /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 56cb596..d11cb2a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10132,15 +10132,15 @@ static void test_draw_primitive(void) IDirect3D2_Release(d3d); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, indices, 4, 0); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 08ab9bd..c98896e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11420,7 +11420,7 @@ static void test_draw_primitive(void) memset(&strided, 0, sizeof(strided)); hr = IDirect3DDevice3_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); @@ -11434,7 +11434,7 @@ static void test_draw_primitive(void) ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3efcf5b..4e7d9e8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11685,7 +11685,7 @@ static void test_draw_primitive(void) memset(&strided, 0, sizeof(strided)); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); @@ -11701,7 +11701,7 @@ static void test_draw_primitive(void) ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw: Return early in d3d_device7_DrawIndexedPrimitiveStrided() with a 0 vertex or index count.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 41975efef665a919066378a07a90b7a8275a26d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41975efef665a919066378a07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:48 2016 +0200 ddraw: Return early in d3d_device7_DrawIndexedPrimitiveStrided() with a 0 vertex or index count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 36 +++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6166648..f5197d6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4107,21 +4107,27 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveStrided(IDirect3DDevice3 *iface, * *****************************************************************************/ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, - D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType, - D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, - WORD *Indices, DWORD IndexCount, DWORD Flags) + D3DPRIMITIVETYPE primitive_type, DWORD fvf, D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, + DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; - UINT vtx_dst_stride = get_flexible_vertex_size(VertexType); - UINT vtx_dst_size = VertexCount * vtx_dst_stride; + UINT vtx_dst_stride = get_flexible_vertex_size(fvf); + UINT vtx_dst_size = vertex_count * vtx_dst_stride; + UINT idx_size = index_count * sizeof(WORD); UINT vb_pos, align; - UINT idx_size = IndexCount * sizeof(WORD); - UINT ib_pos; BYTE *dst_data; + UINT ib_pos; + HRESULT hr; - TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n", - iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); + TRACE("iface %p, primitive_type %#x, fvf %#x, strided_data %p, " + "vertex_count %u, indices %p, index_count %u, flags %#x.\n", + iface, primitive_type, fvf, strided_data, vertex_count, indices, index_count, flags); + + if (!vertex_count || !index_count) + { + WARN("0 vertex or index count.\n"); + return D3D_OK; + } wined3d_mutex_lock(); @@ -4141,7 +4147,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) goto done; - pack_strided_data(dst_data, VertexCount, D3DDrawPrimStrideData, VertexType); + pack_strided_data(dst_data, vertex_count, strided_data, fvf); wined3d_buffer_unmap(device->vertex_buffer); device->vertex_buffer_pos = vb_pos + vtx_dst_size; @@ -4156,7 +4162,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) goto done; - memcpy(dst_data, Indices, idx_size); + memcpy(dst_data, indices, idx_size); wined3d_buffer_unmap(device->index_buffer); device->index_buffer_pos = ib_pos + idx_size; @@ -4166,9 +4172,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT); wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vtx_dst_stride); - wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, VertexType)); - wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), IndexCount); + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); done: wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0608cf5..08ab9bd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11423,7 +11423,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, NULL, 0, 0); todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); @@ -11437,7 +11437,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 104346b..3efcf5b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11688,7 +11688,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, NULL, 0, 0); todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, NULL, 0, 0); @@ -11704,7 +11704,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw/tests: Add some tests for draw parameter validation.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: c12dc091bd595ccd0371676e7bbe925070e845fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12dc091bd595ccd0371676e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:47 2016 +0200 ddraw/tests: Add some tests for draw parameter validation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 62 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c12dc091bd595ccd03716…

1 0

Sebastian Lackner : reg: Fix a heap corruption when printing specific REG_MULTI_SZ values.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 7c774e98494d7392bc78bd3a8b2a2afd5ea0afe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c774e98494d7392bc78bd3a8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 22 19:35:01 2016 +0200 reg: Fix a heap corruption when printing specific REG_MULTI_SZ values. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6480f2c..32e75a0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -587,7 +587,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) } tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ - buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2); + buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2 + sizeof(WCHAR)); len = tmp_size / sizeof(WCHAR); for (i = 0, destindex = 0; i < len; i++, destindex++)

1 0

Francois Gouget : testbot/TestAgent: Better report the netcat errors.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: tools Branch: master Commit: 1317e3173c43c358376cb4593f37e2f65441ebc1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1317e3173c43c358376cb459… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 25 04:10:26 2016 +0200 testbot/TestAgent: Better report the netcat errors. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 82ca97f..da10672 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -220,7 +220,16 @@ sub _SetError($$$) }; $ncerr = $rc if (!$ncerr); $ncerr = "the \"$self->{nc}\" command returned $ncerr"; - $self->{err} = $self->{agentversion} ? "$self->{err}\n$ncerr" : $ncerr; + if ($self->{agentversion}) + { + $self->{err} .= "\n$ncerr"; + } + else + { + # The real issue is that we failed to connect so + # ignore the _RecvString('AgentVersion') error message + $self->{err} = "$ncerr ($self->{rpc})"; + } } } $self->Disconnect(); @@ -231,7 +240,7 @@ sub _SetError($$$) # We did not even manage to connect but record the error anyway $self->{err} = $Msg; } - debug($self->{rpc} || "norpc", ": $self->{err}\n"); + debug("$self->{err}\n"); } sub GetLastError($)

1 0

Nikolay Sivov : d3dx10: Implement D3DX10GetFeatureLevel1().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: ef36a25aec33670cd2099e4bce379bd6e2ac42a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef36a25aec33670cd2099e4bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 21 21:24:45 2016 +0300 d3dx10: Implement D3DX10GetFeatureLevel1(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 2 +- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 7 +++++++ include/d3dx10core.idl | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 6e67a6b..9338aca 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 +IMPORTS = d3d10_1 dxguid C_SRCS = \ d3dx10_43_main.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 53059bf..7bfd9f3 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -48,7 +48,7 @@ @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stub D3DX10FilterTexture(ptr long long) -@ stub D3DX10GetFeatureLevel1(ptr ptr) +@ stdcall D3DX10GetFeatureLevel1(ptr ptr) @ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) @ stub D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 1b60fc5..b28d562 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -142,3 +142,10 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } + +HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1) +{ + TRACE("device %p, device1 %p.\n", device, device1); + + return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1); +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 6d9927e..524b9ee 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -68,3 +68,4 @@ interface ID3DX10ThreadPump : IUnknown cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") +cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);")

1 0

Nikolay Sivov : dwrite: Implement newer version of CreateFontFromLOGFONT() .
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 8a6c1d99c36216953207c576fd495b9569b42210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6c1d99c36216953207c576f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 22 16:15:35 2016 +0300 dwrite: Implement newer version of CreateFontFromLOGFONT(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 81 ++++++++++++++++++++++++------------------------ dlls/dwrite/tests/font.c | 20 ++++++++++++ 2 files changed, 61 insertions(+), 40 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 711b95e..84b463a 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -620,47 +620,10 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface LOGFONTW const *logfont, IDWriteFont **font) { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - IDWriteFontCollection *collection; - IDWriteFontFamily *family; - DWRITE_FONT_STYLE style; - BOOL exists = FALSE; - UINT32 index; - HRESULT hr; TRACE("(%p)->(%p %p)\n", This, logfont, font); - *font = NULL; - - if (!logfont) return E_INVALIDARG; - - hr = IDWriteFactory2_GetSystemFontCollection((IDWriteFactory2*)This->factory, &collection, FALSE); - if (FAILED(hr)) { - ERR("failed to get system font collection: 0x%08x.\n", hr); - return hr; - } - - hr = IDWriteFontCollection_FindFamilyName(collection, logfont->lfFaceName, &index, &exists); - if (FAILED(hr)) { - IDWriteFontCollection_Release(collection); - goto done; - } - - if (!exists) { - hr = DWRITE_E_NOFONT; - goto done; - } - - hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); - if (FAILED(hr)) - goto done; - - style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; - hr = IDWriteFontFamily_GetFirstMatchingFont(family, logfont->lfWeight, DWRITE_FONT_STRETCH_NORMAL, style, font); - IDWriteFontFamily_Release(family); - -done: - IDWriteFontCollection_Release(collection); - return hr; + return IDWriteGdiInterop1_CreateFontFromLOGFONT(iface, logfont, NULL, font); } static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, @@ -880,10 +843,48 @@ static HRESULT WINAPI gdiinterop1_CreateFontFromLOGFONT(IDWriteGdiInterop1 *ifac LOGFONTW const *logfont, IDWriteFontCollection *collection, IDWriteFont **font) { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); + IDWriteFontFamily *family; + DWRITE_FONT_STYLE style; + BOOL exists = FALSE; + UINT32 index; + HRESULT hr; - FIXME("(%p)->(%p %p %p): stub\n", This, logfont, collection, font); + TRACE("(%p)->(%p %p %p)\n", This, logfont, collection, font); - return E_NOTIMPL; + *font = NULL; + + if (!logfont) return E_INVALIDARG; + + if (collection) + IDWriteFontCollection_AddRef(collection); + else { + hr = IDWriteFactory2_GetSystemFontCollection((IDWriteFactory2*)This->factory, &collection, FALSE); + if (FAILED(hr)) { + ERR("failed to get system font collection: 0x%08x.\n", hr); + return hr; + } + } + + hr = IDWriteFontCollection_FindFamilyName(collection, logfont->lfFaceName, &index, &exists); + if (FAILED(hr)) + goto done; + + if (!exists) { + hr = DWRITE_E_NOFONT; + goto done; + } + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + if (FAILED(hr)) + goto done; + + style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; + hr = IDWriteFontFamily_GetFirstMatchingFont(family, logfont->lfWeight, DWRITE_FONT_STRETCH_NORMAL, style, font); + IDWriteFontFamily_Release(family); + +done: + IDWriteFontCollection_Release(collection); + return hr; } static HRESULT WINAPI gdiinterop1_GetFontSignature_(IDWriteGdiInterop1 *iface, IDWriteFontFace *fontface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index bad347d..5fb4121 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -749,6 +749,7 @@ static ID2D1SimplifiedGeometrySink test_geomsink2 = { &test_geometrysink2_vtbl } static void test_CreateFontFromLOGFONT(void) { static const WCHAR tahomaspW[] = {'T','a','h','o','m','a',' ',0}; + IDWriteGdiInterop1 *interop1; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; @@ -906,6 +907,25 @@ if (0) ok(hr == DWRITE_E_NOFONT, "got 0x%08x\n", hr); ok(font == NULL, "got %p\n", font); + /* IDWriteGdiInterop1::CreateFontFromLOGFONT() */ + hr = IDWriteGdiInterop_QueryInterface(interop, &IID_IDWriteGdiInterop1, (void**)&interop1); + if (hr == S_OK) { + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop1_CreateFontFromLOGFONT(interop1, &logfont, NULL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFont_Release(font); + IDWriteGdiInterop1_Release(interop1); + } + else + win_skip("IDWriteGdiInterop1 is not supported, skipping CreateFontFromLOGFONT() tests.\n"); + IDWriteGdiInterop_Release(interop); IDWriteFactory_Release(factory); }

1 0

Józef Kucia : d3d11: Add ID3D11ClassLinkage interface stub.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: ecc577312e203484d757056ef3bdf548679b81ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc577312e203484d757056ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:48 2016 +0200 d3d11: Add ID3D11ClassLinkage interface stub. 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 | 12 ++++ dlls/d3d11/device.c | 13 ++++- dlls/d3d11/shader.c | 142 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 17e9f9f..cfc50a8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -315,6 +315,18 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; +/* ID3D11ClassLinkage */ +struct d3d11_class_linkage +{ + ID3D11ClassLinkage ID3D11ClassLinkage_iface; + LONG refcount; + + struct wined3d_private_store private_store; +}; + +HRESULT d3d11_class_linkage_create(struct d3d_device *device, + struct d3d11_class_linkage **class_linkage) DECLSPEC_HIDDEN; + /* ID3D11BlendState, ID3D10BlendState1 */ struct d3d_blend_state { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fd88ac1..7fb28ac 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2241,9 +2241,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device * static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device *iface, ID3D11ClassLinkage **class_linkage) { - FIXME("iface %p, class_linkage %p stub!\n", iface, class_linkage); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d11_class_linkage *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, class_linkage %p.\n", iface, class_linkage); + + if (FAILED(hr = d3d11_class_linkage_create(device, &object))) + return hr; + + *class_linkage = &object->ID3D11ClassLinkage_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index bf6bb32..0b6b29e 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1507,3 +1507,145 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i return impl_from_ID3D10PixelShader(iface); } + +/* ID3D11ClassLinkage methods */ + +static inline struct d3d11_class_linkage *impl_from_ID3D11ClassLinkage(ID3D11ClassLinkage *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_class_linkage, ID3D11ClassLinkage_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_QueryInterface(ID3D11ClassLinkage *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11ClassLinkage) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11ClassLinkage_AddRef(*object = iface); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_class_linkage_AddRef(ID3D11ClassLinkage *iface) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + ULONG refcount = InterlockedIncrement(&class_linkage->refcount); + + TRACE("%p increasing refcount to %u.\n", class_linkage, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_class_linkage_Release(ID3D11ClassLinkage *iface) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + ULONG refcount = InterlockedDecrement(&class_linkage->refcount); + + TRACE("%p decreasing refcount to %u.\n", class_linkage, refcount); + + if (!refcount) + { + wined3d_private_store_cleanup(&class_linkage->private_store); + HeapFree(GetProcessHeap(), 0, class_linkage); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_class_linkage_GetDevice(ID3D11ClassLinkage *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_GetPrivateData(ID3D11ClassLinkage *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&class_linkage->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_SetPrivateData(ID3D11ClassLinkage *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&class_linkage->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_SetPrivateDataInterface(ID3D11ClassLinkage *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&class_linkage->private_store, guid, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_GetClassInstance(ID3D11ClassLinkage *iface, + const char *instance_name, UINT instance_index, ID3D11ClassInstance **class_instance) +{ + FIXME("iface %p, instance_name %s, instance_index %u, class_instance %p stub!\n", + iface, debugstr_a(instance_name), instance_index, class_instance); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_CreateClassInstance(ID3D11ClassLinkage *iface, + const char *type_name, UINT cb_offset, UINT cb_vector_offset, UINT texture_offset, + UINT sampler_offset, ID3D11ClassInstance **class_instance) +{ + FIXME("iface %p, type_name %s, cb_offset %u, cb_vector_offset %u, texture_offset %u, " + "sampler_offset %u, class_instance %p stub!\n", + iface, debugstr_a(type_name), cb_offset, cb_vector_offset, texture_offset, + sampler_offset, class_instance); + + return E_NOTIMPL; +} + +static const struct ID3D11ClassLinkageVtbl d3d11_class_linkage_vtbl = +{ + /* IUnknown methods */ + d3d11_class_linkage_QueryInterface, + d3d11_class_linkage_AddRef, + d3d11_class_linkage_Release, + /* ID3D11DeviceChild methods */ + d3d11_class_linkage_GetDevice, + d3d11_class_linkage_GetPrivateData, + d3d11_class_linkage_SetPrivateData, + d3d11_class_linkage_SetPrivateDataInterface, + /* ID3D11ClassLinkage methods */ + d3d11_class_linkage_GetClassInstance, + d3d11_class_linkage_CreateClassInstance, +}; + +HRESULT d3d11_class_linkage_create(struct d3d_device *device, struct d3d11_class_linkage **class_linkage) +{ + struct d3d11_class_linkage *object; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3D11ClassLinkage_iface.lpVtbl = &d3d11_class_linkage_vtbl; + object->refcount = 1; + wined3d_private_store_init(&object->private_store); + + TRACE("Created class linkage %p.\n", object); + *class_linkage = object; + + return S_OK; +}

1 0

Józef Kucia : wined3d: Handle 2D array textures in context_dump_fbo_attachment().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 0f1729c5f47b162e083866e2047dd06f9b4b5286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1729c5f47b162e083866e20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:47 2016 +0200 wined3d: Handle 2D array textures in context_dump_fbo_attachment(). 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/wined3d/context.c | 58 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6cda974..e741969 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -219,6 +219,20 @@ static void context_attach_surface_fbo(struct wined3d_context *context, static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, GLenum target, GLenum attachment) { + static const struct + { + GLenum target; + GLenum binding; + const char *str; + enum wined3d_gl_extension extension; + } + texture_type[] = + { + {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D, "2d", WINED3D_GL_EXT_NONE}, + {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE}, + {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY, "2d-array", EXT_TEXTURE_ARRAY}, + }; + GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, @@ -262,29 +276,30 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } else { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_texture); - while (gl_info->gl_ops.gl.p_glGetError()); + unsigned int i; - glBindTexture(GL_TEXTURE_2D, name); - if (!gl_info->gl_ops.gl.p_glGetError()) - { - tex_target = GL_TEXTURE_2D; - tex_type_str = "2d"; - } - else + tex_type_str = NULL; + for (i = 0; i < sizeof(texture_type) / sizeof(*texture_type); ++i) { - glBindTexture(GL_TEXTURE_2D, old_texture); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_texture); + if (!gl_info->supported[texture_type[i].extension]) + continue; - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, name); - if (gl_info->gl_ops.gl.p_glGetError()) + gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); + while (gl_info->gl_ops.gl.p_glGetError()); + + glBindTexture(texture_type[i].target, name); + if (!gl_info->gl_ops.gl.p_glGetError()) { - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, old_texture); - FIXME("Cannot find type of texture %d.\n", name); - return; + tex_target = texture_type[i].target; + tex_type_str = texture_type[i].str; + break; } - tex_target = GL_TEXTURE_RECTANGLE_ARB; - tex_type_str = "rectangle"; + glBindTexture(texture_type[i].target, old_texture); + } + if (!tex_type_str) + { + FIXME("Cannot find type of texture %d.\n", name); + return; } glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); @@ -296,13 +311,16 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G tex_type_str, name, width, height, fmt); glBindTexture(tex_target, old_texture); + checkGLcall("Guess texture type"); } else if (type == GL_NONE) { - FIXME("\t%s: NONE.\n", debug_fboattachment(attachment)); + FIXME(" %s: NONE.\n", debug_fboattachment(attachment)); } else - ERR("\t%s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type); + { + ERR(" %s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type); + } } /* Context activation is done by the caller. */

1 0

Józef Kucia : wined3d: Implement readback from 2D array textures using glGet[Compressed]TexImage ().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: b5dad41e36d96d4124730219f26c38a09d2d486e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5dad41e36d96d4124730219f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:46 2016 +0200 wined3d: Implement readback from 2D array textures using glGet[Compressed]TexImage(). 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/wined3d/surface.c | 74 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 367bd95..7b8f5eb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -758,11 +758,14 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { + unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; const struct wined3d_format *format = texture->resource.format; + struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; unsigned int src_row_pitch, src_slice_pitch; struct wined3d_bo_address data; + BYTE *temporary_mem = NULL; void *mem; /* Only support read back of converted P8 surfaces. */ @@ -772,7 +775,28 @@ static void surface_download_data(struct wined3d_surface *surface, const struct return; } - wined3d_texture_get_memory(texture, surface_get_sub_resource_idx(surface), &data, dst_location); + sub_resource = &texture->sub_resources[sub_resource_idx]; + + if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + { + /* We don't expect to ever need to emulate NP2 textures when we have EXT_texture_array. */ + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + { + FIXME("Cannot download surface %p, level %u, layer %u.\n", + surface, surface->texture_level, surface->texture_layer); + return; + } + + WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n"); + + if (!(temporary_mem = HeapAlloc(GetProcessHeap(), 0, texture->layer_count * sub_resource->size))) + { + ERR("Out of memory.\n"); + return; + } + } + + wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { @@ -781,22 +805,31 @@ static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_texture_get_level_pow2_width(texture, surface->texture_level), wined3d_texture_get_level_pow2_height(texture, surface->texture_level), &src_row_pitch, &src_slice_pitch); - mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); + if (!(temporary_mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch))) + { + ERR("Out of memory.\n"); + return; + } if (data.buffer_object) ERR("NP2 emulated texture uses PBO unexpectedly.\n"); if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) ERR("Unexpected compressed format for NP2 emulated texture.\n"); } - else + + if (temporary_mem) { - mem = data.addr; + mem = temporary_mem; } - - if (data.buffer_object) + else if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); checkGLcall("glBindBuffer"); + mem = data.addr; + } + else + { + mem = data.addr; } if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) @@ -817,12 +850,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct checkGLcall("glGetTexImage"); } - if (data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; @@ -883,9 +910,30 @@ static void surface_download_data(struct wined3d_surface *surface, const struct src_data += src_row_pitch; dst_data += dst_row_pitch; } + } + else if (temporary_mem) + { + void *src_data = temporary_mem + surface->texture_layer * sub_resource->size; + if (data.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); + checkGLcall("glBindBuffer"); + GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, 0, sub_resource->size, src_data)); + checkGLcall("glBufferSubData"); + } + else + { + memcpy(data.addr, src_data, sub_resource->size); + } + } - HeapFree(GetProcessHeap(), 0, mem); + if (data.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); } + + HeapFree(GetProcessHeap(), 0, temporary_mem); } /* This call just uploads data, the caller is responsible for binding the

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016