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

Side by Side Diff: third_party/khronos/README.chromium

Issue 893213002: Revert of Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 Name: Khronos header files 1 Name: Khronos header files
2 Short Name: khronos_headers 2 Short Name: khronos_headers
3 URL: http://www.khronos.org/registry 3 URL: http://www.khronos.org/registry
4 Version: unknown 4 Version: unknown
5 Date: 2014-11-26 5 Date: 2014-11-26
6 License: MIT/X11, SGI Free Software License B 6 License: MIT/X11, SGI Free Software License B
7 Security Critical: no 7 Security Critical: no
8 8
9 Description: 9 Description:
10 This package contains header files for the EGL and OpenGL ES APIs from 10 This package contains header files for the EGL and OpenGL ES APIs from
11 Khronos. They are used for compiling code against these APIs as well as for 11 Khronos. They are used for compiling code against these APIs as well as for
12 generating the GL binding initialization logic. 12 generating the GL binding initialization logic.
13 13
14 MIT/X11 (BSD like) license is for {EGL,KHR}/*, SGI Free Software License B is 14 MIT/X11 (BSD like) license is for {EGL,KHR}/*, SGI Free Software License B is
15 for noninclude/GL/*, GLES2/* and GLES3/*. 15 for GLES2/* and GLES3/*.
16 16
17 Local Modifications: 17 Local Modifications:
18 18
19 NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2} 19 NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2}
20 and not here. 20 and not here.
21 21
22 noninclude/GL/glext.h
23 - Added missing function prototypes and enums for GL_KHR_robustness
24 GLES2/gl2.h 22 GLES2/gl2.h
25 - Added include of gl2chromium.h 23 - Added include of gl2chromium.h
26 GLES2/gl2ext.h 24 GLES2/gl2ext.h
27 - Chromium-specific define to account for issues in gles2_conform_test, 25 - Chromium-specific define to account for issues in gles2_conform_test,
28 see http://crbug.com/329708. 26 see http://crbug.com/329708.
29 - Commented out GL_SAMPLER, conflicts with third_party/gles2_conform 27 - Commented out GL_SAMPLER, conflicts with third_party/gles2_conform
30 - Drop const from last argument of GLDEBUGPROCKHR (win trybot fail) 28 - Drop const from last argument of GLDEBUGPROCKHR (win trybot fail)
31 - Added ifdef around GL_LINES_ADJACENCY_EXT to fix conflict with OSX 29 - Added ifdef around GL_LINES_ADJACENCY_EXT to fix conflict with OSX
32 OpenGL framework headers. 30 OpenGL framework headers.
33 EGL/eglplatform.h 31 EGL/eglplatform.h
34 - Added EGLNative*Type for Mac. 32 - Added EGLNative*Type for Mac.
35 - Added EGLNative*Type for native linux framebuffers. 33 - Added EGLNative*Type for native linux framebuffers.
36 KHR/khrplatform.h 34 KHR/khrplatform.h
37 - Modified KHRONOS_APICALL and KHRONOS_APIENTRY 35 - Modified KHRONOS_APICALL and KHRONOS_APIENTRY
38 DEPS 36 DEPS
39 - Added DEPS file to prevent inclusion of external dependencies. 37 - Added DEPS file to prevent inclusion of external dependencies.
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/vertex_array_manager_unittest.cc ('k') | third_party/khronos/noninclude/GL/glext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698