1119854 - Ensure D3D11 sync texture never deadlocks

Status: RESOLVED FIXED

(Core :: Graphics: Layers, defect)

Description

[Bas Schouten (:bas.schouten)]

It would be nice to make 100% sure we're never deadlocking people on the D3D11 sync texture amongst our users. We can do this by setting a sufficiently long timeout and crashing when it expires.

Comment 1

[Bas Schouten (:bas.schouten)]

Attachment: bug1119854

Comment 2

[Bas Schouten (:bas.schouten)]

Comment on attachment 8546728 [details] [diff] [review]
bug1119854

Review of attachment 8546728 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/layers/d3d11/TextureD3D11.cpp
@@ +785,5 @@
>  
>    if (mD3D11SyncedTextures.size()) {
>      RefPtr<IDXGIKeyedMutex> mutex;
>      hr = mD3D11Texture->QueryInterface((IDXGIKeyedMutex**)byRef(mutex));
> +    mutex->AcquireSync(0, 10000);

I fixed this...

Comment 3

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 8546728 [details] [diff] [review]
bug1119854

Review of attachment 8546728 [details] [diff] [review]:
-----------------------------------------------------------------

There's another AcquireSync in SharedSurfaceANGLE

Comment 4

[Chris Peterson [:cpeterson]]

Bas: did you forget to change this AcquireSync(0, INFINITE) to AcquireSync(0, 10000) in the SharedSurfaceANGLE.cpp patch you landed?

https://hg.mozilla.org/integration/mozilla-inbound/diff/18bc11b32f6f/gfx/gl/SharedSurfaceANGLE.cpp#l1.15

Comment 5

[Bas Schouten (:bas.schouten)]

(In reply to Chris Peterson [:cpeterson] from comment #4)
> Bas: did you forget to change this AcquireSync(0, INFINITE) to
> AcquireSync(0, 10000) in the SharedSurfaceANGLE.cpp patch you landed?
> 
> https://hg.mozilla.org/integration/mozilla-inbound/diff/18bc11b32f6f/gfx/gl/
> SharedSurfaceANGLE.cpp#l1.15

You're right, thank you.

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/18bc11b32f6f
https://hg.mozilla.org/mozilla-central/rev/ee29d84c968a