September 2018 - Wine-commits

Józef Kucia : tests: Add test for blend factor.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: vkd3d Branch: master Commit: d18d700750660d56c7c342af74451b52c59a98a4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d18d700750660d56c7c342a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:40 2018 +0200 tests: Add test for blend factor. 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> --- tests/d3d12.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0528ceb..c40ce12 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19970,7 +19970,6 @@ static void test_resource_allocation_info(void) } } - refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } @@ -20134,6 +20133,73 @@ static void test_command_list_initial_pipeline_state(void) destroy_test_context(&context); } +static void test_blend_factor(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int i; + HRESULT hr; + + static const struct + { + float blend_factor[4]; + unsigned int expected_color; + } + tests[] = + { + {{0.0f, 0.0f, 0.0f, 0.0f}, 0xffffffff}, + {{0.0f, 1.0f, 0.0f, 1.0f}, 0xffffffff}, + {{0.5f, 0.5f, 0.5f, 0.5f}, 0xff80ff80}, + {{1.0f, 1.0f, 1.0f, 1.0f}, 0xff00ff00}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, NULL); + pso_desc.BlendState.RenderTarget[0].BlendEnable = TRUE; + pso_desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_BLEND_FACTOR; + pso_desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_INV_BLEND_FACTOR; + pso_desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + pso_desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_BLEND_FACTOR; + pso_desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_INV_BLEND_FACTOR; + pso_desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_OMSetBlendFactor(command_list, tests[i].blend_factor); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 1); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -20255,4 +20321,5 @@ START_TEST(d3d12) run_test(test_resource_allocation_info); run_test(test_suballocate_small_textures); run_test(test_command_list_initial_pipeline_state); + run_test(test_blend_factor); }

1 0

Józef Kucia : include: Synchronize d3d12.idl with Wine.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: vkd3d Branch: master Commit: 1cf49c2e0eec44a98d3ad208c94bea0a6eb03c7d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1cf49c2e0eec44a98d3ad20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:41 2018 +0200 include: Synchronize d3d12.idl with Wine. 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> --- include/vkd3d_d3d12.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 4b967d4..d647b48 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2213,7 +2213,12 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device); + [local] HRESULT __stdcall D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device); +typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **debug); + [local] HRESULT __stdcall D3D12GetDebugInterface(REFIID iid, void **debug);

1 0

