Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Update Khronos headers (GL, GLES, EGL, etc..) dependency. #33561

Merged
merged 1 commit into from
May 23, 2022
Merged

Update Khronos headers (GL, GLES, EGL, etc..) dependency. #33561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ deps = {
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '1fd0dbea04448c3f73fe5cb7599f9472f0f107f1',

'src/third_party/khronos':
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '7122230e90547962e0f0c627f62eeed3c701f275',
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '676d544d2b8f48903b7da9fceffaa534a5613978',

'src/third_party/benchmark':
Var('github_git') + '/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',
Expand Down
95 changes: 34 additions & 61 deletions ci/licenses_golden/licenses_third_party
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 9964c5c25cb5dacfb14b8108d3b721d2
Signature: 0dd44fc59b3ab3a7696278d0079c528a

UNUSED LICENSES:

Expand Down Expand Up @@ -1182,6 +1182,9 @@ FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_xlib.h
FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_xlib_xrandr.h
FILE: ../../../third_party/fuchsia-vulkan/registry/validusage.json
FILE: ../../../third_party/fuchsia-vulkan/registry/vk.xml
FILE: ../../../third_party/khronos/EGL/egl.h
FILE: ../../../third_party/khronos/EGL/eglext.h
FILE: ../../../third_party/khronos/EGL/eglplatform.h
FILE: ../../../third_party/khronos/GLES2/gl2platform.h
FILE: ../../../third_party/khronos/GLES3/gl3platform.h
FILE: ../../../third_party/libwebp/gradlew
Expand Down Expand Up @@ -2137,37 +2140,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
====================================================================================================

====================================================================================================
LIBRARY: angle
LIBRARY: khronos
ORIGIN: ../../../third_party/angle/include/GLES/glext.h
TYPE: LicenseType.unknown
FILE: ../../../third_party/angle/include/GLES/glext.h
FILE: ../../../third_party/khronos/EGL/egl.h
FILE: ../../../third_party/khronos/EGL/eglext.h
----------------------------------------------------------------------------------------------------
Copyright (c) 2013-2017 The Khronos Group Inc.

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Materials.

THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
====================================================================================================

====================================================================================================
LIBRARY: angle
LIBRARY: khronos
Expand Down Expand Up @@ -3378,6 +3350,34 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: angle
ORIGIN: ../../../third_party/angle/include/GLES/glext.h
TYPE: LicenseType.unknown
FILE: ../../../third_party/angle/include/GLES/glext.h
----------------------------------------------------------------------------------------------------
Copyright (c) 2013-2017 The Khronos Group Inc.

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Materials.

THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
====================================================================================================

====================================================================================================
LIBRARY: angle
ORIGIN: ../../../third_party/angle/include/GLSLANG/ShaderLang.h + ../../../third_party/angle/LICENSE
Expand Down Expand Up @@ -21656,34 +21656,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: khronos
ORIGIN: ../../../third_party/khronos/EGL/eglplatform.h
TYPE: LicenseType.unknown
FILE: ../../../third_party/khronos/EGL/eglplatform.h
----------------------------------------------------------------------------------------------------
Copyright (c) 2007-2016 The Khronos Group Inc.

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Materials.

THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
====================================================================================================

====================================================================================================
LIBRARY: khronos
ORIGIN: ../../../third_party/khronos/GLES3/gl31.h
Expand Down Expand Up @@ -21746,6 +21718,7 @@ LIBRARY: khronos
ORIGIN: ../../../third_party/khronos/LICENSE
TYPE: LicenseType.mit
FILE: ../../../third_party/khronos/DEPS
FILE: ../../../third_party/khronos/DIR_METADATA
----------------------------------------------------------------------------------------------------
Copyright (c) 2007-2010 The Khronos Group Inc.

Expand Down Expand Up @@ -26413,4 +26386,4 @@ freely, subject to the following restrictions:
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
====================================================================================================
Total license count: 416
Total license count: 415