Stphane Marchesin [Tue, 13 Sep 2016 19:09:27 +0000 (19:09 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
4faeff24d2 am:
2b2a5dfe41
am:
e4733132c9
Change-Id: I17852505805666b5f1dbbe703d2dffc95554d8b5
Haixia Shi [Tue, 13 Sep 2016 19:09:27 +0000 (19:09 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf am:
bce9c4d0eb
am:
31c60e9172
Change-Id: I3e0e783db33c0c0a1bae944758107eca4a2621da
Stphane Marchesin [Tue, 13 Sep 2016 19:04:31 +0000 (19:04 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
4faeff24d2
am:
2b2a5dfe41
Change-Id: Ie9140c7d9c482824d7ca5e7ff6723492aa9d195e
Haixia Shi [Tue, 13 Sep 2016 19:04:29 +0000 (19:04 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
9dfb23aeaf
am:
bce9c4d0eb
Change-Id: If1acac260b92bdf81a8370e4d6257d2e28e4c3d8
Stphane Marchesin [Tue, 13 Sep 2016 19:01:32 +0000 (19:01 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84
am:
4faeff24d2
Change-Id: Ibbc71c1204a46b010e8a98d0bef16c878620155c
Haixia Shi [Tue, 13 Sep 2016 19:01:32 +0000 (19:01 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111
am:
9dfb23aeaf
Change-Id: I914a0e22ba02c64e8db152ee10ff261f47261a34
Stphane Marchesin [Tue, 13 Sep 2016 18:46:54 +0000 (18:46 +0000)]
Fix GLES2 format mismatch am:
4b80682693
am:
9a9c641a84
Change-Id: Ic24eba3990aa9fb563e1501e749dd3f29d99f75b
Haixia Shi [Tue, 13 Sep 2016 18:46:52 +0000 (18:46 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3
am:
a7afa30111
Change-Id: Ice660fcf10955047eac6b2ef1c60114d2fb97b0e
Kenneth Graunke [Tue, 13 Sep 2016 17:22:11 +0000 (17:22 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am:
ba98ecd5d0 am:
96bef1f84e
am:
347b5cdac0
Change-Id: I79e17d8463d191ad27c102f82f4624a0538eafa1
Kenneth Graunke [Tue, 13 Sep 2016 17:19:43 +0000 (17:19 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am:
ba98ecd5d0
am:
96bef1f84e
Change-Id: I370b5202f02268f6013db05c4056d0ba464ad0df
Android Build Merger (Role) [Tue, 13 Sep 2016 17:18:08 +0000 (17:18 +0000)]
Merge "Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3 am:
de7e3e2be7 am:
5b059bb044" into nyc-mr1-dev-plus-aosp
Daniel Xie [Tue, 13 Sep 2016 17:18:02 +0000 (17:18 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3 am:
de7e3e2be7
am:
5b059bb044
Change-Id: Ifdf41fd7cc76a0dc13528ca8ebfee3c1d90fe7f1
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:55 +0000 (17:17 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b am:
a08f0162cf" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:51 +0000 (17:17 +0000)]
Merge "Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da am:
83035b1ffd am:
4f0f622a6c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:47 +0000 (17:17 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9 am:
e6443aa4bb" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:44 +0000 (17:17 +0000)]
Merge "Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc am:
bcb08cddcd am:
429bc243d4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:17:40 +0000 (17:17 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183 am:
da40bb0fe5" into nyc-mr1-dev-plus-aosp
Pyry Haulos [Tue, 13 Sep 2016 17:17:29 +0000 (17:17 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6 am:
0dd98a178b
am:
a08f0162cf
Change-Id: I903d6f9392d5752ef1a61ec02a443f1abd1cac55
Daniel Xie [Tue, 13 Sep 2016 17:17:28 +0000 (17:17 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930
am:
90bef986f4
Change-Id: I3dba3f051942f62abb516597aec40d67ed4cda5a
Daniel Xie [Tue, 13 Sep 2016 17:17:26 +0000 (17:17 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da am:
83035b1ffd
am:
4f0f622a6c
Change-Id: Iab3b2fdc8386d4cbe58fb66054ac4ff6a797e500
Pyry Haulos [Tue, 13 Sep 2016 17:17:24 +0000 (17:17 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00 am:
cbb5a33fb9
am:
e6443aa4bb
Change-Id: I748bc7c3bc2f817c0292d64acd9b80bb754abdbc
Daniel Xie [Tue, 13 Sep 2016 17:17:23 +0000 (17:17 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc am:
bcb08cddcd
am:
429bc243d4
Change-Id: Ie1956ed6394e4e2e9f2fc0e96cfcff457ff4f85e
Pyry Haulos [Tue, 13 Sep 2016 17:17:21 +0000 (17:17 +0000)]
Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e am:
08ab72f183
am:
da40bb0fe5
Change-Id: I03e7c240d57e18f6a9ed392d4a9d27642d92945f
Kenneth Graunke [Tue, 13 Sep 2016 17:17:12 +0000 (17:17 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA."
am:
ba98ecd5d0
Change-Id: I37c1c6e5070c6fa66d9bcec03d4ce22d6127106b
Pyry Haulos [Tue, 13 Sep 2016 17:16:56 +0000 (17:16 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159
am:
c1c16ccda1
Change-Id: I6bcb7fa13f85b79facb6d2eef65a2d0310b4f5b6
Daniel Xie [Tue, 13 Sep 2016 17:16:55 +0000 (17:16 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4
am:
0e632cea70
Change-Id: Iee2324790734f7149b3e904f79b11c265bdc6331
Pyry Haulos [Tue, 13 Sep 2016 17:16:54 +0000 (17:16 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693
am:
478b55b980
Change-Id: I6810d09ecee2e13faed2223b3d588446a0ad3143
Daniel Xie [Tue, 13 Sep 2016 17:16:54 +0000 (17:16 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af
am:
e5ca3b0f05
Change-Id: Ic2099f88177511e96aae0e80d526b8621acf987f
Pyry Haulos [Tue, 13 Sep 2016 17:16:53 +0000 (17:16 +0000)]
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp
am:
921c48e50a
Change-Id: Id4b14e5d72cec816be24b5a403aaf932f5279ea9
Daniel Xie [Tue, 13 Sep 2016 17:15:10 +0000 (17:15 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee
am:
72e1df9930
Change-Id: I5a9374fdb7183b3a0a1f5bc4d880217d27edb3dd
Pyry Haulos [Tue, 13 Sep 2016 17:15:09 +0000 (17:15 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53
am:
e0c1316159
Change-Id: I7fb762a09b8f7e004f11f64c1387bb120890d516
Daniel Xie [Tue, 13 Sep 2016 17:15:08 +0000 (17:15 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25
am:
d93a153fd4
Change-Id: I7de86ea2c0785bbeb62f0fe881d2459247eedcab
Pyry Haulos [Tue, 13 Sep 2016 17:15:08 +0000 (17:15 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575
am:
fdd3db3693
Change-Id: I853620ed4b08bde808111b9f84fef9bd0e068b4b
Daniel Xie [Tue, 13 Sep 2016 17:15:05 +0000 (17:15 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581
am:
99925909af
Change-Id: I87b00ff49e2c9f3016d5a4a88bac7fa15cd4ed48
Daniel Xie [Tue, 13 Sep 2016 17:14:16 +0000 (17:14 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930 am:
f750d4ffc3
am:
de7e3e2be7
Change-Id: I58554e0b05c826048a2851f8b0d42b2ebb24320a
Pyry Haulos [Tue, 13 Sep 2016 17:14:15 +0000 (17:14 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53 am:
e0c1316159 am:
a2d72443d6
am:
0dd98a178b
Change-Id: I54298aabd2ef70a9c550e0199bc6cf3d5d233d51
Daniel Xie [Tue, 13 Sep 2016 17:14:15 +0000 (17:14 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25 am:
d93a153fd4 am:
2e528153da
am:
83035b1ffd
Change-Id: I2afc0dc20f64adf45c272c3dbbeda14e938ba9b6
Pyry Haulos [Tue, 13 Sep 2016 17:14:14 +0000 (17:14 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575 am:
fdd3db3693 am:
16ba586a00
am:
cbb5a33fb9
Change-Id: I61116416eb47197ec5498c2fbc61d5eb98c64c4a
Daniel Xie [Tue, 13 Sep 2016 17:14:14 +0000 (17:14 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581 am:
99925909af am:
1820fdbedc
am:
bcb08cddcd
Change-Id: I72572a170e638e0c892a6b1cc29e684c5454feb7
Android Build Merger (Role) [Tue, 13 Sep 2016 17:13:12 +0000 (17:13 +0000)]
Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
5e61259f2e" into nyc-mr1-dev-plus-aosp
Treehugger Robot [Tue, 13 Sep 2016 17:13:08 +0000 (17:13 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA."
Android Build Merger (Role) [Tue, 13 Sep 2016 17:13:08 +0000 (17:13 +0000)]
Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
9efea4025d am:
56145b7325 am:
b706a204bf" into nyc-mr1-dev-plus-aosp
Daniel Xie [Tue, 13 Sep 2016 17:13:06 +0000 (17:13 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d
am:
5e61259f2e
Change-Id: I3dcc95cc573adc947772e539964210532a3bd11e
Android Build Merger (Role) [Tue, 13 Sep 2016 17:13:04 +0000 (17:13 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
41d571f045 am:
f35b2943fc am:
b5768ba6fa" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:53 +0000 (17:12 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
212df0dd39" into nyc-mr1-dev-plus-aosp
Daniel Xie [Tue, 13 Sep 2016 17:12:52 +0000 (17:12 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
9efea4025d am:
56145b7325
am:
b706a204bf
Change-Id: If9d16bc8e82f3591dd00a966948ec39f04b765d1
Pyry Haulos [Tue, 13 Sep 2016 17:12:51 +0000 (17:12 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
41d571f045 am:
f35b2943fc
am:
b5768ba6fa
Change-Id: Ibb084c75e1aed377aaf4fa206d81c742d7dccb18
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:48 +0000 (17:12 +0000)]
Merge changes from topic 'am-
d93effc2c36944e2a5199ec02939cb56' into nyc-mr1-dev-plus-aosp
* changes:
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
636d5cdf56
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
abbf2e05e4
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
aa4fda92b6
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:42 +0000 (17:12 +0000)]
Merge "Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
81ec722053" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:39 +0000 (17:12 +0000)]
Merge changes from topic 'am-
77ae52a26b474123bdafaa0a5618ec7b' into nyc-mr1-dev-plus-aosp
* changes:
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3 am:
fad5a803ae am:
9eb945b2c3
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
48cfb69133 am:
19ac07e772 am:
03b5035568
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
8b3a1c98ee am:
732baa1049 am:
420d8d6542
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:34 +0000 (17:12 +0000)]
Merge "Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
52d1a05322 am:
1f5739d5f0 am:
a1245f0e16" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:30 +0000 (17:12 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
8fd6597ac6 am:
6cbc11b8ea am:
95757ca384" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:26 +0000 (17:12 +0000)]
Merge "Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
46b42733de am:
114ecc50a1 am:
f71fa09b2d" into nyc-mr1-dev-plus-aosp
Pyry Haulos [Tue, 13 Sep 2016 17:12:26 +0000 (17:12 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3
am:
212df0dd39
Change-Id: Ia6583cf339042bb5a519f9e729724def67494ad8
Daniel Xie [Tue, 13 Sep 2016 17:12:25 +0000 (17:12 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f
am:
636d5cdf56
Change-Id: I4c2a49e924b8423bb01553e6127689bbfda26fdd
Android Build Merger (Role) [Tue, 13 Sep 2016 17:12:23 +0000 (17:12 +0000)]
Merge "CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333 am:
22bac0ff72 am:
0fa6891dba" into nyc-mr1-dev-plus-aosp
Pyry Haulos [Tue, 13 Sep 2016 17:12:18 +0000 (17:12 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7
am:
abbf2e05e4
Change-Id: I964cfaf509b8f6253568a1245cd80d4c0488b2cc
Nanley Chery [Tue, 13 Sep 2016 17:12:10 +0000 (17:12 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36
am:
aa4fda92b6
Change-Id: I3c129508f1f81c7580b4b2b8a37d4f04f62d55c1
Daniel Xie [Tue, 13 Sep 2016 17:12:09 +0000 (17:12 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471
am:
81ec722053
Change-Id: I314bfce6c8fde5242bc16a3ad1ea584dfbef1091
Daniel Xie [Tue, 13 Sep 2016 17:12:03 +0000 (17:12 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3 am:
fad5a803ae
am:
9eb945b2c3
Change-Id: I7ee71b88a41508adf514de850ea9237d26f77061
Pyry Haulos [Tue, 13 Sep 2016 17:12:01 +0000 (17:12 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
48cfb69133 am:
19ac07e772
am:
03b5035568
Change-Id: I81117c01ec8d6fab49c85eafb5c9576250a08791
Nanley Chery [Tue, 13 Sep 2016 17:11:58 +0000 (17:11 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
8b3a1c98ee am:
732baa1049
am:
420d8d6542
Change-Id: I1f8b0b383e9139c96cd0505805a7bdf555567312
Daniel Xie [Tue, 13 Sep 2016 17:11:56 +0000 (17:11 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
52d1a05322 am:
1f5739d5f0
am:
a1245f0e16
Change-Id: I28eca52dea3f31b58ade01af3d299fe830b5cfc7
Pyry Haulos [Tue, 13 Sep 2016 17:11:56 +0000 (17:11 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
8fd6597ac6 am:
6cbc11b8ea
am:
95757ca384
Change-Id: I0d032d86db6b7a6fa3ae98864e4d64e6df32908b
Daniel Xie [Tue, 13 Sep 2016 17:11:54 +0000 (17:11 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
46b42733de am:
114ecc50a1
am:
f71fa09b2d
Change-Id: I0498ea1efd3ea57a6632eba0f678c3dc409fa021
Pyry Haulos [Tue, 13 Sep 2016 17:11:54 +0000 (17:11 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333 am:
22bac0ff72
am:
0fa6891dba
Change-Id: I1e841ccb6489e45ea07bbad9b2854da0e2f96f69
Pyry Haulos [Tue, 13 Sep 2016 17:11:52 +0000 (10:11 -0700)]
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp
Change-Id: Ibef4448a5117d7f50e43bcd7356342f8765664cd
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:52 +0000 (17:11 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
61f4551451" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:48 +0000 (17:11 +0000)]
Merge "Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
d84ea44b50" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:46 +0000 (17:11 +0000)]
Merge "Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47 am:
c488b48152 am:
4931f183ed am:
9107fc2ae7" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:45 +0000 (17:11 +0000)]
Merge "CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
63ed9c7d75" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:43 +0000 (17:11 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
1d081fa2ba am:
ea0668830c am:
bfbd5bc0da" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:39 +0000 (17:11 +0000)]
Merge "Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47 am:
e924bf4dc7" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Sep 2016 17:11:37 +0000 (17:11 +0000)]
Merge changes from topic 'am-
47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus-aosp
* changes:
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9 am:
00ca87ab81 am:
1209ca758b
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb am:
b4ba085af5 am:
7bf802cc00
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
f8e9fa9d52 am:
33bde8aa3e am:
3a0c9dfeba
Pyry Haulos [Tue, 13 Sep 2016 17:11:24 +0000 (17:11 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b
am:
61f4551451
Change-Id: I84e222e6509032fc00bac39a453541d0aa3d8704
Daniel Xie [Tue, 13 Sep 2016 17:11:23 +0000 (17:11 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34
am:
d84ea44b50
Change-Id: Icefa5fbe4f42a1e936435b306962a04d82d7e34a
Pyry Haulos [Tue, 13 Sep 2016 17:11:22 +0000 (17:11 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0
am:
63ed9c7d75
Change-Id: I882df26eece143770db57fb25d5c6ec66ddb3f58
Daniel Xie [Tue, 13 Sep 2016 17:11:21 +0000 (17:11 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47
am:
e924bf4dc7
Change-Id: I2c303f99b01b8034391edfef27b46e7c78312823
Daniel Xie [Tue, 13 Sep 2016 17:11:20 +0000 (17:11 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47 am:
c488b48152 am:
4931f183ed
am:
9107fc2ae7
Change-Id: Ib2a071fb5216e522dbd4ff3323c2482e75685dc6
Pyry Haulos [Tue, 13 Sep 2016 17:11:20 +0000 (17:11 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
1d081fa2ba am:
ea0668830c
am:
bfbd5bc0da
Change-Id: Id7f52cecd158c5aca339848316f3986ad0681026
Pyry Haulos [Tue, 13 Sep 2016 17:11:20 +0000 (17:11 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957
am:
e9ada378d5
Change-Id: I96a0fc9fc72a69c84cb19f0652098bea62caf3b9
Daniel Xie [Tue, 13 Sep 2016 17:11:18 +0000 (17:11 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9 am:
00ca87ab81
am:
1209ca758b
Change-Id: Ic2253ffff67cc40db13f98a517ee994b950457b8
Pyry Haulos [Tue, 13 Sep 2016 17:11:16 +0000 (17:11 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb am:
b4ba085af5
am:
7bf802cc00
Change-Id: I759fbeff6e29dc2b200256b0e7a696c103180b73
Pyry Haulos [Tue, 13 Sep 2016 17:11:13 +0000 (17:11 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
96a5fefcf2 am:
f8e9fa9d52 am:
33bde8aa3e
am:
3a0c9dfeba
Change-Id: I0d1f230d4428362ec51466a962eccefb193a58bd
Pyry Haulos [Tue, 13 Sep 2016 17:10:15 +0000 (17:10 +0000)]
Remove a few EGL tests using RGBA4 format from mustpass am:
3ffc2f243a am:
04c959ca67 am:
9833f3493e
am:
08ab72f183
Change-Id: Ic053ad09b8df96136bfbcc851d898e0aace113d1
Daniel Xie [Tue, 13 Sep 2016 17:10:14 +0000 (17:10 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff am:
a489f7548d am:
9efea4025d
am:
56145b7325
Change-Id: I0866fabaec6f22c4b0c70e3b900883f06f84af1a
Pyry Haulos [Tue, 13 Sep 2016 17:10:12 +0000 (17:10 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6 am:
69c9f158f3 am:
41d571f045
am:
f35b2943fc
Change-Id: I8a6e4e8cf68be7762cb510ea7f7ae4ad29c34987
Daniel Xie [Tue, 13 Sep 2016 17:09:26 +0000 (17:09 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f am:
b97e86700f am:
91a977c1d3
am:
fad5a803ae
Change-Id: Ibfd51487f4238a90227e29c2d37a9b87c499f8bf
Pyry Haulos [Tue, 13 Sep 2016 17:09:23 +0000 (17:09 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours am:
29574ad7e7 am:
48cfb69133
am:
19ac07e772
Change-Id: Ibe523d2ab9d7a815e785b36a795ecac3e4c2acea
Daniel Xie [Tue, 13 Sep 2016 17:09:21 +0000 (17:09 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff
am:
a489f7548d
Change-Id: I71ffb75b8158e205eae7f1c9302c7393f225e102
Nanley Chery [Tue, 13 Sep 2016 17:09:21 +0000 (17:09 +0000)]
CP: Fix required sample count tests am:
f6a815214a am:
dd22d24f36 am:
8b3a1c98ee
am:
732baa1049
Change-Id: I6f68333933a781a8e14c7026af4ad39339e361e9
Daniel Xie [Tue, 13 Sep 2016 17:09:20 +0000 (17:09 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af am:
c961253471 am:
52d1a05322
am:
1f5739d5f0
Change-Id: Id0ebfbe619ac5ae5a0f37ca60e8fb58c0d507592
Pyry Haulos [Tue, 13 Sep 2016 17:09:20 +0000 (17:09 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752 am:
f44a35c51b am:
8fd6597ac6
am:
6cbc11b8ea
Change-Id: Ic82b45fcac5706040f9506e4d30ddd4df3a891ff
Daniel Xie [Tue, 13 Sep 2016 17:09:19 +0000 (17:09 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476 am:
37f5919c34 am:
46b42733de
am:
114ecc50a1
Change-Id: Id4e31f7790b32a24ec11bdf7aa07748fb50ea5be
Pyry Haulos [Tue, 13 Sep 2016 17:09:18 +0000 (17:09 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d am:
705c0dd3b0 am:
04702a9333
am:
22bac0ff72
Change-Id: I84a29fcdf31a8b9cfe1ee988dcc4103053db2692
Daniel Xie [Tue, 13 Sep 2016 17:08:46 +0000 (17:08 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214 am:
c26f38fd47 am:
c488b48152
am:
4931f183ed
Change-Id: I0f759e611164efd4e105ca2d5a1fab538872a00d
Pyry Haulos [Tue, 13 Sep 2016 17:08:45 +0000 (17:08 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37 am:
b040934957 am:
1d081fa2ba
am:
ea0668830c
Change-Id: I1d89b4a3e9538886f2471718b8c6405e59f008ad
Daniel Xie [Tue, 13 Sep 2016 17:08:45 +0000 (17:08 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2 am:
a7dc5ef89b am:
4b783d2db9
am:
00ca87ab81
Change-Id: Iaa554a2995f23acf71f7606d0ddf00cb8fc44c26
Daniel Xie [Tue, 13 Sep 2016 17:08:42 +0000 (17:08 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee am:
72e1df9930
am:
f750d4ffc3
Change-Id: Ic95669b52788fb2db64600d60d81dedb9922e131
Pyry Haulos [Tue, 13 Sep 2016 17:08:42 +0000 (17:08 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
d030a8fd2b am:
fc557472cb
am:
b4ba085af5
Change-Id: Ic774a7addb3fca63ae8f7eee3522b44021c31c91
projects / platform / upstream / VK-GL-CTS.git / log