February 2017 - Wine-commits

Henri Verbeet : d2d1: Take the source transformation into account when creating a transformed geometry.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: d10dfd41021ce4b6c68f66b239a5313b018dae54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10dfd41021ce4b6c68f66b23… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 3 13:37:12 2017 +0100 d2d1: Take the source transformation into account when creating a transformed geometry. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/geometry.c | 11 ++++++++--- dlls/d2d1/tests/d2d1.c | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2274a8e..336be96 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -366,6 +366,7 @@ struct d2d_geometry struct { ID2D1Geometry *src_geometry; + D2D_MATRIX_3X2_F transform; } transformed; } u; }; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 79250ab..b268b7d 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3090,7 +3090,7 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetTransform(ID2D1Transfo TRACE("iface %p, transform %p.\n", iface, transform); - *transform = geometry->transform; + *transform = geometry->u.transformed.transform; } static const struct ID2D1TransformedGeometryVtbl d2d_transformed_geometry_vtbl = @@ -3120,10 +3120,15 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) { struct d2d_geometry *src_impl; + D2D_MATRIX_3X2_F g; - d2d_geometry_init(geometry, factory, transform, (ID2D1GeometryVtbl *)&d2d_transformed_geometry_vtbl); - ID2D1Geometry_AddRef(geometry->u.transformed.src_geometry = src_geometry); src_impl = unsafe_impl_from_ID2D1Geometry(src_geometry); + + g = src_impl->transform; + d2d_matrix_multiply(&g, transform); + d2d_geometry_init(geometry, factory, &g, (ID2D1GeometryVtbl *)&d2d_transformed_geometry_vtbl); + ID2D1Geometry_AddRef(geometry->u.transformed.src_geometry = src_geometry); + geometry->u.transformed.transform = *transform; geometry->fill = src_impl->fill; geometry->outline = src_impl->outline; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9a11f10..7dccbd7 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3817,7 +3817,7 @@ static void test_draw_geometry(void) "ATNaJogBM2IlgAEzayV4M3MlbzN8JWczhAElXjONASVWM5UBJU0zngElRTOmASU8M68BJTQztgEm" "KzO/ASUkM8cBJRsz0AElEzPYASUKM+EBJQIz6QFR8gFJ+gFAgwI4igIwkwIomwIfpAIXrAIOtQIG" "8XYA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 160, 160, 320, 0xff652e89, 32, "ujEBngECnQEDnQEEmwEFmgEHmQEHmAEIlwEKlgEKlQELlAENkwENkgEOkQEQjwERjwESjQETjAEU" "jAEKAQqKAQoCCokBCgMKiQEKBAqHAQoFCoYBCgYKhgEKBwqEAQoICoMBCgkKgwEKCgqBAQoLCoAB" @@ -3836,7 +3836,7 @@ static void test_draw_geometry(void) "ChcKdQoWCncKFAp4ChQKeAoTCnoKEQp7ChALewoQCn0KDgp+Cg0LfgoNCoABCgsKgQEKCgqDAQoJ" "CoMBCggKhAEKBwqGAQoGCoYBCgUKhwEKBAqJAQoDCokBCgIKigEKAQqMARSMARONARKPARGPARCR" "AQ6SAQ2TAQ2UAQuVAQqWAQqXAQiYAQeZAQeaAQWbAQSdAQOdAQKeAQG6MQAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 160, 320, 320, 0xff652e89, 64, "82ICvQIEugIHuAIJtgIKtAINsgIPsAIRrQITrAIVqQIYpwIZpgIbowIeoQIgnwIhnQIkmwImmAIp" "lgIVARSVAhUDFJICFQUVkAIVBxSPAhUJFIwCFQwUigIVDRWHAhYPFIYCFRIUhAIVFBSBAhUWFf8B"

1 0

Guillaume Charifi : wined3d: Add support for BC5_SNORM format.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 82c25ce5b0fbf9b3786b0908c90c0e81a82c3c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c25ce5b0fbf9b3786b0908c… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Feb 2 19:29:21 2017 +0100 wined3d: Add support for BC5_SNORM format. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ca9d310..c40a339 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -266,6 +266,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, + {WINED3DFMT_BC5_SNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC6H_UF16, WINED3DFMT_BC6H_TYPELESS, ""}, {WINED3DFMT_BC6H_SF16, WINED3DFMT_BC6H_TYPELESS, ""}, {WINED3DFMT_BC7_UNORM_SRGB, WINED3DFMT_BC7_TYPELESS, ""}, @@ -353,6 +354,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, + {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE}, {WINED3DFMT_BC6H_SF16, 4, 4, 16, TRUE}, {WINED3DFMT_BC7_UNORM, 4, 4, 16, TRUE}, @@ -1153,6 +1155,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC5_SNORM, GL_COMPRESSED_SIGNED_RG_RGTC2, GL_COMPRESSED_SIGNED_RG_RGTC2, 0, + GL_RG, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC6H_UF16, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, 0, GL_RGB, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -3356,6 +3363,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC5_SNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count)

