Backed out changeset e79176a9ffcb (bug 1470977) for Mochitest failures
authorDorel Luca <dluca@mozilla.com>
Wed, 27 Jun 2018 19:21:57 +0300
changeset 423963 4b0113139f3dfc004077edefc83b3187f605e0e5
parent 423962 166bb5e000047989e2aa8f3553dfc39adf318201
child 423964 fd3d6fae1c8fd8660b1c7f55d2a42f36bc1292cb
push id34197
push usercsabou@mozilla.com
push dateThu, 28 Jun 2018 09:44:02 +0000
treeherdermozilla-central@db455160668d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1470977
milestone63.0a1
backs oute79176a9ffcb659bd5d8a68d53551b81c5b5fd4a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e79176a9ffcb (bug 1470977) for Mochitest failures
gfx/gl/GLBlitHelperD3D.cpp
--- a/gfx/gl/GLBlitHelperD3D.cpp
+++ b/gfx/gl/GLBlitHelperD3D.cpp
@@ -179,22 +179,22 @@ GLBlitHelper::BlitImage(layers::GPUVideo
 {
     const auto& data = srcImage->GetData();
     if (!data)
         return false;
 
     const auto& desc = data->SD();
     const auto& subdescUnion = desc.subdesc();
     switch (subdescUnion.type()) {
-    case layers::SurfaceDescriptor::TSurfaceDescriptorD3D10:
+    case subdescUnion.TSurfaceDescriptorD3D10:
         {
             const auto& subdesc = subdescUnion.get_SurfaceDescriptorD3D10();
             return BlitDescriptor(subdesc, destSize, destOrigin);
         }
-    case layers::SurfaceDescriptor::TSurfaceDescriptorDXGIYCbCr:
+    case subdescUnion.TSurfaceDescriptorDXGIYCbCr:
         {
             const auto& subdesc = subdescUnion.get_SurfaceDescriptorDXGIYCbCr();
 
             const auto& clipSize = subdesc.size();
             const auto& ySize = subdesc.sizeY();
             const auto& uvSize = subdesc.sizeCbCr();
             const auto& colorSpace = subdesc.yUVColorSpace();
 
@@ -219,16 +219,19 @@ GLBlitHelper::BlitImage(layers::GPUVideo
 bool
 GLBlitHelper::BlitImage(layers::D3D11YCbCrImage* const srcImage,
                         const gfx::IntSize& destSize, const OriginPos destOrigin) const
 {
     const auto& data = srcImage->GetData();
     if (!data)
         return false;
 
+    const auto& clipRect = srcImage->mPictureRect;
+    const auto& colorSpace = srcImage->mColorSpace;
+
     const WindowsHandle handles[3] = {
         (WindowsHandle)data->mHandles[0],
         (WindowsHandle)data->mHandles[1],
         (WindowsHandle)data->mHandles[2]
     };
     return BlitAngleYCbCr(handles, srcImage->mPictureRect, srcImage->mYSize,
                           srcImage->mCbCrSize, srcImage->mColorSpace, destSize,
                           destOrigin);