July 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : ddraw: Don't memset memory before overwritting it.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 63fcf7faee88aea9425f57de8516dea262f54531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63fcf7faee88aea9425f57de8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 27 16:10:39 2016 +0200 ddraw: Don't memset memory before overwritting it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 5ebc41e..154f9aa 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -272,7 +272,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE wined3d_mutex_lock(); dwSize = lpData->dwSize; - memset(lpData, 0, dwSize); if (!This->use_vp2) memcpy(lpData, &(This->viewports.vp1), dwSize); else { @@ -895,7 +894,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI wined3d_mutex_lock(); dwSize = lpData->dwSize; - memset(lpData, 0, dwSize); if (This->use_vp2) memcpy(lpData, &(This->viewports.vp2), dwSize); else {

1 0

Józef Kucia : d3d10core/tests: Add test for DXGI_FORMAT_R10G10B10A2_UINT vertex format.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: bdae44fb51bda6845f02543dd320ff245a186085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdae44fb51bda6845f02543dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:39 2016 +0200 d3d10core/tests: Add test for DXGI_FORMAT_R10G10B10A2_UINT vertex format. 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/d3d10core/tests/device.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index c6fc480..3d7ef0c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8257,6 +8257,7 @@ static void test_input_assembler(void) LAYOUT_UNORM8, LAYOUT_SNORM8, LAYOUT_UNORM10_2, + LAYOUT_UINT10_2, LAYOUT_COUNT, }; @@ -8290,6 +8291,7 @@ static void test_input_assembler(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R10G10B10A2_UNORM, + DXGI_FORMAT_R10G10B10A2_UINT, }; static const struct { @@ -8464,6 +8466,16 @@ static void test_input_assembler(void) {0.0f, 0.0f, 0.0f, 1.0f}}, {LAYOUT_UNORM10_2, sizeof(unorm10_2_data), &unorm10_2_data, {1.0f, 0.0f, 512.0f / 1023.0f, 2.0f / 3.0f}}, + {LAYOUT_UINT10_2, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT10_2, sizeof(uint32_max), &uint32_max, + {1023.0f, 1023.0f, 1023.0f, 3.0f}}, + {LAYOUT_UINT10_2, sizeof(g10_data), &g10_data, + {0.0f, 1023.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT10_2, sizeof(a2_data), &a2_data, + {0.0f, 0.0f, 0.0f, 3.0f}}, + {LAYOUT_UINT10_2, sizeof(unorm10_2_data), &unorm10_2_data, + {1023.0f, 0.0f, 512.0f, 2.0f}}, }; if (!init_test_context(&test_context)) @@ -8484,9 +8496,11 @@ static void test_input_assembler(void) for (i = 0; i < LAYOUT_COUNT; ++i) { input_layout_desc[1].Format = layout_formats[i]; + input_layout[i] = NULL; hr = ID3D10Device_CreateInputLayout(device, input_layout_desc, sizeof(input_layout_desc) / sizeof(*input_layout_desc), vs_float_code, sizeof(vs_float_code), &input_layout[i]); + todo_wine_if(input_layout_desc[1].Format == DXGI_FORMAT_R10G10B10A2_UINT) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", layout_formats[i], hr); } @@ -8522,6 +8536,9 @@ static void test_input_assembler(void) { D3D10_BOX box = {0, 0, 0, 1, 1, 1}; + if (tests[i].layout_id == LAYOUT_UINT10_2) + continue; + assert(tests[i].layout_id < LAYOUT_COUNT); ID3D10Device_IASetInputLayout(device, input_layout[tests[i].layout_id]); @@ -8541,6 +8558,7 @@ static void test_input_assembler(void) switch (layout_formats[tests[i].layout_id]) { case DXGI_FORMAT_R16G16B16A16_UINT: + case DXGI_FORMAT_R10G10B10A2_UINT: case DXGI_FORMAT_R8G8B8A8_UINT: ID3D10Device_VSSetShader(device, vs_uint); break; @@ -8571,7 +8589,10 @@ static void test_input_assembler(void) ID3D10Buffer_Release(vb_attribute); ID3D10Buffer_Release(vb_position); for (i = 0; i < LAYOUT_COUNT; ++i) - ID3D10InputLayout_Release(input_layout[i]); + { + if (input_layout[i]) + ID3D10InputLayout_Release(input_layout[i]); + } ID3D10PixelShader_Release(ps); ID3D10VertexShader_Release(vs_float); ID3D10VertexShader_Release(vs_uint);

1 0

Józef Kucia : d3d11/tests: Add test for buffer data initialization.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: e25f79f5785b8f4a403692a6422e8d7696d09e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25f79f5785b8f4a403692a64… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 26 12:16:33 2016 +0200 d3d11/tests: Add test for buffer data initialization. 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 | 145 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 108 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e25f79f5785b8f4a40369…

1 0

Józef Kucia : d3d11/tests: Add test for index buffer offset.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: ff0f902aa9612b50fc7123af8249916c7b9caf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0f902aa9612b50fc7123af8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 26 12:16:34 2016 +0200 d3d11/tests: Add test for index buffer offset. 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 | 179 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3faa941..d7cda84 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9826,6 +9826,184 @@ static void test_uint_shader_instructions(void) release_test_context(&test_context); } +static void test_index_buffer_offset(void) +{ + struct d3d11_test_context test_context; + ID3D11Buffer *vb, *ib, *so_buffer; + ID3D11InputLayout *input_layout; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11GeometryShader *gs; + const struct vec4 *data; + ID3D11VertexShader *vs; + ID3D11Device *device; + UINT stride, offset; + unsigned int i; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const DWORD vs_code[] = + { +#if 0 + void main(float4 position : SV_POSITION, float4 attrib : ATTRIB, + out float4 out_position : SV_Position, out float4 out_attrib : ATTRIB) + { + out_position = position; + out_attrib = attrib; + } +#endif + 0x43425844, 0xd7716716, 0xe23207f3, 0xc8af57c0, 0x585e2919, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441, 0xab004249, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const DWORD gs_code[] = + { +#if 0 + struct vertex + { + float4 position : SV_POSITION; + float4 attrib : ATTRIB; + }; + + [maxvertexcount(1)] + void main(point vertex input[1], inout PointStream<vertex> output) + { + output.Append(input[0]); + output.RestartStrip(); + } +#endif + 0x43425844, 0x3d1dc497, 0xdf450406, 0x284ab03b, 0xa4ec0fd6, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, 0x52444853, 0x00000094, 0x00020040, + 0x00000025, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2, + 0x00000001, 0x00000001, 0x0100085d, 0x0100085c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000001, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000000, 0x00000000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, + 0x00000001, 0x01000013, 0x01000009, 0x0100003e, + }; + static const D3D11_INPUT_ELEMENT_DESC input_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"ATTRIB", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const D3D11_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_Position", 0, 0, 4, 0}, + {0, "ATTRIB", 0, 0, 4, 0}, + }; + static const struct + { + struct vec4 position; + struct vec4 attrib; + } + vertices[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}}, + }; + static const unsigned int indices[] = + { + 0, 1, 2, 3, + 3, 2, 1, 0, + 1, 3, 2, 0, + }; + static const struct vec4 expected_data[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateInputLayout(device, input_desc, sizeof(input_desc) / sizeof(*input_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + stride = 32; + hr = ID3D11Device_CreateGeometryShaderWithStreamOutput(device, gs_code, sizeof(gs_code), + so_declaration, sizeof(so_declaration) / sizeof(*so_declaration), + &stride, 1, D3D11_SO_NO_RASTERIZED_STREAM, NULL, &gs); + todo_wine ok(SUCCEEDED(hr), "Failed to create geometry shader with stream output, hr %#x.\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(vertices), vertices); + ib = create_buffer(device, D3D11_BIND_INDEX_BUFFER, sizeof(indices), indices); + so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); + + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); + stride = sizeof(*vertices); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 0); + ID3D11DeviceContext_DrawIndexed(context, 4, 0, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 4 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexed(context, 4, 0, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 8 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexed(context, 4, 0, 0); + + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < sizeof(expected_data) / sizeof(*expected_data); ++i) + { + data = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(data, &expected_data[i], 0), + "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, i); + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(so_buffer); + ID3D11Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11VertexShader_Release(vs); + ID3D11GeometryShader_Release(gs); +cleanup: + ID3D11InputLayout_Release(input_layout); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -9879,4 +10057,5 @@ START_TEST(d3d11) test_immediate_constant_buffer(); test_fp_specials(); test_uint_shader_instructions(); + test_index_buffer_offset(); }

1 0

Józef Kucia : d3d10core/tests: Add test for buffer data initialization.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 7b39fb0cac818a7fee05a4632904e4807725a14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b39fb0cac818a7fee05a4632… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 26 12:16:35 2016 +0200 d3d10core/tests: Add test for buffer data initialization. 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/d3d10core/tests/device.c | 166 +++++++++++++++++++++++++++++++----------- 1 file changed, 123 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b39fb0cac818a7fee05a…

1 0

Józef Kucia : d3d10core/tests: Add test for index buffer offset.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 47283b5b89332db8ed1afef9f6caca499032f303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47283b5b89332db8ed1afef9f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 26 12:16:36 2016 +0200 d3d10core/tests: Add test for index buffer offset. 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/d3d10core/tests/device.c | 176 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f0935d2..c6fc480 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8932,6 +8932,181 @@ static void test_uint_shader_instructions(void) release_test_context(&test_context); } +static void test_index_buffer_offset(void) +{ + struct d3d10core_test_context test_context; + ID3D10Buffer *vb, *ib, *so_buffer; + ID3D10InputLayout *input_layout; + struct resource_readback rb; + ID3D10GeometryShader *gs; + const struct vec4 *data; + ID3D10VertexShader *vs; + ID3D10Device *device; + UINT stride, offset; + unsigned int i; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + void main(float4 position : SV_POSITION, float4 attrib : ATTRIB, + out float4 out_position : SV_Position, out float4 out_attrib : ATTRIB) + { + out_position = position; + out_attrib = attrib; + } +#endif + 0x43425844, 0xd7716716, 0xe23207f3, 0xc8af57c0, 0x585e2919, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441, 0xab004249, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const DWORD gs_code[] = + { +#if 0 + struct vertex + { + float4 position : SV_POSITION; + float4 attrib : ATTRIB; + }; + + [maxvertexcount(1)] + void main(point vertex input[1], inout PointStream<vertex> output) + { + output.Append(input[0]); + output.RestartStrip(); + } +#endif + 0x43425844, 0x3d1dc497, 0xdf450406, 0x284ab03b, 0xa4ec0fd6, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, 0x52444853, 0x00000094, 0x00020040, + 0x00000025, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2, + 0x00000001, 0x00000001, 0x0100085d, 0x0100085c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000001, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000000, 0x00000000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, + 0x00000001, 0x01000013, 0x01000009, 0x0100003e, + }; + static const D3D10_INPUT_ELEMENT_DESC input_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"ATTRIB", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const D3D10_SO_DECLARATION_ENTRY so_declaration[] = + { + {"SV_Position", 0, 0, 4, 0}, + {"ATTRIB", 0, 0, 4, 0}, + }; + static const struct + { + struct vec4 position; + struct vec4 attrib; + } + vertices[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}}, + }; + static const unsigned int indices[] = + { + 0, 1, 2, 3, + 3, 2, 1, 0, + 1, 3, 2, 0, + }; + static const struct vec4 expected_data[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreateInputLayout(device, input_desc, sizeof(input_desc) / sizeof(*input_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + stride = 32; + hr = ID3D10Device_CreateGeometryShaderWithStreamOutput(device, gs_code, sizeof(gs_code), + so_declaration, sizeof(so_declaration) / sizeof(*so_declaration), + stride, &gs); + todo_wine ok(SUCCEEDED(hr), "Failed to create geometry shader with stream output, hr %#x.\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(vertices), vertices); + ib = create_buffer(device, D3D10_BIND_INDEX_BUFFER, sizeof(indices), indices); + so_buffer = create_buffer(device, D3D10_BIND_STREAM_OUTPUT, 1024, NULL); + + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_GSSetShader(device, gs); + + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_POINTLIST); + stride = sizeof(*vertices); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + + offset = 0; + ID3D10Device_SOSetTargets(device, 1, &so_buffer, &offset); + + ID3D10Device_IASetIndexBuffer(device, ib, DXGI_FORMAT_R32_UINT, 0); + ID3D10Device_DrawIndexed(device, 4, 0, 0); + + ID3D10Device_IASetIndexBuffer(device, ib, DXGI_FORMAT_R32_UINT, 4 * sizeof(*indices)); + ID3D10Device_DrawIndexed(device, 4, 0, 0); + + ID3D10Device_IASetIndexBuffer(device, ib, DXGI_FORMAT_R32_UINT, 8 * sizeof(*indices)); + ID3D10Device_DrawIndexed(device, 4, 0, 0); + + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < sizeof(expected_data) / sizeof(*expected_data); ++i) + { + data = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(data, &expected_data[i], 0), + "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, i); + } + release_resource_readback(&rb); + + ID3D10Buffer_Release(so_buffer); + ID3D10Buffer_Release(ib); + ID3D10Buffer_Release(vb); + ID3D10VertexShader_Release(vs); + ID3D10GeometryShader_Release(gs); +cleanup: + ID3D10InputLayout_Release(input_layout); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -8980,4 +9155,5 @@ START_TEST(device) test_immediate_constant_buffer(); test_fp_specials(); test_uint_shader_instructions(); + test_index_buffer_offset(); }

1 0

Józef Kucia : wined3d: Introduce R10G10B10X2 vertex formats for D3D8/9.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 8b493d769efd54251d2c11a03a22be25d0de93ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b493d769efd54251d2c11a03… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 26 12:16:37 2016 +0200 wined3d: Introduce R10G10B10X2 vertex formats for D3D8/9. 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/d3d8/vertexdeclaration.c | 4 ++-- dlls/d3d9/vertexdeclaration.c | 4 ++-- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/utils.c | 8 ++++++-- include/wine/wined3d.h | 2 ++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 7900325..9206a2c 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -220,8 +220,8 @@ static const enum wined3d_format_id wined3d_format_lookup[] = /*WINED3DDECLTYPE_SHORT4N*/ WINED3DFMT_R16G16B16A16_SNORM, /*WINED3DDECLTYPE_USHORT2N*/ WINED3DFMT_R16G16_UNORM, /*WINED3DDECLTYPE_USHORT4N*/ WINED3DFMT_R16G16B16A16_UNORM, - /*WINED3DDECLTYPE_UDEC3*/ WINED3DFMT_R10G10B10A2_UINT, - /*WINED3DDECLTYPE_DEC3N*/ WINED3DFMT_R10G10B10A2_SNORM, + /*WINED3DDECLTYPE_UDEC3*/ WINED3DFMT_R10G10B10X2_UINT, + /*WINED3DDECLTYPE_DEC3N*/ WINED3DFMT_R10G10B10X2_SNORM, /*WINED3DDECLTYPE_FLOAT16_2*/ WINED3DFMT_R16G16_FLOAT, /*WINED3DDECLTYPE_FLOAT16_4*/ WINED3DFMT_R16G16B16A16_FLOAT, }; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 914de24..b66827f 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -45,8 +45,8 @@ d3d_dtype_lookup[] = /* D3DDECLTYPE_SHORT4N */ {WINED3DFMT_R16G16B16A16_SNORM, 4, sizeof(short int)}, /* D3DDECLTYPE_USHORT2N */ {WINED3DFMT_R16G16_UNORM, 2, sizeof(short int)}, /* D3DDECLTYPE_USHORT4N */ {WINED3DFMT_R16G16B16A16_UNORM, 4, sizeof(short int)}, - /* D3DDECLTYPE_UDEC3 */ {WINED3DFMT_R10G10B10A2_UINT, 3, sizeof(short int)}, - /* D3DDECLTYPE_DEC3N */ {WINED3DFMT_R10G10B10A2_SNORM, 3, sizeof(short int)}, + /* D3DDECLTYPE_UDEC3 */ {WINED3DFMT_R10G10B10X2_UINT, 3, sizeof(short int)}, + /* D3DDECLTYPE_DEC3N */ {WINED3DFMT_R10G10B10X2_SNORM, 3, sizeof(short int)}, /* D3DDECLTYPE_FLOAT16_2 */ {WINED3DFMT_R16G16_FLOAT, 2, sizeof(short int)}, /* D3DDECLTYPE_FLOAT16_4 */ {WINED3DFMT_R16G16B16A16_FLOAT, 4, sizeof(short int)} }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 30ea1c7..a35f9c8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4110,11 +4110,11 @@ static void load_numbered_arrays(struct wined3d_context *context, GL_EXTCALL(glVertexAttrib4Nusv(i, (const GLushort *)ptr)); break; - case WINED3DFMT_R10G10B10A2_UINT: + case WINED3DFMT_R10G10B10X2_UINT: FIXME("Unsure about WINED3DDECLTYPE_UDEC3.\n"); /*glVertexAttrib3usvARB(i, (const GLushort *)ptr); Does not exist */ break; - case WINED3DFMT_R10G10B10A2_SNORM: + case WINED3DFMT_R10G10B10X2_SNORM: FIXME("Unsure about WINED3DDECLTYPE_DEC3N.\n"); /*glVertexAttrib3NusvARB(i, (const GLushort *)ptr); Does not exist */ break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3406fdd..b686b09 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -124,6 +124,8 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_SNORM, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R10G11B11_SNORM, 10, 11, 11, 0, 0, 10, 21, 0, 4, 0, 0}, + {WINED3DFMT_R10G10B10X2_UINT, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, + {WINED3DFMT_R10G10B10X2_SNORM, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10_SNORM_A2_UNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, @@ -348,8 +350,8 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT, GL_TRUE }, {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT, GL_TRUE }, {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT, GL_TRUE }, - {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, GL_TRUE }, + {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, GL_TRUE }, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT_2_10_10_10_REV, GL_TRUE, ARB_VERTEX_TYPE_2_10_10_10_REV}, {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT, GL_FALSE}, @@ -3613,6 +3615,8 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R5G5_SNORM_L6_UNORM); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); FMT_TO_STR(WINED3DFMT_R10G11B11_SNORM); + FMT_TO_STR(WINED3DFMT_R10G10B10X2_UINT); + FMT_TO_STR(WINED3DFMT_R10G10B10X2_SNORM); FMT_TO_STR(WINED3DFMT_R10G10B10_SNORM_A2_UNORM); FMT_TO_STR(WINED3DFMT_UYVY); FMT_TO_STR(WINED3DFMT_YUY2); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a425ac5..ff1a949 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -113,6 +113,8 @@ enum wined3d_format_id WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, WINED3DFMT_R10G11B11_SNORM, + WINED3DFMT_R10G10B10X2_UINT, + WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10_SNORM_A2_UNORM, WINED3DFMT_D16_LOCKABLE, WINED3DFMT_D32_UNORM,