1 0

Józef Kucia : d3d11: Fix TRACE message in d3d_query_create().
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 7940e4ec5272684f906e56e3dadabce96f3da7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7940e4ec5272684f906e56e3d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:42 2017 +0100 d3d11: Fix TRACE message in d3d_query_create(). 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/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 93f428e..dadd210 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -452,7 +452,7 @@ HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc return hr; } - TRACE("Created predicate %p.\n", object); + TRACE("Created query %p.\n", object); *query = object; return S_OK;

1 0

Józef Kucia : d3d9/tests: Extend queries tests.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: cde106d2257cf94ccc6d000e5d702f7bffb7fed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde106d2257cf94ccc6d000e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:43 2017 +0100 d3d9/tests: Extend queries tests. 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/d3d9/tests/device.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 14a9cc1..28bc2ec 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5593,10 +5593,13 @@ static void test_occlusion_query(void) data_size = IDirect3DQuery9_GetDataSize(query); ok(data_size == sizeof(DWORD), "Unexpected data size %u.\n", data_size); + memset(&data, 0xff, sizeof(data)); hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(query, &data, data_size, D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data.dword[0] == 0xdddddddd && data.dword[1] == 0xffffffff, + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -5648,7 +5651,7 @@ static void test_occlusion_query(void) ok(data.word[0] == expected.word[0], "Occlusion query returned an unexpected result (0x%.8x).\n", data.dword[0]); ok(data.word[1] == 0xffff, - "data was modified outside of the expected size (0x%.8x).\n", data.dword[0]); + "Data was modified outside of the expected size (0x%.8x).\n", data.dword[0]); memset(&data, 0xf0, sizeof(data)); hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); @@ -5802,11 +5805,31 @@ static void test_timestamp_query(void) data_size = IDirect3DQuery9_GetDataSize(freq_query); ok(data_size == sizeof(UINT64), "Query data size is %u, 8 expected.\n", data_size); + memset(freq, 0xff, sizeof(freq)); + hr = IDirect3DQuery9_GetData(freq_query, NULL, 0, D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(freq_query, freq, sizeof(DWORD), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(freq[0] == 0xdddddddd && freq[1] == 0xffffffff, + "Got unexpected query result 0x%08x%08x.\n", freq[1], freq[0]); + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPDISJOINT, &disjoint_query); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); data_size = IDirect3DQuery9_GetDataSize(disjoint_query); ok(data_size == sizeof(BOOL), "Query data size is %u, 4 expected.\n", data_size); + memset(disjoint, 0xff, sizeof(disjoint)); + hr = IDirect3DQuery9_GetData(disjoint_query, NULL, 0, D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(disjoint_query, &disjoint, sizeof(WORD), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(disjoint[0] == 0xdddd && disjoint[1] == 0xffff, + "Got unexpected query result 0x%08x%08x.\n", disjoint[1], disjoint[0]); + hr = IDirect3DQuery9_GetData(disjoint_query, &disjoint, sizeof(DWORD), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(disjoint[0] == 0xdddd && disjoint[1] == 0xdddd, + "Got unexpected query result 0x%08x%08x.\n", disjoint[1], disjoint[0]); + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMP, &query); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); data_size = IDirect3DQuery9_GetDataSize(query); @@ -5826,16 +5849,23 @@ static void test_timestamp_query(void) hr = IDirect3DQuery9_GetData(freq_query, freq, sizeof(DWORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(freq[1] == 0xffffffff, - "freq was modified outside of the expected size (0x%.8x).\n", freq[1]); + "Freq was modified outside of the expected size (0x%.8x).\n", freq[1]); hr = IDirect3DQuery9_GetData(freq_query, &freq, sizeof(freq), D3DGETDATA_FLUSH); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(freq[1] != 0xffffffff, "high bytes of freq were not modified (0x%.8x).\n", + ok(freq[1] != 0xffffffff, "High bytes of freq were not modified (0x%.8x).\n", freq[1]); + memset(timestamp, 0xff, sizeof(timestamp)); hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(DWORD), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xffffffff, + "Got unexpected query result 0x%08x%08x.\n", timestamp[1], timestamp[0]); hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xdddddddd, + "Got unexpected query result 0x%08x%08x.\n", timestamp[1], timestamp[0]); hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -5870,7 +5900,7 @@ static void test_timestamp_query(void) hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(DWORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(timestamp[1] == 0xffffffff, - "timestamp was modified outside of the expected size (0x%.8x).\n", + "Timestamp was modified outside of the expected size (0x%.8x).\n", timestamp[1]); hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); @@ -5894,10 +5924,10 @@ static void test_timestamp_query(void) hr = IDirect3DQuery9_GetData(disjoint_query, disjoint, sizeof(WORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(disjoint[1] == 0xffff, - "disjoint was modified outside of the expected size (0x%.4hx).\n", disjoint[1]); + "Disjoint was modified outside of the expected size (0x%.4hx).\n", disjoint[1]); hr = IDirect3DQuery9_GetData(disjoint_query, disjoint, sizeof(disjoint), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(disjoint[1] != 0xffff, "high bytes of disjoint were not modified (0x%.4hx).\n", disjoint[1]); + ok(disjoint[1] != 0xffff, "High bytes of disjoint were not modified (0x%.4hx).\n", disjoint[1]); /* It's not strictly necessary for the TIMESTAMP query to be inside * a TIMESTAMP_DISJOINT query. */

1 0

Józef Kucia : d3d11/tests: Extend queries tests.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 7e024ea9b010aa3c7ec13478eb8b58c3f382b8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e024ea9b010aa3c7ec13478e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:44 2017 +0100 d3d11/tests: Extend queries tests. 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b4f4eef..c63a6d9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4733,10 +4733,13 @@ static void test_occlusion_query(void) data_size = ID3D11Asynchronous_GetDataSize(query); ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + memset(&data, 0xff, sizeof(data)); hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); ID3D11DeviceContext_End(context, query); ID3D11DeviceContext_Begin(context, query); @@ -4897,8 +4900,27 @@ static void test_timestamp_query(void) data_size = ID3D11Asynchronous_GetDataSize(timestamp_disjoint_query); ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xdeadbeef; + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); + todo_wine ok(disjoint.Disjoint == 0xdeadbeef, "Disjoint data was modified.\n"); + /* Test a TIMESTAMP_DISJOINT query. */ ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xdeadbeef; + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); + ok(disjoint.Disjoint == 0xdeadbeef, "Disjoint data was modified.\n"); + ID3D11DeviceContext_End(context, timestamp_disjoint_query); for (i = 0; i < 500; ++i) { @@ -4937,16 +4959,20 @@ static void test_timestamp_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); + memset(&timestamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0); todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); + memset(&timestamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); draw_color_quad(&test_context, &red);

