Clean up the mess left supporting 'use system libs'

The GL and EGL folders have nothing to do with src/gpu and
so don't belong there.

The gpu/GLES2 is the public (renderer) api. gl2chromium_constants.h
does not belong there as that is only used by the GPU process.

BUG=none


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

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

5 files changed, 64 insertions, 2 deletions

diff --git a/ui/gl/DEPS b/ui/gl/DEPS
index 9a9f674..4d34aad 100644
--- a/ui/gl/DEPS
+++ b/ui/gl/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
-  "+gpu/GL",
   "+third_party/angle/include",
   "+third_party/mesa/MesaLib/include",
 ]
diff --git a/ui/gl/EGL/eglextchromium.h b/ui/gl/EGL/eglextchromium.h
new file mode 100644
index 0000000..fdde853
--- /dev/null
+++ b/ui/gl/EGL/eglextchromium.h
@@ -0,0 +1,36 @@
+// Copyright (c) 2013 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.
+
+// This file contains Chromium-specific EGL extensions declarations.
+
+#ifndef GPU_EGL_EGLEXTCHROMIUM_H_
+#define GPU_EGL_EGLEXTCHROMIUM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <EGL/eglplatform.h>
+
+/* EGLSyncControlCHROMIUM requires 64-bit uint support */
+#if KHRONOS_SUPPORT_INT64
+#ifndef EGL_CHROMIUM_sync_control
+#define EGL_CHROMIUM_sync_control 1
+typedef khronos_uint64_t EGLuint64CHROMIUM;
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(
+    EGLDisplay dpy, EGLSurface surface, EGLuint64CHROMIUM *ust,
+    EGLuint64CHROMIUM *msc, EGLuint64CHROMIUM *sbc);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCVALUESCHROMIUMPROC)
+    (EGLDisplay dpy, EGLSurface surface, EGLuint64CHROMIUM *ust,
+     EGLuint64CHROMIUM *msc, EGLuint64CHROMIUM *sbc);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#define  // GPU_EGL_EGLEXTCHROMIUM_H_
diff --git a/ui/gl/GL/glextchromium.h b/ui/gl/GL/glextchromium.h
new file mode 100644
index 0000000..41818d7
--- /dev/null
+++ b/ui/gl/GL/glextchromium.h
@@ -0,0 +1,26 @@
+// Copyright (c) 2013 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.
+
+// This file contains Chromium-specific GL extensions declarations.
+
+#ifndef GPU_GL_GLEXTCHROMIUM_H_
+#define GPU_GL_GLEXTCHROMIUM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef GL_NVX_gpu_memory_info
+#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
+#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048
+#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049
+#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A
+#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // GPU_GL_GLEXTCHROMIUM_H_
diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
index 84d8c54..d8e6866 100755
--- a/ui/gl/generate_bindings.py
+++ b/ui/gl/generate_bindings.py
@@ -1721,6 +1721,7 @@ def ResolveHeader(header, header_paths):
 
   # Always use a path for Chromium-specific extensions. They are extracted
   # to separate files.
+  paths.append('.')
   paths.append('../../gpu')
 
   root = os.path.abspath(os.path.dirname(__file__))
diff --git a/ui/gl/gl_context_glx.cc b/ui/gl/gl_context_glx.cc
index 1f138e2..c47a10d 100644
--- a/ui/gl/gl_context_glx.cc
+++ b/ui/gl/gl_context_glx.cc
@@ -11,8 +11,8 @@ extern "C" {
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "gpu/GL/glextchromium.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "ui/gl/GL/glextchromium.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_glx.h"