Józef Kucia : vkd3d: Add requirements for maxPerStageDescriptorUniformBuffers.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: vkd3d Branch: master Commit: 6f733646340334f6c75e4cc62cf2bd36842e7cf6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6f733646340334f6c75e4cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:42 2018 +0200 vkd3d: Add requirements for maxPerStageDescriptorUniformBuffers. 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> --- include/vkd3d_d3d12.idl | 2 ++ libs/vkd3d/device.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index d647b48..29f4ab3 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -30,6 +30,8 @@ const UINT D3D12_MAX_ROOT_COST = 64; const UINT D3D12_VIEWPORT_BOUNDS_MAX = 32767; const UINT D3D12_VIEWPORT_BOUNDS_MIN = -32768; +const UINT D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT = 15; + const UINT D3D12_APPEND_ALIGNED_ELEMENT = 0xffffffff; cpp_quote("#define D3D12_DEFAULT_BLEND_FACTOR_ALPHA (1.0f)") cpp_quote("#define D3D12_DEFAULT_BLEND_FACTOR_BLUE (1.0f)") diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3a9dad0..69b6a30 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -777,10 +777,14 @@ static void vkd3d_check_feature_level_11_requirements(const VkPhysicalDeviceLimi CHECK_MIN_REQUIREMENT(maxPushConstantsSize, D3D12_MAX_ROOT_COST * sizeof(uint32_t)); CHECK_MIN_REQUIREMENT(maxComputeSharedMemorySize, D3D12_CS_TGSM_REGISTER_COUNT * sizeof(uint32_t)); + CHECK_MAX_REQUIREMENT(viewportBoundsRange[0], D3D12_VIEWPORT_BOUNDS_MIN); CHECK_MIN_REQUIREMENT(viewportBoundsRange[1], D3D12_VIEWPORT_BOUNDS_MAX); CHECK_MIN_REQUIREMENT(viewportSubPixelBits, 8); + CHECK_MIN_REQUIREMENT(maxPerStageDescriptorUniformBuffers, + D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT); + CHECK_FEATURE(imageCubeArray); CHECK_FEATURE(independentBlend); CHECK_FEATURE(geometryShader);

1 0

Józef Kucia : vkd3d: Fix potential memory leak in vkd3d_create_vk_device().
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: vkd3d Branch: master Commit: f1c967ab38e621de35136c457fd642aed8cee1c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1c967ab38e621de35136c4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:43 2018 +0200 vkd3d: Fix potential memory leak in vkd3d_create_vk_device(). 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> --- libs/vkd3d/device.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 69b6a30..673c54a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1025,7 +1025,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (!(queue_info = vkd3d_calloc(queue_family_count, sizeof(*queue_info)))) { hr = E_OUTOFMEMORY; - goto fail; + goto done; } direct_queue_family_index = ~0u; @@ -1062,13 +1062,13 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, { FIXME("Could not find a suitable queue family for a direct command queue.\n"); hr = E_FAIL; - goto fail; + goto done; } if (copy_queue_family_index == ~0u) { FIXME("Could not find a suitable queue family for a copy command queue.\n"); hr = E_FAIL; - goto fail; + goto done; } if (compute_queue_family_index == ~0u) { @@ -1085,12 +1085,12 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); device->vk_physical_device = physical_device; if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) - goto fail; + goto done; if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { hr = E_OUTOFMEMORY; - goto fail; + goto done; } /* Create device */ @@ -1114,7 +1114,8 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (vr < 0) { ERR("Failed to create Vulkan device, vr %d.\n", vr); - return hresult_from_vk_result(vr); + hr = hresult_from_vk_result(vr); + goto done; } if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device))) @@ -1122,7 +1123,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, ERR("Failed to load device procs, hr %#x.\n", hr); if (device->vk_procs.vkDestroyDevice) device->vk_procs.vkDestroyDevice(vk_device, NULL); - goto fail; + goto done; } device->vk_device = vk_device; @@ -1132,12 +1133,12 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, { ERR("Failed to create queues, hr %#x.\n", hr); device->vk_procs.vkDestroyDevice(vk_device, NULL); - goto fail; + goto done; } TRACE("Created Vulkan device %p.\n", vk_device); -fail: +done: if (queue_properties) vkd3d_free(queue_properties); if (queue_info)

1 0

Francois Gouget : testbot/Build: Only rebuild impacted test executables.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: tools Branch: master Commit: 13b353545365275866245e10865b32a96ff9762c URL: https://source.winehq.org/git/tools.git/?a=commit;h=13b353545365275866245e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 28 02:47:45 2018 +0200 testbot/Build: Only rebuild impacted test executables. If a patch impacts a module but not its tests, don't try to rebuild the corresponding test executable. This fixes build failures when the module does not have tests in the first place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 1287f6d..54b1aea 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -78,6 +78,7 @@ sub BuildTestExecutables($$$) my (@BuildDirs, @TestExes); foreach my $TestInfo (values %{$Impacts->{Tests}}) { + next if (!$TestInfo->{UnitCount}); push @BuildDirs, $TestInfo->{Path}; my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; push @TestExes, $TestExe;

1 0

