ozone: Don't sort YV channels for CrCb formats.

ui/ozone/gl/gl_image_ozone_native_pixmap.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 
 #include <vector>
 
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gl/gl_surface_egl.h"
@@ skipping 92 matching lines @@
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::UYVY_422:
       NOTREACHED();
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
-#if !defined(ARCH_CPU_X86_FAMILY)
-bool IsFormatCrCb(gfx::BufferFormat format) {
-  switch (format) {
-    case gfx::BufferFormat::YVU_420:
-      return true;
-    case gfx::BufferFormat::R_8:
-    case gfx::BufferFormat::RG_88:
-    case gfx::BufferFormat::BGR_565:
-    case gfx::BufferFormat::RGBA_8888:
-    case gfx::BufferFormat::RGBX_8888:
-    case gfx::BufferFormat::BGRA_8888:
-    case gfx::BufferFormat::BGRX_8888:
-    case gfx::BufferFormat::ATC:
-    case gfx::BufferFormat::ATCIA:
-    case gfx::BufferFormat::DXT1:
-    case gfx::BufferFormat::DXT5:
-    case gfx::BufferFormat::ETC1:
-    case gfx::BufferFormat::RGBA_4444:
-    case gfx::BufferFormat::YUV_420_BIPLANAR:
-    case gfx::BufferFormat::UYVY_422:
-      return false;
-  }
-  NOTREACHED();
-  return false;
-}
-#endif
-
 }  // namespace
 
 GLImageOzoneNativePixmap::GLImageOzoneNativePixmap(const gfx::Size& size,
                                                    unsigned internalformat)
     : GLImageEGL(size),
       internalformat_(internalformat),
       has_image_flush_external_(
           gl::GLSurfaceEGL::HasEGLExtension("EGL_EXT_image_flush_external")) {}
 
 GLImageOzoneNativePixmap::~GLImageOzoneNativePixmap() {}
@@ skipping 36 matching lines @@
         "EGL_EXT_image_dma_buf_import_modifiers");
 
     for (size_t attrs_plane = 0;
          attrs_plane <
          gfx::NumberOfPlanesForBufferFormat(pixmap->GetBufferFormat());
          ++attrs_plane) {
       attrs.push_back(EGL_DMA_BUF_PLANE0_FD_EXT + attrs_plane * 3);
 
       size_t pixmap_plane = attrs_plane;
 
-// TODO(dcastagna): Intel mesa flips V and U when the fourcc format is a
-// CrCb format therefore we don't need to.
-// Once crbug.com/646137 is addressed this ifdef (but not its content) can be
-// removed.
-#if !defined(ARCH_CPU_X86_FAMILY)
-      // EGL_EXT_image_dma_buf_import always expects U and V as plane 1 and 2 in
-      // case of a YUV/YVU format. We swap U and V plane indexes for CrCb
-      // multi-planar formats.
-      if (IsFormatCrCb(format) &&
-          gfx::NumberOfPlanesForBufferFormat(pixmap->GetBufferFormat()) == 3 &&
-          attrs_plane) {
-        pixmap_plane = 3 - attrs_plane;
-      }
-#endif
       attrs.push_back(pixmap->GetDmaBufFd(
           pixmap_plane < pixmap->GetDmaBufFdCount() ? pixmap_plane : 0));
       attrs.push_back(EGL_DMA_BUF_PLANE0_OFFSET_EXT + attrs_plane * 3);
       attrs.push_back(pixmap->GetDmaBufOffset(pixmap_plane));
       attrs.push_back(EGL_DMA_BUF_PLANE0_PITCH_EXT + attrs_plane * 3);
       attrs.push_back(pixmap->GetDmaBufPitch(pixmap_plane));
       if (has_dma_buf_import_modifier) {
         uint64_t modifier = pixmap->GetDmaBufModifier(pixmap_plane);
         DCHECK(attrs_plane < arraysize(kLinuxDrmModifiers));
         attrs.push_back(kLinuxDrmModifiers[attrs_plane]);
@@ skipping 96 matching lines @@
     case gfx::BufferFormat::UYVY_422:
       NOTREACHED();
       return GL_NONE;
   }
 
   NOTREACHED();
   return GL_NONE;
 }
 
 }  // namespace ui