1 0

Józef Kucia : d3d10core/tests: Extend queries tests.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: dcd7d336e41453fb84251fc15c4f05efae2f362b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd7d336e41453fb84251fc15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:45 2017 +0100 d3d10core/tests: Extend queries tests. 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7d75487..173d59a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3890,8 +3890,19 @@ static void test_timestamp_query(void) data_size = ID3D10Query_GetDataSize(timestamp_disjoint_query); ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); + hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + /* Test a TIMESTAMP_DISJOINT query. */ ID3D10Query_Begin(timestamp_disjoint_query); + + hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ID3D10Query_End(timestamp_disjoint_query); for (i = 0; i < 500; ++i) {

1 0

Józef Kucia : wined3d: Return WINED3DERR_INVALIDCALL for not started queries.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 8d6af6d9326704130a91e19e6010cfac93238331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6af6d9326704130a91e19e6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:46 2017 +0100 wined3d: Return WINED3DERR_INVALIDCALL for not started queries. 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 | 14 +++++++------- dlls/d3d11/async.c | 2 ++ dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 24 ++++++++++++------------ dlls/d3d9/query.c | 2 ++ dlls/wined3d/query.c | 6 +++++- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 173d59a..f9a93f2 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3732,9 +3732,9 @@ static void test_occlusion_query(void) ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ID3D10Asynchronous_End(query); ID3D10Asynchronous_Begin(query); @@ -3891,9 +3891,9 @@ static void test_timestamp_query(void) ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Test a TIMESTAMP_DISJOINT query. */ ID3D10Query_Begin(timestamp_disjoint_query); @@ -3941,15 +3941,15 @@ static void test_timestamp_query(void) ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ ID3D10Query_Begin(timestamp_disjoint_query); hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); draw_color_quad(&test_context, &red); diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index dadd210..2270023 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -307,6 +307,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d if (!data_size || wined3d_query_get_data_size(query->wined3d_query) == data_size) { hr = wined3d_query_get_data(query->wined3d_query, data, data_size, wined3d_flags); + if (hr == WINED3DERR_INVALIDCALL) + hr = DXGI_ERROR_INVALID_CALL; } else { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 064d754..85f84fe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -536,6 +536,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceCon if (!data_size || wined3d_query_get_data_size(query->wined3d_query) == data_size) { hr = wined3d_query_get_data(query->wined3d_query, data, data_size, wined3d_flags); + if (hr == WINED3DERR_INVALIDCALL) + hr = DXGI_ERROR_INVALID_CALL; } else { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c63a6d9..abd78c5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4735,10 +4735,10 @@ static void test_occlusion_query(void) memset(&data, 0xff, sizeof(data)); hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); ID3D11DeviceContext_End(context, query); @@ -4903,11 +4903,11 @@ static void test_timestamp_query(void) disjoint.Frequency = 0xdeadbeef; disjoint.Disjoint = 0xdeadbeef; hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); - todo_wine ok(disjoint.Disjoint == 0xdeadbeef, "Disjoint data was modified.\n"); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); + ok(disjoint.Disjoint == 0xdeadbeef, "Disjoint data was modified.\n"); /* Test a TIMESTAMP_DISJOINT query. */ ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); @@ -4961,18 +4961,18 @@ static void test_timestamp_query(void) memset(&timestamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); memset(&timestamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); draw_color_quad(&test_context, &red); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index d41783a..ba66058 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -167,6 +167,8 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO } wined3d_mutex_unlock(); + if (hr == D3DERR_INVALIDCALL) + return S_OK; return hr; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9f75a49..ef88f65 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -330,8 +330,12 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, } if (query->state == QUERY_CREATED) + { WARN("Query wasn't started yet.\n"); - else if (!query->query_ops->query_poll(query, flags)) + return WINED3DERR_INVALIDCALL; + } + + if (!query->query_ops->query_poll(query, flags)) return S_FALSE; if (data)

