-- cgit v1.2.3 From 517b0b214e278db4b1e5c0491b5c40c4bfd3c7c7 Mon Sep 17 00:00:00 2001 From: renchenglei Date: Fri, 28 Jun 2019 15:21:08 +0800 Subject: DO NOT MERGE egl: Enable eglGetPlatformDisplay on Android Platform This helps to add eglGetPlatformDisplay support on Android Platform. Reviewed-by: Eric Engestrom Test: Run CtsDeqpTestcase dEQP-EGL.info#vendor and it pass Bug:177002022 Change-Id: I2f64555f075e4f5135ba9138789d7d44afbbea7e Merged-In: I2f64555f075e4f5135ba9138789d7d44afbbea7e --- src/egl/main/eglapi.c | 5 +++++ src/egl/main/egldisplay.c | 16 ++++++++++++++++ src/egl/main/egldisplay.h | 6 ++++++ 3 files changed, 27 insertions(+) diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 588c6a5f1eb..114535efcf0 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -411,6 +411,11 @@ _eglGetPlatformDisplayCommon(EGLenum platform, void *native_display, case EGL_PLATFORM_SURFACELESS_MESA: disp = _eglGetSurfacelessDisplay(native_display, attrib_list); break; +#endif +#ifdef HAVE_ANDROID_PLATFORM + case EGL_PLATFORM_ANDROID_KHR: + disp = _eglGetAndroidDisplay(native_display, attrib_list); + break; #endif default: RETURN_EGL_ERROR(NULL, EGL_BAD_PARAMETER, NULL); diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index ba5f84510fe..59e069641a6 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -542,3 +542,19 @@ _eglGetSurfacelessDisplay(void *native_display, return _eglFindDisplay(_EGL_PLATFORM_SURFACELESS, native_display); } #endif /* HAVE_SURFACELESS_PLATFORM */ + +#ifdef HAVE_ANDROID_PLATFORM +_EGLDisplay* +_eglGetAndroidDisplay(void *native_display, + const EGLAttrib *attrib_list) +{ + + /* This platform recognizes no display attributes. */ + if (attrib_list != NULL && attrib_list[0] != EGL_NONE) { + _eglError(EGL_BAD_ATTRIBUTE, "eglGetPlatformDisplay"); + return NULL; + } + + return _eglFindDisplay(_EGL_PLATFORM_ANDROID, native_display); +} +#endif /* HAVE_ANDROID_PLATFORM */ diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index cfd0ff66d64..9f6a1d6f6aa 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -301,6 +301,12 @@ _eglGetSurfacelessDisplay(void *native_display, const EGLAttrib *attrib_list); #endif +#ifdef HAVE_ANDROID_PLATFORM +_EGLDisplay* +_eglGetAndroidDisplay(void *native_display, + const EGLAttrib *attrib_list); +#endif + #ifdef __cplusplus } #endif -- cgit v1.2.3 From 4ffb28d41c1042753c980db973dc23f6a9708cc6 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Mon, 22 Mar 2021 15:24:54 -0700 Subject: Revert property "default_applicable_licenses" A patch from OpenSynergy to fix the broken build Change-Id: I3349104ea941f2b7aeb119e196fd3772bfd8e45e --- Android.bp | 41 ----------------------------------------- src/Android.bp | 20 -------------------- src/mesa/Android.bp | 9 --------- 3 files changed, 70 deletions(-) diff --git a/Android.bp b/Android.bp index 5bbee27056a..8df7f3809da 100644 --- a/Android.bp +++ b/Android.bp @@ -23,47 +23,6 @@ soong_namespace {} -// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE -// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE -// DEPENDING ON IT IN YOUR PROJECT. *** -package { - default_applicable_licenses: ["external_mesa3d_license"], -} - -// Added automatically by a large-scale-change that took the approach of -// 'apply every license found to every target'. While this makes sure we respect -// every license restriction, it may not be entirely correct. -// -// e.g. GPL in an MIT project might only apply to the contrib/ directory. -// -// Please consider splitting the single license below into multiple licenses, -// taking care not to lose any license_kind information, and overriding the -// default license using the 'licenses: [...]' property on targets as needed. -// -// For unused files, consider creating a 'fileGroup' with "//visibility:private" -// to attach the license to, and including a comment whether the files may be -// used in the current project. -// See: http://go/android-license-faq -license { - name: "external_mesa3d_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-BSD", - "SPDX-license-identifier-BSL-1.0", - "SPDX-license-identifier-GPL-2.0", - "SPDX-license-identifier-ISC", - "SPDX-license-identifier-MIT", - "SPDX-license-identifier-Unlicense", - "legacy_by_exception_only", // by exception only - "legacy_notice", - "legacy_unencumbered", - ], - license_text: [ - "LICENSE", - ], -} - build = ["Android.gen.bp"] cc_library_headers { diff --git a/src/Android.bp b/src/Android.bp index 877f065eaa2..741022da520 100644 --- a/src/Android.bp +++ b/src/Android.bp @@ -1,23 +1,3 @@ -// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE -// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE -// DEPENDING ON IT IN YOUR PROJECT. *** -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "external_mesa3d_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-BSD - // SPDX-license-identifier-BSL-1.0 - // SPDX-license-identifier-ISC - // SPDX-license-identifier-MIT - // SPDX-license-identifier-Unlicense - // legacy_by_exception_only (by exception only) - // legacy_notice - // legacy_unencumbered - default_applicable_licenses: ["external_mesa3d_license"], -} - cc_library_headers { name: "libmesa_glsl_utils_includes", export_include_dirs: [ diff --git a/src/mesa/Android.bp b/src/mesa/Android.bp index f1ab7930468..d2344655bdc 100644 --- a/src/mesa/Android.bp +++ b/src/mesa/Android.bp @@ -20,15 +20,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "external_mesa3d_license" - // to get the below license kinds: - // SPDX-license-identifier-MIT - default_applicable_licenses: ["external_mesa3d_license"], -} - build = ["Android.sources.bp"] // -- cgit v1.2.3 From 68bd18a7ef5722770ea6bd84716b9612b64e86cd Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 24 Mar 2021 19:00:29 -0700 Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/mesa3d Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-ISC SPDX-license-identifier-MIT SPDX-license-identifier-Unlicense legacy_by_exception_only legacy_notice legacy_unencumbered to: Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-ISC SPDX-license-identifier-MIT SPDX-license-identifier-Unlicense legacy_by_exception_only legacy_notice legacy_unencumbered to: src/Android.bp Added SPDX-license-identifier-MIT to: src/mesa/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Idf4a68c76ea0eed2a475a0ddfc9a44a1fbf783f0 --- Android.bp | 42 ++++++++++++++++++++++++++++++++++++++++++ src/Android.bp | 20 ++++++++++++++++++++ src/mesa/Android.bp | 9 +++++++++ 3 files changed, 71 insertions(+) diff --git a/Android.bp b/Android.bp index 8df7f3809da..cf109bd5bee 100644 --- a/Android.bp +++ b/Android.bp @@ -23,6 +23,48 @@ soong_namespace {} +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + default_applicable_licenses: ["external_mesa3d_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// See: http://go/android-license-faq +license { + name: "external_mesa3d_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-BSL-1.0", + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-ISC", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-Unlicense", + "legacy_by_exception_only", // by exception only + "legacy_notice", + "legacy_unencumbered", + ], + license_text: [ + "LICENSE", + ], +} + build = ["Android.gen.bp"] cc_library_headers { diff --git a/src/Android.bp b/src/Android.bp index 741022da520..877f065eaa2 100644 --- a/src/Android.bp +++ b/src/Android.bp @@ -1,3 +1,23 @@ +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_mesa3d_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + // SPDX-license-identifier-BSL-1.0 + // SPDX-license-identifier-ISC + // SPDX-license-identifier-MIT + // SPDX-license-identifier-Unlicense + // legacy_by_exception_only (by exception only) + // legacy_notice + // legacy_unencumbered + default_applicable_licenses: ["external_mesa3d_license"], +} + cc_library_headers { name: "libmesa_glsl_utils_includes", export_include_dirs: [ diff --git a/src/mesa/Android.bp b/src/mesa/Android.bp index d2344655bdc..f1ab7930468 100644 --- a/src/mesa/Android.bp +++ b/src/mesa/Android.bp @@ -20,6 +20,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_mesa3d_license" + // to get the below license kinds: + // SPDX-license-identifier-MIT + default_applicable_licenses: ["external_mesa3d_license"], +} + build = ["Android.sources.bp"] // -- cgit v1.2.3