aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/shaderc/spirv-headers am: ↵HEADt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Bob Badour
6e9e92ec0d am: c18535782c am: 5b62eb6188 am: 23f5d7cd1e am: f59f28ece3 Original change: https://android-review.googlesource.com/c/platform/external/shaderc/spirv-headers/+/1588691 Change-Id: I4b50c295681f98ac8108095cb316146de76bd6d4
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/shaderc/spirv-headers am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseBob Badour
6e9e92ec0d am: c18535782c am: 5b62eb6188 am: 23f5d7cd1e Original change: https://android-review.googlesource.com/c/platform/external/shaderc/spirv-headers/+/1588691 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I753d91aed858dc9a81c51d131871ab67adf29d56
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/shaderc/spirv-headers am: ↵Bob Badour
6e9e92ec0d am: c18535782c am: 5b62eb6188 am: 23f5d7cd1e Original change: https://android-review.googlesource.com/c/platform/external/shaderc/spirv-headers/+/1588691 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97d15ce67d380af449829c7b3713207df9f0cd92
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/shaderc/spirv-headers am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bob Badour
6e9e92ec0d am: c18535782c am: 5b62eb6188 Original change: https://android-review.googlesource.com/c/platform/external/shaderc/spirv-headers/+/1588691 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia510d6921f24f8749b45edc1886b6bba309d8a26
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/shaderc/spirv-headers am: ↵Bob Badour
6e9e92ec0d am: c18535782c Original change: https://android-review.googlesource.com/c/platform/external/shaderc/spirv-headers/+/1588691 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I701cde4022f0de66f42524bb4217ad8693cc356e
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/shaderc/spirv-headers am: 6e9e92ec0dandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/shaderc/spirv-headers/+/1588691 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia1b2360122efc3ca334c2f5642ad0934b43f35ef
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/shaderc/spirv-headersandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5e98bc400c6b3191236848a733ca237524615b28
2020-04-30Add METADATA to spirv-headers: MIT=NOTICE am: 2cb335583c am: b8530f4af8 am: ↵Bob Badour
36d9c93da9 am: bdd05e9c9f am: 823eccbef3 Change-Id: Ia111ca96a6eea97b8f8251a036299d4e82c43734
2020-04-30Add METADATA to spirv-headers: MIT=NOTICE am: 2cb335583c am: b8530f4af8 am: ↵Bob Badour
36d9c93da9 am: bdd05e9c9f Change-Id: I1984b59ff494f12cc3c943aa62d4828f0ee07d33
2020-04-30Add METADATA to spirv-headers: MIT=NOTICE am: 2cb335583c am: b8530f4af8 am: ↵Bob Badour
36d9c93da9 Change-Id: Ic0cd62f3c921d44fbbe1fa715956e2265b7b6ee5
2020-04-30Add METADATA to spirv-headers: MIT=NOTICE am: 2cb335583c am: b8530f4af8Bob Badour
Change-Id: Ia2907fae35e0e73c347a4a4728b6ed64883e0665
2020-04-30Add METADATA to spirv-headers: MIT=NOTICE am: 2cb335583candroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I0769c2216203de1d8c0d32ba23b6c413a51d3a35
2020-04-29Add METADATA to spirv-headers: MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I66b9bd83449ad12eace9d9c1701b381dfb58826d
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: c88e6a2a23 am: bf179e4aa2 -s ours am skip reason: subject contains skip directive Change-Id: I5f4d62a9e9c10df93f5b6d99a052aa37e99d25b9
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: c88e6a2a23 Change-Id: I2f71df8dbc32309901f29ce633519706cbd9c728
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I526d3146b154b6b1588143fa09cb257b61675826
2019-09-10Merge "Merge aosp/master-ndk to aosp/master" am: 36ef3defe8 am: 1bf420a789 ↵Jesse Hall
am: 259f181dd8 am: 65d55f13c6 Change-Id: Ic5c8806ac59d4ca6e1c2c9f22f20b5086fb2b937
2019-09-10Merge "Merge aosp/master-ndk to aosp/master" am: 36ef3defe8 am: 1bf420a789Jesse Hall
am: 259f181dd8 Change-Id: If24ecdf47738b7ce27d889daacc39c8291b45037
2019-09-10Merge "Merge aosp/master-ndk to aosp/master" am: 36ef3defe8Jesse Hall
am: 1bf420a789 Change-Id: I4c7fa696bde3aa3fa04bc533aabf22253298db0e
2019-09-10Merge "Merge aosp/master-ndk to aosp/master"Jesse Hall
am: 36ef3defe8 Change-Id: If826da5d9133ec10aeeb4c233c43f2da18f74ed3
2019-09-10Merge "Merge aosp/master-ndk to aosp/master"ndk-sysroot-r21Treehugger Robot
2019-08-16Merge aosp/master-ndk to aosp/masterJesse Hall
Test: none Change-Id: Ie103fbbdff2c93eca00d9ea4af2a5dce3afcabd3
2019-08-15Merge "Change OWNERS" am: 4138c8285b am: 65765d0e43 am: 5b5458c049 am: ↵Jesse Hall
985033d3c5 am: d5f9b40bf1 Change-Id: Ic8a458e7bb2cfa4f7ba85ab26b0d100a2b925379
2019-08-15Merge "Change OWNERS" am: 4138c8285b am: 65765d0e43 am: 5b5458c049Jesse Hall
am: 985033d3c5 Change-Id: I08fd1764665b443fd14feae3eea7de37cfdab664
2019-08-15Merge "Change OWNERS" am: 4138c8285b am: 65765d0e43Jesse Hall
am: 5b5458c049 Change-Id: Ieee8a1087cffa7318c60d0d72b71c0d081372ec1
2019-08-15Merge "Change OWNERS" am: 4138c8285bJesse Hall
am: 65765d0e43 Change-Id: Ic0fab7ae39d95b6e33d0bcb7807aa22240ccb27a
2019-08-15Merge "Change OWNERS"Jesse Hall
am: 4138c8285b Change-Id: I8416befd1a0ecc5045581d5154532628742c826c
2019-08-15Merge "Change OWNERS"Jesse Hall
2019-08-14Change OWNERSJesse Hall
This module was incorrectly auto-OWNed to the RenderScript team. It's not part of RenderScript and not maintained by that team. Test: n/a Change-Id: If4e96f22325b2e3e87634ab0653772dfc9dce31e
2019-07-16Merge remote-tracking branch 'aosp/upstream-master' into update-shadercDavid Neto
Including: 45c2cc3 Merge pull request #122 from mkinsner/array_init_loop_control_bit 7971055 Reserve additional loop control bit for upcoming update to SPV_INTEL_fpga_loop_controls extension 29c1114 Merge pull request #120 from antiagainst/mlir-serializer 123dc27 Merge pull request #121 from jeffbolznv/demote_to_helper_invocation dcce859 add SPV_EXT_demote_to_helper_invocation 739546b Reserve ID 23 for MLIR SPIR-V Serializer de99d4d Merge pull request #119 from dneto0/spirv-issue-476 9baa9e0 Add Volatile to Memory Semantics, for SPV_KHR_vulkan_memory_model 9cf7c3a Merge pull request #117 from ehsannas/UserTypeGOOGLE b1344c0 Add grammar and symbols for UserTypeGOOGLE extension to unified1. 9242862 Merge pull request #105 from mchiasson/cmake_install_config a774172 Add missing "version" : "None" to a bunch of reserved enumerants. d5d3316 Add more detail about reserving tokens to the README. e88e050 Restore numerical order in enumerants. ed8674d Update CMakeLists.txt f7b06c2 updated as per code review c5a291f cmake development configuration package Fixes #104 Testing: checkbuild.py on Linux; unit tests on Windows Change-Id: Id48e04cfb49844e11ab54d6f5073cc3a2208d8e2
2019-07-12Merge pull request #122 from mkinsner/array_init_loop_control_bitJohn Kessenich
Reserve additional loop control bit for upcoming update to SPV_INTEL_fpga_loop_controls
2019-07-12Reserve additional loop control bit for upcoming update to ↵Michael Kinsner
SPV_INTEL_fpga_loop_controls extension
2019-07-03Merge pull request #120 from antiagainst/mlir-serializerJohn Kessenich
Reserve ID 22 for MLIR SPIR-V Serializer
2019-07-02Merge pull request #121 from jeffbolznv/demote_to_helper_invocationJohn Kessenich
add SPV_EXT_demote_to_helper_invocation
2019-07-02add SPV_EXT_demote_to_helper_invocationJeff Bolz
2019-06-15Reserve ID 23 for MLIR SPIR-V SerializerLei Zhang
2019-06-12Merge pull request #119 from dneto0/spirv-issue-476John Kessenich
Add Volatile to Memory Semantics, for SPV_KHR_vulkan_memory_model
2019-06-12Add Volatile to Memory Semantics, for SPV_KHR_vulkan_memory_modelDavid Neto
From Khronos-internal issue 476: Update SPV_KHR_vulkan_memory_model to be able to express volatile OpAtomic* operations. Also regenerate the language-specific headers. This step fixes two problems with UserTypeGOOGLE in those headers.
2019-06-12Merge pull request #117 from ehsannas/UserTypeGOOGLEJohn Kessenich
Add grammar and symbols for UserTypeGOOGLE extension to unified1.
2019-06-10Add grammar and symbols for UserTypeGOOGLE extension to unified1.Ehsan Nasiri
2019-06-08Merge pull request #105 from mchiasson/cmake_install_configJohn Kessenich
cmake development configuration package
2019-06-07Add missing "version" : "None" to a bunch of reserved enumerants.John Kessenich
2019-06-07Add more detail about reserving tokens to the README.John Kessenich
2019-06-07Restore numerical order in enumerants.John Kessenich
2019-06-05Merge remote-tracking branch 'aosp/upstream-master' into update-shadercDavid Neto
Includes 8b911bd Merge pull request #114 from jeffbolznv/fsi 326779e Add SPV_EXT_fragment_shader_interlock 9280c0b Merge pull request #115 from dgkoch/SPV_NV_sm_shader_builts 630d062 Add support for SPV_NV_sm_shader_builtins 903d447 OpenCL ext. inst. header: Support C in addition to C++. 7ac42f8 Merge pull request #112 from mkinsner/master d6936f9 Proposed LoopControl bitfield allocation mechanism in spir-v.xml 7f4277e Merge pull request #111 from Naghasan/codeplay-range 1edd6c4 Reserve token range for Codeplay 9674a1a Merge pull request #102 from ianromanick/INTEL_shader_integer_functions2 a08d4f0 Merge pull request #107 from jeffbolznv/duplicate_enum_switch 9f50e65 Update HasResultAndType code generation to skip duplicate enum values. There weren't any until SPIR-V 1.4 release, now there are two. 4b0985f Merge pull request #106 from alankemp/fix_json_writer 823750b Compare enum names rather than values to determine last element 30ebd2f Merge pull request #103 from amdrexu/bugfix 30c51d3 Enable Groups capability by the extension SPV_AMD_shader_ballot 4079861 Add INTEL_shader_integer_functions2 c4f8f65 Move to version 1.4 of SPIR-V. a5d33a2 Rationalize opcode ordering and a few spaces. 7af56c1 Merge pull request #101 from dneto0/clspv-generator 92d1024 Reserve generator 21 for Clspv 2434b89 Merge pull request #100 from jeffbolznv/hasresult 9f77618 Add a function that returns whether an opcode has a result and/or result type. Currently only implemented in C-based printers. 111a25e Merge pull request #99 from Naghasan/contact-update 0e0d176 Update Codeplay's contact details 3beb2a0 Add ability to skip ranges of instructions; no impact to public headers 2d08d12 Sync to rev. 7 of headers from Khronos. f25b91a Merge pull request #98 from jeffbolznv/partitioned d20b78c Add GroupNonUniformPartitionedNV capability to all the GroupNonUniform instructions a946e73 Header build for previous grammar update. 8f1cce9 Merge pull request #92 from PawelJurek/SPV_INTEL_device_side_avc_motion_estimation 03a0815 Make all "IdScope" be either Execution or Memory. dc3db3a Fix #96: Don't include a comment after #endif for the C header. d3752ea Merge pull request #95 from mkinsner/fpga_enum_block 2b3bbbc Reserve double SPIR-V enum block for upcoming Intel FPGA extension e74c389 Merge pull request #94 from jeffbolznv/cooperative_matrix 56decd4 Add SPV_NV_cooperative_matrix d0cc5ac Grammar for SPV_INTEL_device_side_avc_motion_estimation extension. Testing: checkbuild.py on Linux; unit tests on Windows Change-Id: I09ecbec1a608c98703b1816c9b51f91b76790235
2019-06-02Merge pull request #114 from jeffbolznv/fsiJohn Kessenich
Add SPV_EXT_fragment_shader_interlock
2019-06-02Add SPV_EXT_fragment_shader_interlockJeff Bolz
2019-06-02Merge pull request #115 from dgkoch/SPV_NV_sm_shader_builtsJohn Kessenich
Add support for SPV_NV_sm_shader_builtins
2019-06-02Add support for SPV_NV_sm_shader_builtinsDaniel Koch
2019-05-31OpenCL ext. inst. header: Support C in addition to C++.John Kessenich
Via #ifdef cplusplus.