1 0

Józef Kucia : d3d9: Fix query result data for not started queries.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 6b6c6069ed86e5c1e91ee2e6ab83f6a65178198f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6c6069ed86e5c1e91ee2e6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:47 2017 +0100 d3d9: Fix query result data for not started queries. 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/d3d9/query.c | 11 ++++++++++- dlls/d3d9/tests/device.c | 16 ++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index ba66058..e4f84c3 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -159,7 +159,8 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO size = sizeof(data_disjoint.disjoint); hr = wined3d_query_get_data(query->wined3d_query, &data_disjoint, sizeof(data_disjoint), flags); - memcpy(data, &data_disjoint.disjoint, size); + if (SUCCEEDED(hr)) + memcpy(data, &data_disjoint.disjoint, size); } else { @@ -168,7 +169,15 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO wined3d_mutex_unlock(); if (hr == D3DERR_INVALIDCALL) + { + if (data) + { + DWORD data_size = d3d9_query_GetDataSize(iface); + memset(data, 0, size); + memset(data, 0xdd, min(size, data_size)); + } return S_OK; + } return hr; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 28bc2ec..e776515 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5598,7 +5598,7 @@ static void test_occlusion_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(query, &data, data_size, D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data.dword[0] == 0xdddddddd && data.dword[1] == 0xffffffff, + ok(data.dword[0] == 0xdddddddd && data.dword[1] == 0xffffffff, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); @@ -5810,7 +5810,7 @@ static void test_timestamp_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(freq_query, freq, sizeof(DWORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(freq[0] == 0xdddddddd && freq[1] == 0xffffffff, + ok(freq[0] == 0xdddddddd && freq[1] == 0xffffffff, "Got unexpected query result 0x%08x%08x.\n", freq[1], freq[0]); hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPDISJOINT, &disjoint_query); @@ -5823,12 +5823,12 @@ static void test_timestamp_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(disjoint_query, &disjoint, sizeof(WORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(disjoint[0] == 0xdddd && disjoint[1] == 0xffff, - "Got unexpected query result 0x%08x%08x.\n", disjoint[1], disjoint[0]); + ok(disjoint[0] == 0xdddd && disjoint[1] == 0xffff, + "Got unexpected query result 0x%04x%04x.\n", disjoint[1], disjoint[0]); hr = IDirect3DQuery9_GetData(disjoint_query, &disjoint, sizeof(DWORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(disjoint[0] == 0xdddd && disjoint[1] == 0xdddd, - "Got unexpected query result 0x%08x%08x.\n", disjoint[1], disjoint[0]); + ok(disjoint[0] == 0xdddd && disjoint[1] == 0xdddd, + "Got unexpected query result 0x%04x%04x.\n", disjoint[1], disjoint[0]); hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMP, &query); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -5860,11 +5860,11 @@ static void test_timestamp_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(DWORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xffffffff, + ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xffffffff, "Got unexpected query result 0x%08x%08x.\n", timestamp[1], timestamp[0]); hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xdddddddd, + ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xdddddddd, "Got unexpected query result 0x%08x%08x.\n", timestamp[1], timestamp[0]); hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_END);

1 0

Józef Kucia : d3d9: Store query data size in " d3d9_query".
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 78a945e7bf9216610ec60b381e8ba91c08d56e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a945e7bf9216610ec60b381… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:48 2017 +0100 d3d9: Store query data size in "d3d9_query". 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/d3d9/d3d9_private.h | 1 + dlls/d3d9/query.c | 30 ++++++++++++------------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index fef0133..c8558e7 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -341,6 +341,7 @@ struct d3d9_query LONG refcount; struct wined3d_query *wined3d_query; IDirect3DDevice9Ex *parent_device; + DWORD data_size; }; HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index e4f84c3..9179260 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -108,22 +108,10 @@ static D3DQUERYTYPE WINAPI d3d9_query_GetType(IDirect3DQuery9 *iface) static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface) { struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); - enum wined3d_query_type type; - DWORD ret; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_query_get_type(query->wined3d_query); - if (type == WINED3D_QUERY_TYPE_OCCLUSION) - ret = sizeof(DWORD); - else if (type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT) - ret = sizeof(BOOL); - else - ret = wined3d_query_get_data_size(query->wined3d_query); - wined3d_mutex_unlock(); - - return ret; + return query->data_size; } static HRESULT WINAPI d3d9_query_Issue(IDirect3DQuery9 *iface, DWORD flags) @@ -172,9 +160,8 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO { if (data) { - DWORD data_size = d3d9_query_GetDataSize(iface); memset(data, 0, size); - memset(data, 0xdd, min(size, data_size)); + memset(data, 0xdd, min(size, query->data_size)); } return S_OK; } @@ -202,14 +189,21 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER query->refcount = 1; wined3d_mutex_lock(); - hr = wined3d_query_create(device->wined3d_device, type, query, &query->wined3d_query); - wined3d_mutex_unlock(); - if (FAILED(hr)) + if (FAILED(hr = wined3d_query_create(device->wined3d_device, type, query, &query->wined3d_query))) { + wined3d_mutex_unlock(); WARN("Failed to create wined3d query, hr %#x.\n", hr); return hr; } + if (type == D3DQUERYTYPE_OCCLUSION) + query->data_size = sizeof(DWORD); + else if (type == D3DQUERYTYPE_TIMESTAMPDISJOINT) + query->data_size = sizeof(BOOL); + else + query->data_size = wined3d_query_get_data_size(query->wined3d_query); + wined3d_mutex_unlock(); + query->parent_device = &device->IDirect3DDevice9Ex_iface; IDirect3DDevice9Ex_AddRef(query->parent_device);

1 0

Józef Kucia : wined3d: Set "last_was_blit" unconditionally in context_apply_clear_state().
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 5188edacb2458abcb00bf48a2c64da8c88b8ba8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5188edacb2458abcb00bf48a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:49 2017 +0100 wined3d: Set "last_was_blit" unconditionally in context_apply_clear_state(). 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 238ae31..c141d70 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2695,8 +2695,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win context_check_fbo_status(context, GL_FRAMEBUFFER); } - if (context->last_was_blit) - context->last_was_blit = FALSE; + context->last_was_blit = FALSE; /* Blending and clearing should be orthogonal, but tests on the nvidia * driver show that disabling blending when clearing improves the clearing

1 0