third_party/khronos/README.chromium - Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

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 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 2 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 e7b4d8643e74d96b70b77ccbdda0e829586017a0..d803f1453c01404aacf126a63e818c1e42acb55d 100644

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

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

@@ -2,7 +2,7 @@ Name: Khronos header files

Short Name: khronos_headers

URL: http://www.khronos.org/registry

Version: unknown

-Date: 2013-12-13

+Date: 2014-10-20

License: MIT/X11, SGI Free Software License B

Security Critical: no

@@ -21,6 +21,13 @@ and not here.

GLES2/gl2.h

- Added include of gl2chromium.h

+GLES2/gl2ext.h

+ - 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)

+ - Added ifdef around GL_LINES_ADJACENCY_EXT to fix conflict with OSX

+ OpenGL framework headers.

EGL/eglplatform.h

- Added EGLNative*Type for Mac.

- Added EGLNative*Type for native linux framebuffers.

« no previous file with comments | « third_party/khronos/GLES2/gl2ext.h ('k') | tools/android/checkstyle/chromium-style-5.0.xml » ('j') | no next file with comments »