Linux: include system Mesa headers when using system Mesa.

BUG=161389


Review URL: https://chromiumcodereview.appspot.com/11416265

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170390 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 32 insertions, 9 deletions

diff --git a/third_party/mesa/include/osmesa.h b/third_party/mesa/include/osmesa.h
new file mode 100644
index 0000000..d727e90
--- /dev/null
+++ b/third_party/mesa/include/osmesa.h
@@ -0,0 +1,18 @@
+// Copyright (c) 2012 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.
+
+#ifndef THIRD_PARTY_MESA_INCLUDE_OSMESA_H_
+#define THIRD_PARTY_MESA_INCLUDE_OSMESA_H_
+#pragma once
+
+// This is a shim header to include the right mesa header.
+// Use this instead of referencing the mesa header directly.
+
+#if defined(USE_SYSTEM_MESA)
+#include <GL/osmesa.h>
+#else
+#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#endif
+
+#endif  // THIRD_PARTY_MESA_INCLUDE_OSMESA_H_
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index 5334e52..1271a0e 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -592,6 +592,11 @@
         {
           'target_name': 'mesa_headers',
           'type': 'none',
+          'direct_dependent_settings': {
+            'defines': [
+              'USE_SYSTEM_MESA',
+            ],
+          }
         },
         {
           'target_name': 'mesa',
diff --git a/ui/gl/DEPS b/ui/gl/DEPS
index 4d34aad..116418c 100644
--- a/ui/gl/DEPS
+++ b/ui/gl/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "+third_party/angle/include",
-  "+third_party/mesa/MesaLib/include",
+  "+third_party/mesa/include",
 ]
diff --git a/ui/gl/gl_context_glx.cc b/ui/gl/gl_context_glx.cc
index f36a2bdc..c675263 100644
--- a/ui/gl/gl_context_glx.cc
+++ b/ui/gl/gl_context_glx.cc
@@ -11,7 +11,7 @@ extern "C" {
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "third_party/mesa/include/osmesa.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_glx.h"
diff --git a/ui/gl/gl_context_linux.cc b/ui/gl/gl_context_linux.cc
index 33b5f52..660264b 100644
--- a/ui/gl/gl_context_linux.cc
+++ b/ui/gl/gl_context_linux.cc
@@ -7,7 +7,7 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "third_party/mesa/include/osmesa.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context_egl.h"
 #include "ui/gl/gl_context_glx.h"
diff --git a/ui/gl/gl_context_mac.mm b/ui/gl/gl_context_mac.mm
index dbb0730..37ad633 100644
--- a/ui/gl/gl_context_mac.mm
+++ b/ui/gl/gl_context_mac.mm
@@ -6,7 +6,7 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "third_party/mesa/include/osmesa.h"
 #include "ui/gl/gl_context_cgl.h"
 #include "ui/gl/gl_context_osmesa.h"
 #include "ui/gl/gl_context_stub.h"
diff --git a/ui/gl/gl_context_win.cc b/ui/gl/gl_context_win.cc
index 1d81142..3f7fb07 100644
--- a/ui/gl/gl_context_win.cc
+++ b/ui/gl/gl_context_win.cc
@@ -7,7 +7,7 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "third_party/mesa/include/osmesa.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context_egl.h"
 #include "ui/gl/gl_context_osmesa.h"
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index da2d74c..b349e7c 100644
--- a/ui/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -20,7 +20,7 @@ extern "C" {
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
-#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "third_party/mesa/include/osmesa.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
diff --git a/ui/gl/gl_surface_linux.cc b/ui/gl/gl_surface_linux.cc
index 8a63a00..f19781b 100644
--- a/ui/gl/gl_surface_linux.cc
+++ b/ui/gl/gl_surface_linux.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "third_party/mesa/include/osmesa.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
diff --git a/ui/gl/gl_surface_mac.cc b/ui/gl/gl_surface_mac.cc
index df542a1..402ea9e 100644
--- a/ui/gl/gl_surface_mac.cc
+++ b/ui/gl/gl_surface_mac.cc
@@ -7,7 +7,7 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "third_party/mesa/include/osmesa.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_cgl.h"
diff --git a/ui/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc
index b07dff4..ff739c2 100644
--- a/ui/gl/gl_surface_win.cc
+++ b/ui/gl/gl_surface_win.cc
@@ -7,7 +7,7 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "third_party/mesa/include/osmesa.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"