February 2021 - Wine-commits

Zebediah Figura : vkd3d-shader: Return void from hlsl_pop_scope().
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: vkd3d Branch: master Commit: aa52cb10b4013769f76a68ef81ed0865005fb258 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa52cb10b4013769f76a68e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 16:11:16 2021 -0600 vkd3d-shader: Return void from hlsl_pop_scope(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 6 ++---- libs/vkd3d-shader/hlsl.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ddc690e..4a8cf69 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -537,15 +537,13 @@ void hlsl_push_scope(struct hlsl_parse_ctx *ctx) list_add_tail(&ctx->scopes, &new_scope->entry); } -BOOL hlsl_pop_scope(struct hlsl_parse_ctx *ctx) +void hlsl_pop_scope(struct hlsl_parse_ctx *ctx) { struct hlsl_scope *prev_scope = ctx->cur_scope->upper; - if (!prev_scope) - return FALSE; + assert(prev_scope); TRACE("Popping current scope.\n"); ctx->cur_scope = prev_scope; - return TRUE; } static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 138ab4e..656698b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -646,7 +646,7 @@ void hlsl_report_message(const struct source_location loc, enum hlsl_error_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(3,4) DECLSPEC_HIDDEN; void hlsl_push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; -BOOL hlsl_pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; +void hlsl_pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_type_clone(struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; BOOL hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : vkd3d-shader: Replace BOOL with bool.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: vkd3d Branch: master Commit: c2c092b1431d5eea09c0116938dd4ce59b6f7ec4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c2c092b1431d5eea09c0116… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 16:11:17 2021 -0600 vkd3d-shader: Replace BOOL with bool. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 164 +++++++++++++++++++++++------------------------ libs/vkd3d-shader/hlsl.h | 18 +++--- libs/vkd3d-shader/hlsl.l | 2 +- libs/vkd3d-shader/hlsl.y | 154 ++++++++++++++++++++++---------------------- 4 files changed, 169 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c2c092b1431d5eea09c…

1 0

Zebediah Figura : vkd3d-shader: Implement global resource memory barriers.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: vkd3d Branch: master Commit: 16aceacc0c14244b405b53582a6acb57e8cf574f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16aceacc0c14244b405b535… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 3 21:09:17 2021 -0600 vkd3d-shader: Implement global resource memory barriers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 7 +++++++ libs/vkd3d-shader/trace.c | 5 +++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 13 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a997ec6..106c298 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8866,6 +8866,13 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, flags &= ~VKD3DSSF_THREAD_GROUP; } + if (flags & VKD3DSSF_GLOBAL_UAV) + { + memory_scope = SpvScopeDevice; + memory_semantics |= SpvMemorySemanticsImageMemoryMask; + flags &= ~VKD3DSSF_GLOBAL_UAV; + } + if (flags) { FIXME("Unhandled sync flags %#x.\n", flags); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index cab5b80..40b3e31 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -368,6 +368,11 @@ static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD g static void shader_dump_sync_flags(struct vkd3d_string_buffer *buffer, DWORD sync_flags) { + if (sync_flags & VKD3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "_uglobal"); + sync_flags &= ~VKD3DSSF_GLOBAL_UAV; + } if (sync_flags & VKD3DSSF_GROUP_SHARED_MEMORY) { shader_addline(buffer, "_g"); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 52196ca..01ad087 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -475,6 +475,7 @@ enum vkd3d_shader_sync_flags { VKD3DSSF_THREAD_GROUP = 0x1, VKD3DSSF_GROUP_SHARED_MEMORY = 0x2, + VKD3DSSF_GLOBAL_UAV = 0x8, }; enum vkd3d_shader_uav_flags

1 0

Francois Gouget : testbot: Fix the webpatches setup instructions.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: tools Branch: master Commit: 8fb57085db757d676acce6392bcc109da6e890e5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8fb57085db757d676acce63… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 02:08:30 2021 +0100 testbot: Fix the webpatches setup instructions. The webpatches directory should be created in the TestBot directory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 0dd5710..7565d6b 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -79,9 +79,8 @@ Setup for Wine's patches site: using the WineTestBot web interface and that the results are sane. You may also want to run with $PatchFromEMailOverride set for a while to spot any issue under load. -- In $HOME/tools/testbot/var, set up the webpatches symbolic link to point to - where the patches website stores its patches and test results. Typically: - ln -s $HOME/patches $HOME/tools/testbot/var/webpatches +- In $HOME/tools/testbot/var, create the webpatches directory: + mkdir $HOME/tools/testbot/var/webpatches - Use a cron job to run WinePatchesWebSubmit.pl periodically. For instance: */5 * * * * $HOME/tools/testbot/bin/WinePatchesWebSubmit.pl

1 0

Francois Gouget : patches: Fix the install instructions.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: tools Branch: master Commit: bb7a2682dcee8c02f1ec6dade240d865b88f9336 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bb7a2682dcee8c02f1ec6da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 02:08:36 2021 +0100 patches: Fix the install instructions. The webpatches directory belongs to the TestBot so grab it from there. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/doc/vhost_source.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf index 01c6dee..ce2334c 100644 --- a/patches/doc/vhost_source.conf +++ b/patches/doc/vhost_source.conf @@ -5,7 +5,14 @@ ServerName source.example.com ServerAdmin winehq(a)example.com + # Contains the emails: patches and replies from developers and the TestBot + Alias /patches/data /home/winehq/sites/testbot/var/webpatches + <Directory /home/winehq/opt/source> Require all granted </Directory> + + <Directory /home/winehq/tools/testbot/web/webpatches> + Require all granted + </Directory> </VirtualHost>

1 0

Francois Gouget : testbot/WineTest: Always work around explorer's 'fresh WINEPREFIX' bug.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: tools Branch: master Commit: b89f7fb79cf65d38b9df1f978fca987a8537717f URL: https://source.winehq.org/git/tools.git/?a=commit;h=b89f7fb79cf65d38b9df1f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 18:58:58 2021 +0100 testbot/WineTest: Always work around explorer's 'fresh WINEPREFIX' bug. WineTest.pl assumed that the wineprefix had been set up by WineReconfig so that pre-initializing it to work around explorer's 'fresh WINEPREFIX' bug (41713) was not necessary. But that's no longer true so make sure to always fully initialize the wineprefix before starting any test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48671 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 84ba1cb..dd41fcf 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -63,6 +63,18 @@ sub SetupTest($$) my $BaseName = SetupWineEnvironment($Mission); InfoMsg "\nRunning $Test in the $BaseName Wine\n"; InfoMsg "LANG=$ENV{LANG}\n"; + + if (!-d $ENV{WINEPREFIX}) + { + # FIXME Wait for the wineserver as a workaround for bug 41713. + my $ErrMessage = CreateWinePrefix($Mission, "wait"); + if (defined $ErrMessage) + { + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; + return 0; + } + } + return $BaseName; } @@ -70,10 +82,9 @@ sub WineTestSuite($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - my $BaseName = SetupTest("WineTest", $Mission); - # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. + my $BaseName = SetupTest("WineTest", $Mission); my $Tag = SanitizeTag("$BaseTag-$BaseName"); RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); @@ -128,20 +139,9 @@ sub TestPatch($$) return 1 if (!@TestList); } - my $BaseName = SetupTest("the tests", $Mission); - if (!-d $ENV{WINEPREFIX}) - { - # FIXME Wait for the wineserver as a workaround for bug 41713. - my $ErrMessage = CreateWinePrefix($Mission, "wait"); - if (defined $ErrMessage) - { - LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; - } - } - # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. + my $BaseName = SetupTest("the tests", $Mission); RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); @@ -177,18 +177,7 @@ sub TestExe($$$) my ($Mission, $FileName, $Args) = @_; my $BaseName = SetupTest("the tests", $Mission); - if (!-d $ENV{WINEPREFIX}) - { - # FIXME Wait for the wineserver as a workaround for bug 41713. - my $ErrMessage = CreateWinePrefix($Mission, "wait"); - if (defined $ErrMessage) - { - LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; - } - } - - my $TestDir = GetTestDir($Mission); + my $TestDir = GetTestDir($Mission); # needs $WINEPREFIX if ($TestDir eq ".") { $FileName = "$DataDir/staging/$FileName";

1 0

Nikolay Sivov : mfplat/allocator: Add support for MF_SA_BUFFERS_PER_SAMPLE.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: d2a30424ef64fd817a5cbfdac6943830c59489fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2a30424ef64fd817a5cbfda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:28:02 2021 +0300 mfplat/allocator: Add support for MF_SA_BUFFERS_PER_SAMPLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 4 +++- dlls/mfplat/tests/mfplat.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 8a0281abf6c..acdc8836cc8 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1355,12 +1355,15 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u { allocator->attributes = attributes; IMFAttributes_AddRef(allocator->attributes); + + IMFAttributes_GetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, &allocator->frame_desc.buffer_count); } allocator->frame_desc.d3d9_format = subtype.Data1; allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); allocator->frame_desc.width = frame_size >> 32; allocator->frame_desc.height = frame_size; + allocator->frame_desc.buffer_count = max(1, allocator->frame_desc.buffer_count); if (FAILED(hr = sample_allocator_get_surface_service(allocator, &service))) return hr; @@ -1673,7 +1676,6 @@ HRESULT WINAPI MFCreateVideoSampleAllocatorEx(REFIID riid, void **obj) object->IMFVideoSampleAllocatorCallback_iface.lpVtbl = &sample_allocator_callback_vtbl; object->tracking_callback.lpVtbl = &sample_allocator_tracking_callback_vtbl; object->refcount = 1; - object->frame_desc.buffer_count = 1; list_init(&object->used_samples); list_init(&object->free_samples); InitializeCriticalSection(&object->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ed862ab9bdb..deb9e78efba 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6439,6 +6439,9 @@ todo_wine hr = IMFAttributes_SetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, 2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + EXPECT_REF(attributes, 1); hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -6454,7 +6457,6 @@ todo_wine hr = IMFSample_GetBufferCount(sample, &buffer_count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(buffer_count == 2, "Unexpected buffer count %u.\n", buffer_count); hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample2);

1 0

Piotr Caban : msvcr120: Don't export thiscall functions on arm.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 9aa8ba68ddcd71687354db8036ca1bda9fe8ab0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aa8ba68ddcd71687354db80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 16:22:52 2021 +0100 msvcr120: Don't export thiscall functions on arm. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 24 ++++++++++++------------ dlls/msvcr120_app/msvcr120_app.spec | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9aa8ba68ddcd71687354…

1 0

Piotr Caban : concrt140: Add arm exports.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 2201ca08fb03d069fa2ccf46773c150a6f7988bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2201ca08fb03d069fa2ccf46… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 16:23:03 2021 +0100 concrt140: Add arm exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 259 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 233 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2201ca08fb03d069fa2c…

1 0

Rémi Bernon : d3d11/tests: Add tests for predicate state swap.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: f0352719582e5269c20d32e28239440e78611e67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0352719582e5269c20d32e2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:07 2021 +0100 d3d11/tests: Add tests for predicate state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5212776cc59..d7a49f4af3a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6797,9 +6797,11 @@ static void test_device_context_state(void) enum D3D_PRIMITIVE_TOPOLOGY topo; ID3D11ComputeShader *tmp_cs, *cs; D3D11_DEPTH_STENCIL_DESC ds_desc; + ID3D11Predicate *tmp_pred, *pred; ID3D11DomainShader *tmp_ds, *ds; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; + D3D11_QUERY_DESC predicate_desc; ID3D11Device1 *device, *device2; ID3D11InputLayout *il, *tmp_il; ID3D11PixelShader *tmp_ps, *ps; @@ -6814,6 +6816,7 @@ static void test_device_context_state(void) float blend_factor[4]; struct vec4 constant; DWORD data_size; + BOOL pred_value; ULONG refcount; char data[64]; HRESULT hr; @@ -7020,6 +7023,10 @@ static void test_device_context_state(void) vp.MinDepth = 0.f; vp.MaxDepth = 0.01f; + predicate_desc.Query = D3D11_QUERY_OCCLUSION_PREDICATE; + predicate_desc.MiscFlags = 0; + ID3D11Device1_CreatePredicate(device, &predicate_desc, &pred); + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); @@ -7067,6 +7074,7 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSSetState(context, rs); ID3D11DeviceContext1_SOSetTargets(context, 1, &sob, &so_offset); + ID3D11DeviceContext1_SetPredication(context, pred, TRUE); previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); @@ -7257,6 +7265,13 @@ static void test_device_context_state(void) todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + tmp_pred = (ID3D11Predicate *)0xdeadbeef; + pred_value = 0xdeadbeef; + ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); + todo_wine ok(!tmp_pred, "Got unexpected predicate %p.\n", tmp_pred); + if (tmp_pred) ID3D11Predicate_Release(tmp_pred); + todo_wine ok(!pred_value, "Got unexpected predicate value %d.\n", pred_value); + /* updating the device context should also update the device context state */ hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -7537,6 +7552,13 @@ static void test_device_context_state(void) ok(tmp_sob == sob, "Got stream output buffer %p, expected %p.\n", tmp_sob, sob); ID3D11Buffer_Release(tmp_sob); + tmp_pred = (ID3D11Predicate *)0xdeadbeef; + pred_value = 0xdeadbeef; + ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); + ok(tmp_pred == pred, "Got predicate %p, expected %p.\n", tmp_pred, pred); + ID3D11Predicate_Release(tmp_pred); + ok(pred_value == TRUE, "Got predicate value %#x, expected TRUE.\n", pred_value); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -7759,6 +7781,7 @@ static void test_device_context_state(void) ID3D11DeviceContext1_RSSetState(context, rs); ID3D11DeviceContext1_SOSetTargets(context, 1, &sob, &so_offset); + ID3D11DeviceContext1_SetPredication(context, pred, TRUE); tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; ID3D11DeviceContext1_RSGetState(context, &tmp_rs); @@ -7778,6 +7801,13 @@ static void test_device_context_state(void) todo_wine ok(!tmp_sob, "Got unexpected stream output buffer %p.\n", tmp_sob); if (tmp_sob) ID3D11Buffer_Release(tmp_sob); + tmp_pred = (ID3D11Predicate *)0xdeadbeef; + pred_value = 0xdeadbeef; + ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); + todo_wine ok(!tmp_pred, "Got unexpected predicate %p.\n", tmp_pred); + if (tmp_pred) ID3D11Predicate_Release(tmp_pred); + todo_wine ok(!pred_value, "Got unexpected predicate value %d.\n", pred_value); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -7970,9 +8000,17 @@ static void test_device_context_state(void) ok(tmp_sob == sob, "Got stream output buffer %p, expected %p.\n", tmp_sob, sob); ID3D11Buffer_Release(tmp_sob); + tmp_pred = (ID3D11Predicate *)0xdeadbeef; + pred_value = 0xdeadbeef; + ID3D11DeviceContext1_GetPredication(context, &tmp_pred, &pred_value); + ok(tmp_pred == pred, "Got predicate %p, expected %p.\n", tmp_pred, pred); + ID3D11Predicate_Release(tmp_pred); + ok(pred_value == TRUE, "Got predicate value %#x, expected TRUE.\n", pred_value); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11Predicate_Release(pred); ID3D11Buffer_Release(sob); ID3D11RasterizerState_Release(rs); ID3D11BlendState_Release(bs);

1 0