1 0

Józef Kucia : d3d11/tests: Add test for DXGI_FORMAT_R10G10B10A2_UINT vertex format.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: c3cee86d75da5d5d3e16b9ebab1c094637a3b43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cee86d75da5d5d3e16b9eba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 26 12:16:38 2016 +0200 d3d11/tests: Add test for DXGI_FORMAT_R10G10B10A2_UINT vertex format. 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 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d7cda84..c86e0d1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8725,6 +8725,7 @@ static void test_input_assembler(void) LAYOUT_UNORM8, LAYOUT_SNORM8, LAYOUT_UNORM10_2, + LAYOUT_UINT10_2, LAYOUT_COUNT, }; @@ -8759,6 +8760,7 @@ static void test_input_assembler(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R10G10B10A2_UNORM, + DXGI_FORMAT_R10G10B10A2_UINT, }; static const struct { @@ -8933,6 +8935,16 @@ static void test_input_assembler(void) {0.0f, 0.0f, 0.0f, 1.0f}}, {LAYOUT_UNORM10_2, sizeof(unorm10_2_data), &unorm10_2_data, {1.0f, 0.0f, 512.0f / 1023.0f, 2.0f / 3.0f}}, + {LAYOUT_UINT10_2, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT10_2, sizeof(uint32_max), &uint32_max, + {1023.0f, 1023.0f, 1023.0f, 3.0f}}, + {LAYOUT_UINT10_2, sizeof(g10_data), &g10_data, + {0.0f, 1023.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT10_2, sizeof(a2_data), &a2_data, + {0.0f, 0.0f, 0.0f, 3.0f}}, + {LAYOUT_UINT10_2, sizeof(unorm10_2_data), &unorm10_2_data, + {1023.0f, 0.0f, 512.0f, 2.0f}}, }; if (!init_test_context(&test_context, NULL)) @@ -8954,9 +8966,11 @@ static void test_input_assembler(void) for (i = 0; i < LAYOUT_COUNT; ++i) { input_layout_desc[1].Format = layout_formats[i]; + input_layout[i] = NULL; hr = ID3D11Device_CreateInputLayout(device, input_layout_desc, sizeof(input_layout_desc) / sizeof(*input_layout_desc), vs_float_code, sizeof(vs_float_code), &input_layout[i]); + todo_wine_if(input_layout_desc[1].Format == DXGI_FORMAT_R10G10B10A2_UINT) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", layout_formats[i], hr); } @@ -8992,6 +9006,9 @@ static void test_input_assembler(void) { D3D11_BOX box = {0, 0, 0, 1, 1, 1}; + if (tests[i].layout_id == LAYOUT_UINT10_2) + continue; + assert(tests[i].layout_id < LAYOUT_COUNT); ID3D11DeviceContext_IASetInputLayout(context, input_layout[tests[i].layout_id]); @@ -9011,6 +9028,7 @@ static void test_input_assembler(void) switch (layout_formats[tests[i].layout_id]) { case DXGI_FORMAT_R16G16B16A16_UINT: + case DXGI_FORMAT_R10G10B10A2_UINT: case DXGI_FORMAT_R8G8B8A8_UINT: ID3D11DeviceContext_VSSetShader(context, vs_uint, NULL, 0); break; @@ -9041,7 +9059,10 @@ static void test_input_assembler(void) ID3D11Buffer_Release(vb_attribute); ID3D11Buffer_Release(vb_position); for (i = 0; i < LAYOUT_COUNT; ++i) - ID3D11InputLayout_Release(input_layout[i]); + { + if (input_layout[i]) + ID3D11InputLayout_Release(input_layout[i]); + } ID3D11PixelShader_Release(ps); ID3D11VertexShader_Release(vs_float); ID3D11VertexShader_Release(vs_uint);

1 0

Francois Gouget : d3drm: Make d3drm_device_set_ddraw_device_d3d() static.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 43cf833c5d69deebf3ab5dd9ff3fdf4052d0d68c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43cf833c5d69deebf3ab5dd9f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 26 16:52:04 2016 +0200 d3drm: Make d3drm_device_set_ddraw_device_d3d() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 2 -- dlls/d3drm/device.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 4394fcc..9bf7dff 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -106,8 +106,6 @@ HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, I void d3drm_device_destroy(struct d3drm_device *device) DECLSPEC_HIDDEN; HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw *ddraw, IDirectDrawSurface *surface, BOOL create_z_surface) DECLSPEC_HIDDEN; -HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, - IDirect3D *d3d, IDirect3DDevice *d3d_device) DECLSPEC_HIDDEN; void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 449135a..fb83342 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -208,7 +208,7 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw return hr; } -HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, IDirect3D *d3d, IDirect3DDevice *d3d_device) +static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, IDirect3D *d3d, IDirect3DDevice *d3d_device) { IDirectDraw *ddraw; IDirectDrawSurface *surface;

1 0

Francois Gouget : d3drm/tests: Spelling fixes for a couple of ok() messages.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 429e5325f3dae24f8fa0aa3eef4789a36ca490e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429e5325f3dae24f8fa0aa3ee… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 26 16:52:35 2016 +0200 d3drm/tests: Spelling fixes for a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 76e4fb4..db9a774 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -4487,7 +4487,7 @@ static void test_create_device_from_d3d2(void) hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2); ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr); - ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, + ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); /* Check properties of render target and depth surfaces */ @@ -4768,7 +4768,7 @@ static void test_create_device_from_d3d3(void) hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2); ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr); - ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, + ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); /* Check properties of render target and depth surfaces */

1 0