third_party/khronos/README.chromium - Issue 871763002: Make GL bindings conditional

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/khronos/README.chromium

Issue 871763002: Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments, try fix broken builds Created 5 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:

Index: third_party/khronos/README.chromium

diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium

index 10259c9fb4b7a692ea936f495aab5bf087f216c1..f86548ed0bc1f997886fe6cba4eb393165609b1a 100644

--- a/third_party/khronos/README.chromium

+++ b/third_party/khronos/README.chromium

@@ -12,17 +12,21 @@ Khronos. They are used for compiling code against these APIs as well as for

generating the GL binding initialization logic.

MIT/X11 (BSD like) license is for {EGL,KHR}/*, SGI Free Software License B is

-for GLES2/* and GLES3/*.

+for GL/*, GLES2/* and GLES3/*.

Local Modifications:

NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2}

and not here.

+GL/glext.h

+ - Added missing function prototypes and enums for GL_KHR_robustness

+ - Define GLintptr and GLsizeiptr using types from KHR/khrplatform.h

+ to avoid build errors (long vs. int) on some 32bit systems

GLES2/gl2.h

- Added include of gl2chromium.h

GLES2/gl2ext.h

- - Chromium-specific define to account for issues in gles2_conform_test,

+ - Chromium-specific define to account for issues in gles2_conform_test,

see http://crbug.com/329708.

- Commented out GL_SAMPLER, conflicts with third_party/gles2_conform

- Drop const from last argument of GLDEBUGPROCKHR (win trybot fail)