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

Side by Side Diff: remoting/client/display/sys_opengl.h

Issue 2591363002: Adding drawable to CRD andorid and iOS gl rendering pipeline. (Closed)
Patch Set: More special casing for Android and windows. Created 3 years, 11 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_ 5 #ifndef REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_
6 #define REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_ 6 #define REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(OS_IOS) 10 #if defined(OS_IOS)
11 #include <OpenGLES/ES3/gl.h> 11 #include <OpenGLES/ES3/gl.h>
12 #elif defined(OS_LINUX) 12 #elif defined(OS_LINUX)
13 #define GL_GLEXT_PROTOTYPES 13 #define GL_GLEXT_PROTOTYPES
14 #include <GL/gl.h> 14 #include <GL/gl.h>
15 #include <GL/glext.h> 15 #include <GL/glext.h>
16 #elif defined(OS_MACOSX) 16 #elif defined(OS_MACOSX)
17 #define GL_GLEXT_PROTOTYPES 17 #define GL_GLEXT_PROTOTYPES
18 #include <OpenGL/gl.h> 18 #include <OpenGL/gl.h>
19 #include <OpenGL/glext.h> 19 #include <OpenGL/glext.h>
20 #elif defined(OS_ANDROID)
21 #include <EGL/egl.h>
Yuwei 2017/01/09 22:41:54 Why is EGL included here? I think it's only used t
nicholss 2017/01/09 22:51:12 I am trying to make the android side compile. GLES
Yuwei 2017/01/09 23:06:37 Yeah but why EGL/egl.h...
20 #else 22 #else
21 #include <GLES3/gl3.h> 23 #include <GLES3/gl3.h>
22 #endif // defined(OS_IOS) 24 #endif // defined(OS_IOS)
23 25
24 #endif // REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_ 26 #endif // REMOTING_CLIENT_DISPLAY_SYS_OPENGL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698