gl: Check format is valid given an internal format.

ui/gl/gl_image_ozone_native_pixmap.cc

 // Copyright 2015 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/gfx/buffer_format_util.h"
 #include "ui/gl/gl_image_ozone_native_pixmap.h"
 
 #define FOURCC(a, b, c, d)                                        \
   ((static_cast<uint32_t>(a)) | (static_cast<uint32_t>(b) << 8) | \
    (static_cast<uint32_t>(c) << 16) | (static_cast<uint32_t>(d) << 24))
 
 #define DRM_FORMAT_R8 FOURCC('R', '8', ' ', ' ')
 #define DRM_FORMAT_RGB565 FOURCC('R', 'G', '1', '6')
 #define DRM_FORMAT_ARGB8888 FOURCC('A', 'R', '2', '4')
 #define DRM_FORMAT_ABGR8888 FOURCC('A', 'B', '2', '4')
 #define DRM_FORMAT_XRGB8888 FOURCC('X', 'R', '2', '4')
 #define DRM_FORMAT_XBGR8888 FOURCC('X', 'B', '2', '4')
 
 namespace gl {
 namespace {
 
-bool ValidInternalFormat(unsigned internalformat) {
+bool ValidInternalFormat(unsigned internalformat, gfx::BufferFormat format) {
   switch (internalformat) {
     case GL_RGB:

[reveman, 2016/06/03 23:33:01]

maybe we should be even more restrictive here and not allow RGBA to be bound to
RGB until we actually need that.

[Daniele Castagna, 2016/06/03 23:45:29]

Made validation as restrictive as possible.

     case GL_RGBA:
     case GL_BGRA_EXT:
+      switch (format) {
+        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:
+          return true;
+        default:
+          return false;
+      }
     case GL_RED_EXT:
-      return true;
+      return format == gfx::BufferFormat::R_8;
     default:
       return false;
   }
 }
 
 bool ValidFormat(gfx::BufferFormat format) {
   switch (format) {
     case gfx::BufferFormat::R_8:
     case gfx::BufferFormat::BGR_565:
     case gfx::BufferFormat::RGBA_8888:
@@ skipping 60 matching lines @@
 bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
                                           gfx::BufferFormat format) {
   DCHECK(!pixmap_);
   if (pixmap->GetEGLClientBuffer()) {
     EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
     if (!GLImageEGL::Initialize(EGL_NATIVE_PIXMAP_KHR,
                                 pixmap->GetEGLClientBuffer(), attrs)) {
       return false;
     }
   } else if (pixmap->AreDmaBufFdsValid()) {
-    if (!ValidInternalFormat(internalformat_)) {
-      LOG(ERROR) << "Invalid internalformat: " << internalformat_;
-      return false;
-    }
 
     if (!ValidFormat(format)) {
       LOG(ERROR) << "Invalid format: " << static_cast<int>(format);
       return false;
     }
 
+    if (!ValidInternalFormat(internalformat_, format)) {
+      LOG(ERROR) << "Invalid internalformat: " << internalformat_
+                 << " for format: " << static_cast<int>(format);
+      return false;
+    }
+
     // Note: If eglCreateImageKHR is successful for a EGL_LINUX_DMA_BUF_EXT
     // target, the EGL will take a reference to the dma_buf.
     std::vector<EGLint> attrs;
     attrs.push_back(EGL_WIDTH);
     attrs.push_back(size_.width());
     attrs.push_back(EGL_HEIGHT);
     attrs.push_back(size_.height());
     attrs.push_back(EGL_LINUX_DRM_FOURCC_EXT);
     attrs.push_back(FourCC(format));
 
@@ skipping 52 matching lines @@
                                        crop_rect);
 }
 
 void GLImageOzoneNativePixmap::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd,
     uint64_t process_tracing_id,
     const std::string& dump_name) {
   // TODO(ericrk): Implement GLImage OnMemoryDump. crbug.com/514914
 }
 
+// static
+unsigned GLImageOzoneNativePixmap::GetInternalFormatForTesting(
+    gfx::BufferFormat format) {
+  DCHECK(ValidFormat(format));
+  switch (format) {
+    case gfx::BufferFormat::R_8:
+      return GL_RED_EXT;
+    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:
+      return GL_RGBA;
+    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:
+    case gfx::BufferFormat::YUV_420_BIPLANAR:
+    case gfx::BufferFormat::UYVY_422:
+      NOTREACHED();
+      return GL_NONE;
+  }
+
+  NOTREACHED();
+  return GL_NONE;
+}
+
 }  // namespace gl