Hans Leidekker : msi/tests: SQLGetInstalledDrivers fails if there are no ODBC drivers installed.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 1be65cbb46bf792773a5aabc550851ed51f727cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be65cbb46bf792773a5aabc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 27 15:00:30 2018 +0200 msi/tests: SQLGetInstalledDrivers fails if there are no ODBC drivers installed. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index cd6cb0c..c7ce4d2 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1424,9 +1424,10 @@ UINT WINAPI odbc_present(MSIHANDLE hinst) WORD len; BOOL r; + buffer[0] = 0; + len = sizeof(buffer); r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); - ok(hinst, len < sizeof(buffer), "buffer too small\n"); - ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + if (r) ok(hinst, len < sizeof(buffer), "buffer too small\n"); for (p = buffer; *p; p += strlen(p) + 1) { if (!strcmp(p, "ODBC test driver")) @@ -1446,9 +1447,10 @@ UINT WINAPI odbc_absent(MSIHANDLE hinst) WORD len; BOOL r; + buffer[0] = 0; + len = sizeof(buffer); r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); - ok(hinst, len < sizeof(buffer), "buffer too small\n"); - ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + if (r) ok(hinst, len < sizeof(buffer), "buffer too small\n"); for (p = buffer; *p; p += strlen(p) + 1) { if (!strcmp(p, "ODBC test driver"))

1 0

Hans Leidekker : msi: Add support for ARPNOMODIFY, APRNOREMOVE and ARPNOREPAIR.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 78af6e341fcdf1030bb5b0a4bed4b32e5caf09a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78af6e341fcdf1030bb5b0a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 27 15:00:31 2018 +0200 msi: Add support for ARPNOMODIFY, APRNOREMOVE and ARPNOREPAIR. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 66 ++++++++++++++++++++++++++++++++++++------------- dlls/msi/tests/action.c | 51 +++++++++++++++++++++++--------------- 2 files changed, 80 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78af6e341fcdf1030bb5…

1 0

Nikolay Sivov : crypt32: Add CRYPT_STRING_BINARY mode for CryptBinaryToStringW().
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: 71f3a2251991b03e9e6afea5899f08d627422d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f3a2251991b03e9e6afea5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 17:27:56 2018 +0300 crypt32: Add CRYPT_STRING_BINARY mode for CryptBinaryToStringW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 27 ++++++++++++++++++++++++--- dlls/crypt32/tests/base64.c | 5 +---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index ac288b7..d158c1a 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -88,8 +88,7 @@ static BOOL EncodeBinaryToBinaryA(const BYTE *pbBinary, memcpy(pszString, pbBinary, cbBinary); } else - - *pcchString = cbBinary; + *pcchString = cbBinary; return ret; } @@ -294,6 +293,26 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, return encoder(pbBinary, cbBinary, dwFlags, pszString, pcchString); } +static BOOL EncodeBinaryToBinaryW(const BYTE *in_buf, DWORD in_len, DWORD flags, WCHAR *out_buf, DWORD *out_len) +{ + BOOL ret = TRUE; + + if (out_buf) + { + if (*out_len < in_len) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else if (in_len) + memcpy(out_buf, in_buf, in_len); + } + else + *out_len = in_len; + + return ret; +} + static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, WCHAR* out_buf, DWORD *out_len) { @@ -472,13 +491,15 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, switch (dwFlags & 0x0fffffff) { + case CRYPT_STRING_BINARY: + encoder = EncodeBinaryToBinaryW; + break; case CRYPT_STRING_BASE64: case CRYPT_STRING_BASE64HEADER: case CRYPT_STRING_BASE64REQUESTHEADER: case CRYPT_STRING_BASE64X509CRLHEADER: encoder = BinaryToBase64W; break; - case CRYPT_STRING_BINARY: case CRYPT_STRING_HEX: case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index e6adc7a..4ff7627 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -284,17 +284,14 @@ static void test_CryptBinaryToString(void) strLen = 0; ret = CryptBinaryToStringW(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, NULL, &strLen); - todo_wine { ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); ok(strLen == tests[i].toEncodeLen, "Unexpected required length %u.\n", strLen); - } + strLen2 = strLen; strW = heap_alloc(strLen); ret = CryptBinaryToStringW(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, strW, &strLen2); - todo_wine ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); ok(strLen == strLen2, "Expected length %u, got %u\n", strLen, strLen2); - todo_wine ok(!memcmp(strW, tests[i].toEncode, tests[i].toEncodeLen), "Unexpected value\n"); heap_free(strW);

1 0

