VaapiVideoAccelerator: make Vaapi accelerator work with ozone

ui/gl/gl_image_glx.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[reveman, 2014/11/04 21:14:44]

This filed doesn't exist in ToT. Why did you have to make changes to it?

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include "ui/gl/gl_image_glx.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_surface_glx.h"
 
 namespace gfx {
 
 namespace {
 
 // scoped_ptr functor for XFree(). Use as follows:
 //   scoped_ptr<XVisualInfo, ScopedPtrXFree> foo(...);
 // where "XVisualInfo" is any X type that is freed with XFree.
 struct ScopedPtrXFree {
   void operator()(void* x) const { ::XFree(x); }
 };
 
 bool ValidFormat(unsigned internalformat) {
   switch (internalformat) {
+    case GL_RGB:
+      return true;
     case GL_RGBA:
       return true;
     default:
       return false;
   }
 }
 
 int TextureFormat(unsigned internalformat) {
   switch (internalformat) {
+    case GL_RGB:
+      return GLX_BIND_TO_TEXTURE_RGB_EXT;

[marcheu, 2014/11/04 19:25:38]

GLX_TEXTURE_FORMAT_RGB_EXT

[llandwerlin-old, 2014/11/05 10:17:35]

Thanks, fixed.

     case GL_RGBA:
       return GLX_TEXTURE_FORMAT_RGBA_EXT;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 int BindToTextureFormat(unsigned internalformat) {
   switch (internalformat) {
+    case GL_RGB:
+      return GLX_BIND_TO_TEXTURE_RGB_EXT;
     case GL_RGBA:
       return GLX_BIND_TO_TEXTURE_RGBA_EXT;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 unsigned PixmapDepth(unsigned internalformat) {
   switch (internalformat) {
@@ skipping 138 matching lines @@
 
 bool GLImageGLX::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                                       int z_order,
                                       OverlayTransform transform,
                                       const Rect& bounds_rect,
                                       const RectF& crop_rect) {
   return false;
 }
 
 }  // namespace gfx