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

Side by Side Diff: ui/gl/gl_surface_egl.cc

Issue 2122243002: Add new Ozone surface API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gl_egl
Patch Set: Even more deps. Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gl/gl_surface_egl.h" 5 #include "ui/gl/gl_surface_egl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 22 matching lines...) Expand all
33 33
34 #if defined(OS_ANDROID) 34 #if defined(OS_ANDROID)
35 #include <android/native_window_jni.h> 35 #include <android/native_window_jni.h>
36 #endif 36 #endif
37 37
38 #if defined(USE_X11) && !defined(OS_CHROMEOS) 38 #if defined(USE_X11) && !defined(OS_CHROMEOS)
39 extern "C" { 39 extern "C" {
40 #include <X11/Xlib.h> 40 #include <X11/Xlib.h>
41 #define Status int 41 #define Status int
42 } 42 }
43 #include "ui/base/x/x11_util_internal.h" // nogncheck
44 #include "ui/gfx/x/x11_switches.h" // nogncheck 43 #include "ui/gfx/x/x11_switches.h" // nogncheck
45 #endif 44 #endif
46 45
47 #if !defined(EGL_FIXED_SIZE_ANGLE) 46 #if !defined(EGL_FIXED_SIZE_ANGLE)
48 #define EGL_FIXED_SIZE_ANGLE 0x3201 47 #define EGL_FIXED_SIZE_ANGLE 0x3201
49 #endif 48 #endif
50 49
51 #if !defined(EGL_OPENGL_ES3_BIT) 50 #if !defined(EGL_OPENGL_ES3_BIT)
52 #define EGL_OPENGL_ES3_BIT 0x00000040 51 #define EGL_OPENGL_ES3_BIT 0x00000040
53 #endif 52 #endif
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 } 1139 }
1141 1140
1142 void* SurfacelessEGL::GetShareHandle() { 1141 void* SurfacelessEGL::GetShareHandle() {
1143 return NULL; 1142 return NULL;
1144 } 1143 }
1145 1144
1146 SurfacelessEGL::~SurfacelessEGL() { 1145 SurfacelessEGL::~SurfacelessEGL() {
1147 } 1146 }
1148 1147
1149 } // namespace gl 1148 } // namespace gl
OLDNEW
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698