Skip to content

Commit bace841

Browse files
committed
Backed out changeset c860af62a31c (bug 1957001) for D3D11 crashes. a=backout
UltraBlame original commit: fdca114bf4103b44755c0c403ee25857385dfd61
1 parent 253f241 commit bace841

35 files changed

+901
-3284
lines changed

Diff for: dom/media/platforms/wmf/WMFVideoMFTManager.cpp

-91
Original file line numberDiff line numberDiff line change
@@ -332,17 +332,6 @@ mozilla
332332
/
333333
layers
334334
/
335-
FenceD3D11
336-
.
337-
h
338-
"
339-
#
340-
include
341-
"
342-
mozilla
343-
/
344-
layers
345-
/
346335
LayersTypes
347336
.
348337
h
@@ -4859,55 +4848,6 @@ layers
48594848
PlanarYCbCrImage
48604849
>
48614850
image
4862-
;
4863-
RefPtr
4864-
<
4865-
ID3D11Device
4866-
>
4867-
device
4868-
=
4869-
gfx
4870-
:
4871-
:
4872-
DeviceManagerDx
4873-
:
4874-
:
4875-
Get
4876-
(
4877-
)
4878-
-
4879-
>
4880-
GetImageDevice
4881-
(
4882-
)
4883-
;
4884-
if
4885-
(
4886-
XRE_IsGPUProcess
4887-
(
4888-
)
4889-
&
4890-
&
4891-
layers
4892-
:
4893-
:
4894-
FenceD3D11
4895-
:
4896-
:
4897-
IsSupported
4898-
(
4899-
device
4900-
)
4901-
)
4902-
{
4903-
/
4904-
/
4905-
Store
4906-
YCbCr
4907-
to
4908-
3
4909-
ID3D11Texture2Ds
4910-
image
49114851
=
49124852
new
49134853
IMFYCbCrImage
@@ -4930,37 +4870,6 @@ pictureRegion
49304870
false
49314871
)
49324872
;
4933-
}
4934-
else
4935-
{
4936-
/
4937-
/
4938-
Store
4939-
YCbCr
4940-
to
4941-
shmem
4942-
image
4943-
=
4944-
mImageContainer
4945-
-
4946-
>
4947-
CreatePlanarYCbCrImage
4948-
(
4949-
)
4950-
;
4951-
VideoData
4952-
:
4953-
:
4954-
SetVideoDataToImage
4955-
(
4956-
image
4957-
mVideoInfo
4958-
b
4959-
pictureRegion
4960-
true
4961-
)
4962-
;
4963-
}
49644873
RefPtr
49654874
<
49664875
VideoData

Diff for: gfx/ipc/GPUParent.cpp

-25
Original file line numberDiff line numberDiff line change
@@ -731,17 +731,6 @@ mozilla
731731
/
732732
layers
733733
/
734-
GpuProcessD3D11FencesHolderMap
735-
.
736-
h
737-
"
738-
#
739-
include
740-
"
741-
mozilla
742-
/
743-
layers
744-
/
745734
GpuProcessD3D11TextureMap
746735
.
747736
h
@@ -1687,13 +1676,6 @@ Init
16871676
(
16881677
)
16891678
;
1690-
GpuProcessD3D11FencesHolderMap
1691-
:
1692-
:
1693-
Init
1694-
(
1695-
)
1696-
;
16971679
GpuProcessD3D11TextureMap
16981680
:
16991681
:
@@ -5737,13 +5719,6 @@ Shutdown
57375719
(
57385720
)
57395721
;
5740-
GpuProcessD3D11FencesHolderMap
5741-
:
5742-
:
5743-
Shutdown
5744-
(
5745-
)
5746-
;
57475722
DeviceManagerDx
57485723
:
57495724
:

0 commit comments

Comments
 (0)