Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(627)

Unified Diff: ui/gfx/gl/gl_bindings.h

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/gl/gl.gyp ('k') | ui/gfx/gl/gl_bindings_skia_in_process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_bindings.h
diff --git a/ui/gfx/gl/gl_bindings.h b/ui/gfx/gl/gl_bindings.h
deleted file mode 100644
index 751c7afb90c8d78e91f450d9b75c13158ca7fd21..0000000000000000000000000000000000000000
--- a/ui/gfx/gl/gl_bindings.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// 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.
-
-// Includes the platform independent and platform dependent GL headers.
-// Only include this in cc files. It pulls in system headers, including
-// the X11 headers on linux, which define all kinds of macros that are
-// liable to cause conflicts.
-
-#ifndef UI_GFX_GL_GL_BINDINGS_H_
-#define UI_GFX_GL_GL_BINDINGS_H_
-#pragma once
-
-#include <GL/gl.h>
-#include <GL/glext.h>
-
-#include "build/build_config.h"
-#include "base/logging.h"
-#include "ui/gfx/gl/gl_export.h"
-
-// The standard OpenGL native extension headers are also included.
-#if defined(OS_WIN)
-#include <GL/wglext.h>
-#elif defined(OS_MACOSX)
-#include <OpenGL/OpenGL.h>
-#elif defined(USE_X11)
-#include <GL/glx.h>
-#include <GL/glxext.h>
-
-// Undefine some macros defined by X headers. This is why this file should only
-// be included in .cc files.
-#undef Bool
-#undef None
-#undef Status
-#endif
-
-#if defined(OS_WIN)
-#define GL_BINDING_CALL WINAPI
-#else
-#define GL_BINDING_CALL
-#endif
-
-#define GL_SERVICE_LOG(args) DLOG(INFO) << args;
-#if defined(NDEBUG)
- #define GL_SERVICE_LOG_CODE_BLOCK(code)
-#else
- #define GL_SERVICE_LOG_CODE_BLOCK(code) code
-#endif
-
-// Forward declare OSMesa types.
-typedef struct osmesa_context *OSMesaContext;
-typedef void (*OSMESAproc)();
-
-#if !defined(OS_MACOSX)
-
-// Forward declare EGL types.
-typedef unsigned int EGLBoolean;
-typedef unsigned int EGLenum;
-typedef int EGLint;
-typedef void *EGLConfig;
-typedef void *EGLContext;
-typedef void *EGLDisplay;
-typedef void *EGLImageKHR;
-typedef void *EGLSurface;
-typedef void *EGLClientBuffer;
-typedef void (*__eglMustCastToProperFunctionPointerType)(void);
-typedef void* GLeglImageOES;
-
-#if defined(OS_WIN)
-typedef HDC EGLNativeDisplayType;
-typedef HBITMAP EGLNativePixmapType;
-typedef HWND EGLNativeWindowType;
-#elif defined(OS_ANDROID)
-typedef void *EGLNativeDisplayType;
-typedef struct egl_native_pixmap_t *EGLNativePixmapType;
-typedef struct ANativeWindow *EGLNativeWindowType;
-#else
-typedef Display *EGLNativeDisplayType;
-typedef Pixmap EGLNativePixmapType;
-typedef Window EGLNativeWindowType;
-#endif
-
-#endif // !OS_MACOSX
-
-#include "gl_bindings_autogen_gl.h"
-#include "gl_bindings_autogen_osmesa.h"
-
-#if defined(OS_WIN)
-#include "gl_bindings_autogen_egl.h"
-#include "gl_bindings_autogen_wgl.h"
-#elif defined(USE_X11)
-#include "gl_bindings_autogen_egl.h"
-#include "gl_bindings_autogen_glx.h"
-#elif defined(OS_ANDROID)
-#include "gl_bindings_autogen_egl.h"
-#endif
-
-namespace gfx {
-
-// Find an entry point to the mock GL implementation.
-void* GL_BINDING_CALL GetMockGLProcAddress(const char* name);
-
-} // namespace gfx
-
-#endif // UI_GFX_GL_GL_BINDINGS_H_
« no previous file with comments | « ui/gfx/gl/gl.gyp ('k') | ui/gfx/gl/gl_bindings_skia_in_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698