Henri Verbeet : wined3d: Do not create DCs for all textures on WINED3D_NO3D adapters.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: a6d640e8669fe3d3305ecbf0f820cdbb9a852cd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d640e8669fe3d3305ecbf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 27 19:18:33 2018 +0330 wined3d: Do not create DCs for all textures on WINED3D_NO3D adapters. WINED3DFMT_D16_UNORM for example doesn't have a corresponding ddi_format. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 3 ++- dlls/wined3d/swapchain.c | 4 ++++ dlls/wined3d/texture.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6cb1ac4..9df0a09 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -39,7 +39,8 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_SCRATCH | WINED3DUSAGE_PRIVATE | WINED3DUSAGE_LEGACY_CUBEMAP - | WINED3DUSAGE_TEXTURE; + | WINED3DUSAGE_TEXTURE + | ~WINED3DUSAGE_MASK; /* WINED3DUSAGE_WRITEONLY is supposed to result in write-combined mappings * being returned. OpenGL doesn't give us explicit control over that, but diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8200bdd..b068cf1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -834,6 +834,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.multisample_type = swapchain->desc.multisample_type; texture_desc.multisample_quality = swapchain->desc.multisample_quality; texture_desc.usage = 0; + if (device->wined3d->flags & WINED3D_NO3D) + texture_desc.usage |= WINED3DUSAGE_OWNDC; texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; texture_desc.width = swapchain->desc.backbuffer_width; texture_desc.height = swapchain->desc.backbuffer_height; @@ -915,6 +917,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } texture_desc.usage = swapchain->desc.backbuffer_usage; + if (device->wined3d->flags & WINED3D_NO3D) + texture_desc.usage |= WINED3DUSAGE_OWNDC; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c0bdddc..9589e49 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2896,7 +2896,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc TRACE("Created sub-resource %u (level %u, layer %u).\n", i, i % texture->level_count, i / texture->level_count); - if ((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) + if (desc->usage & WINED3DUSAGE_OWNDC) { struct wined3d_texture_idx texture_idx = {texture, i}; @@ -3515,7 +3515,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign return WINED3DERR_INVALIDCALL; } - if (!(texture->resource.usage & WINED3DUSAGE_OWNDC) && !(device->wined3d->flags & WINED3D_NO3D)) + if (!(texture->resource.usage & WINED3DUSAGE_OWNDC)) { struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx};

1 0

Henri Verbeet : ddraw: Only do asynchronous clears when the application asked for them.
by Alexandre Julliard 27 Sep '18

27 Sep '18

Module: wine Branch: master Commit: fbcdf8c6984066c4a0d09af054ca8342eecb3359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbcdf8c6984066c4a0d09af0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 27 19:18:34 2018 +0330 ddraw: Only do asynchronous clears when the application asked for them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 12 ++++++++++-- dlls/wined3d/cs.c | 2 ++ include/wine/wined3d.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fc120e3..d201d9d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1458,24 +1458,32 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * if (flags & DDBLT_COLORFILL) { + wined3d_flags = WINED3DCLEAR_TARGET; + if (!(flags & DDBLT_ASYNC)) + wined3d_flags |= WINED3DCLEAR_SYNCHRONOUS; + if (!wined3d_colour_from_ddraw_colour(&dst_surface->surface_desc.u4.ddpfPixelFormat, dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), - dst_rect, WINED3DCLEAR_TARGET, &colour, 0.0f, 0); + dst_rect, wined3d_flags, &colour, 0.0f, 0); } if (flags & DDBLT_DEPTHFILL) { + wined3d_flags = WINED3DCLEAR_ZBUFFER; + if (!(flags & DDBLT_ASYNC)) + wined3d_flags |= WINED3DCLEAR_SYNCHRONOUS; + if (!wined3d_colour_from_ddraw_colour(&dst_surface->surface_desc.u4.ddpfPixelFormat, dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), - dst_rect, WINED3DCLEAR_ZBUFFER, NULL, colour.r, 0); + dst_rect, wined3d_flags, NULL, colour.r, 0); } wined3d_flags = flags & ~DDBLT_ASYNC; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ecfce41..ff4d562 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -671,6 +671,8 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined wined3d_resource_acquire(view->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + if (flags & WINED3DCLEAR_SYNCHRONOUS) + cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); } static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index dc613ff..e2e6a72 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1015,6 +1015,7 @@ enum wined3d_shader_type #define WINED3DCLEAR_TARGET 0x00000001 #define WINED3DCLEAR_ZBUFFER 0x00000002 #define WINED3DCLEAR_STENCIL 0x00000004 +#define WINED3DCLEAR_SYNCHRONOUS 0x80000000 /* Stream source flags */ #define WINED3DSTREAMSOURCE_INDEXEDDATA (1u << 30)

1 0