diff options
| author | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 23:34:09 +0000 |
|---|---|---|
| committer | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 23:34:09 +0000 |
| commit | f4c757086a5ac2b8db587841568e58d51ac90ee4 (patch) | |
| tree | 093504ecdef48e3994e1debfe2285ce3755471e5 /third_party/khronos/README.chromium | |
| parent | 9dfed8710fa6d1f3c2617b4ea2635cd38d3bf321 (diff) | |
| download | chromium_src-f4c757086a5ac2b8db587841568e58d51ac90ee4.zip chromium_src-f4c757086a5ac2b8db587841568e58d51ac90ee4.tar.gz chromium_src-f4c757086a5ac2b8db587841568e58d51ac90ee4.tar.bz2 | |
Updated Khronos GLES2 headers. (Take 2, Original: https://codereview.chromium.org/99053007/)
There was a type conflict between the previous, out of date headers and the more
recent ones included in ANGLE that was causing failures on 64-bit Windows.
BUG=326382
TBR=kbr@chromium.org, piman@chromium.org, raymes@chromium.org, robertphillips@google.com
Review URL: https://codereview.chromium.org/115143004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos/README.chromium')
| -rw-r--r-- | third_party/khronos/README.chromium | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 52d3387..e7b4d86 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: 2012-02-01 +Date: 2013-12-13 License: MIT/X11, SGI Free Software License B Security Critical: no @@ -21,11 +21,10 @@ and not here. GLES2/gl2.h - Added include of gl2chromium.h -GLES2/gl2ext.h - - Added Chromium and Angle extensions. - - Added include of gl2chromium.h EGL/eglplatform.h - Added EGLNative*Type for Mac. - Added EGLNative*Type for native linux framebuffers. +KHR/khrplatform.h + - Modified KHRONOS_APICALL and KHRONOS_APIENTRY DEPS - Added DEPS file to prevent inclusion of external dependencies. |