Bug 1470977 - Fix GLBlitHelperD3D.cpp mingw clang compilation r?lsalzman draft
authorJacek Caban <jacek@codeweavers.com>
Mon, 25 Jun 2018 21:01:41 +0200
changeset 812164 d57741ec316e17b310c8fae62d83ed635424dd15
parent 812163 979a52572d43d236198b3e4f2f17fc0d8d58aedf
push id114464
push userbmo:jacek@codeweavers.com
push dateThu, 28 Jun 2018 16:53:46 +0000
reviewerslsalzman
bugs1470977
milestone60.1.0
Bug 1470977 - Fix GLBlitHelperD3D.cpp mingw clang compilation r?lsalzman MozReview-Commit-ID: 6C2SkCHCUo8
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 subdescUnion.TSurfaceDescriptorD3D10:
+    case layers::GPUVideoSubDescriptor::TSurfaceDescriptorD3D10:
         {
             const auto& subdesc = subdescUnion.get_SurfaceDescriptorD3D10();
             return BlitDescriptor(subdesc, destSize, destOrigin);
         }
-    case subdescUnion.TSurfaceDescriptorDXGIYCbCr:
+    case layers::GPUVideoSubDescriptor::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,19 +219,16 @@ 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);