Skip to content

Commit 1c55450

Browse files
chinmaygardechinmaygarde
authored
Update Khronos headers (GL, GLES, EGL, etc..) dependency. (flutter#33561)
Last update was in 2019.
1 parent e0ba7c6 commit 1c55450

File tree

2 files changed

+35
-62
lines changed

2 files changed

+35
-62
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ deps = {
159159
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '1fd0dbea04448c3f73fe5cb7599f9472f0f107f1',
160160

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

164164
'src/third_party/benchmark':
165165
Var('github_git') + '/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 34 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 9964c5c25cb5dacfb14b8108d3b721d2
1+
Signature: 0dd44fc59b3ab3a7696278d0079c528a
22

33
UNUSED LICENSES:
44

@@ -1182,6 +1182,9 @@ FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_xlib.h
11821182
FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_xlib_xrandr.h
11831183
FILE: ../../../third_party/fuchsia-vulkan/registry/validusage.json
11841184
FILE: ../../../third_party/fuchsia-vulkan/registry/vk.xml
1185+
FILE: ../../../third_party/khronos/EGL/egl.h
1186+
FILE: ../../../third_party/khronos/EGL/eglext.h
1187+
FILE: ../../../third_party/khronos/EGL/eglplatform.h
11851188
FILE: ../../../third_party/khronos/GLES2/gl2platform.h
11861189
FILE: ../../../third_party/khronos/GLES3/gl3platform.h
11871190
FILE: ../../../third_party/libwebp/gradlew
@@ -2137,37 +2140,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21372140
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
21382141
====================================================================================================
21392142

2140-
====================================================================================================
2141-
LIBRARY: angle
2142-
LIBRARY: khronos
2143-
ORIGIN: ../../../third_party/angle/include/GLES/glext.h
2144-
TYPE: LicenseType.unknown
2145-
FILE: ../../../third_party/angle/include/GLES/glext.h
2146-
FILE: ../../../third_party/khronos/EGL/egl.h
2147-
FILE: ../../../third_party/khronos/EGL/eglext.h
2148-
----------------------------------------------------------------------------------------------------
2149-
Copyright (c) 2013-2017 The Khronos Group Inc.
2150-
2151-
Permission is hereby granted, free of charge, to any person obtaining a
2152-
copy of this software and/or associated documentation files (the
2153-
"Materials"), to deal in the Materials without restriction, including
2154-
without limitation the rights to use, copy, modify, merge, publish,
2155-
distribute, sublicense, and/or sell copies of the Materials, and to
2156-
permit persons to whom the Materials are furnished to do so, subject to
2157-
the following conditions:
2158-
2159-
The above copyright notice and this permission notice shall be included
2160-
in all copies or substantial portions of the Materials.
2161-
2162-
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
2163-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
2164-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
2165-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
2166-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
2167-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
2168-
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
2169-
====================================================================================================
2170-
21712143
====================================================================================================
21722144
LIBRARY: angle
21732145
LIBRARY: khronos
@@ -3378,6 +3350,34 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33783350
POSSIBILITY OF SUCH DAMAGE.
33793351
====================================================================================================
33803352

3353+
====================================================================================================
3354+
LIBRARY: angle
3355+
ORIGIN: ../../../third_party/angle/include/GLES/glext.h
3356+
TYPE: LicenseType.unknown
3357+
FILE: ../../../third_party/angle/include/GLES/glext.h
3358+
----------------------------------------------------------------------------------------------------
3359+
Copyright (c) 2013-2017 The Khronos Group Inc.
3360+
3361+
Permission is hereby granted, free of charge, to any person obtaining a
3362+
copy of this software and/or associated documentation files (the
3363+
"Materials"), to deal in the Materials without restriction, including
3364+
without limitation the rights to use, copy, modify, merge, publish,
3365+
distribute, sublicense, and/or sell copies of the Materials, and to
3366+
permit persons to whom the Materials are furnished to do so, subject to
3367+
the following conditions:
3368+
3369+
The above copyright notice and this permission notice shall be included
3370+
in all copies or substantial portions of the Materials.
3371+
3372+
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
3373+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
3374+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
3375+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
3376+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
3377+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
3378+
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
3379+
====================================================================================================
3380+
33813381
====================================================================================================
33823382
LIBRARY: angle
33833383
ORIGIN: ../../../third_party/angle/include/GLSLANG/ShaderLang.h + ../../../third_party/angle/LICENSE
@@ -21656,34 +21656,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2165621656
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2165721657
====================================================================================================
2165821658

21659-
====================================================================================================
21660-
LIBRARY: khronos
21661-
ORIGIN: ../../../third_party/khronos/EGL/eglplatform.h
21662-
TYPE: LicenseType.unknown
21663-
FILE: ../../../third_party/khronos/EGL/eglplatform.h
21664-
----------------------------------------------------------------------------------------------------
21665-
Copyright (c) 2007-2016 The Khronos Group Inc.
21666-
21667-
Permission is hereby granted, free of charge, to any person obtaining a
21668-
copy of this software and/or associated documentation files (the
21669-
"Materials"), to deal in the Materials without restriction, including
21670-
without limitation the rights to use, copy, modify, merge, publish,
21671-
distribute, sublicense, and/or sell copies of the Materials, and to
21672-
permit persons to whom the Materials are furnished to do so, subject to
21673-
the following conditions:
21674-
21675-
The above copyright notice and this permission notice shall be included
21676-
in all copies or substantial portions of the Materials.
21677-
21678-
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
21679-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
21680-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
21681-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
21682-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21683-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21684-
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
21685-
====================================================================================================
21686-
2168721659
====================================================================================================
2168821660
LIBRARY: khronos
2168921661
ORIGIN: ../../../third_party/khronos/GLES3/gl31.h
@@ -21746,6 +21718,7 @@ LIBRARY: khronos
2174621718
ORIGIN: ../../../third_party/khronos/LICENSE
2174721719
TYPE: LicenseType.mit
2174821720
FILE: ../../../third_party/khronos/DEPS
21721+
FILE: ../../../third_party/khronos/DIR_METADATA
2174921722
----------------------------------------------------------------------------------------------------
2175021723
Copyright (c) 2007-2010 The Khronos Group Inc.
2175121724

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

0 commit comments

Comments
 (0)