Pyry Haulos [Tue, 13 Sep 2016 19:05:26 +0000 (19:05 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa am:
a87bd26f5c
am:
18e03dc5cb
Change-Id: Id04fcee398631be0de1d7fb2d8f0cdeee82b942a
Pyry Haulos [Tue, 13 Sep 2016 19:05:13 +0000 (19:05 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b am:
c68e33a5fb
am:
1353735b0f
Change-Id: I743cf59d1a0c5b344fa63e7481bb52e6a2a1ed7b
Unsuk Jung [Tue, 13 Sep 2016 19:05:11 +0000 (19:05 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
21365f0da3
am:
d3ca595ddb
Change-Id: I8b1a9f61648db5d86941e6f07718c9f10e596705
Haixia Shi [Tue, 13 Sep 2016 19:05:09 +0000 (19:05 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
a520e3ba8d
am:
07ce77fe3d
Change-Id: I68ecac3ec8796d64b8bb58f4952264d5bf788a8f
Daniel Xie [Tue, 13 Sep 2016 19:04:35 +0000 (19:04 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours am:
41d3ecd6bd -s ours
am:
521f245edc -s ours
Change-Id: Id7f3202c8d778f339e21c01c93fb70e455c8d194
Jarkko Pyry [Tue, 13 Sep 2016 19:04:34 +0000 (19:04 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
20259b77cc -s ours
am:
b3208d09b8 -s ours
Change-Id: I64bc89088ab25bd7a1bf8f434a1bde626575e332
Daniel Xie [Tue, 13 Sep 2016 19:04:33 +0000 (19:04 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
c3a2323bb0
am:
f5175ed08f
Change-Id: I3f66c9046e6f681f2a1e8909d7e4f6c31153117a
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
Pyry Haulos [Tue, 13 Sep 2016 19:02:21 +0000 (19:02 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa
am:
a87bd26f5c
Change-Id: Ida76c6627f3004632bedf34795f5fda667036c81
Pyry Haulos [Tue, 13 Sep 2016 19:02:16 +0000 (19:02 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b
am:
c68e33a5fb
Change-Id: If10b8acb49798beb113c0d7d3b09ea06975eb27e
Unsuk Jung [Tue, 13 Sep 2016 19:02:16 +0000 (19:02 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6
am:
21365f0da3
Change-Id: I8f4111b3bd59b975a3cb2776a440ac168a3acadd
Haixia Shi [Tue, 13 Sep 2016 19:02:15 +0000 (19:02 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667
am:
a520e3ba8d
Change-Id: Iab4a5101458004aa42b20692bd0e484d2148675c
Daniel Xie [Tue, 13 Sep 2016 19:01:34 +0000 (19:01 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours
am:
41d3ecd6bd -s ours
Change-Id: Iaf348d31acaa40b54f51377558bf368d736a10b3
Jarkko Pyry [Tue, 13 Sep 2016 19:01:33 +0000 (19:01 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours
am:
20259b77cc -s ours
Change-Id: I59aea5b40c8b02f3d761717dfd18b5293f344229
Daniel Xie [Tue, 13 Sep 2016 19:01:33 +0000 (19:01 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c
am:
c3a2323bb0
Change-Id: I8ddf6e81bb2a7af1f520fac69eaf175e3a86a89c
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
Pyry Haulos [Tue, 13 Sep 2016 18:47:26 +0000 (18:47 +0000)]
CP: Limit VkInstance count in object_management.multithreaded*
am:
1735b7bcaa
Change-Id: If043d3065cb9fecc87e1a012bef49af5ef1fd8b5
Pyry Haulos [Tue, 13 Sep 2016 18:47:23 +0000 (18:47 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests
am:
80ddee1f9b
Change-Id: If775ead51e363bfd90a49cca10df6f55a3f598f3
Unsuk Jung [Tue, 13 Sep 2016 18:47:21 +0000 (18:47 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338
am:
9ebe97f0a6
Change-Id: I3774107d42492442ffdcda985f90b706d55a0eff
Haixia Shi [Tue, 13 Sep 2016 18:47:21 +0000 (18:47 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409
am:
635f454667
Change-Id: Id987cef0666752e9237ef4433892c5accd3f8379
Daniel Xie [Tue, 13 Sep 2016 18:46:55 +0000 (18:46 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours
am:
245bd3ffc4 -s ours
Change-Id: I96c93068b1bb4040ffbac15bd3cef9ae2340d2f1
Jarkko Pyry [Tue, 13 Sep 2016 18:46:55 +0000 (18:46 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours
am:
b136cc9a59 -s ours
Change-Id: Ie181e39e7e799eed5ec5f817fda809e86c082800
Daniel Xie [Tue, 13 Sep 2016 18:46:54 +0000 (18:46 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745
am:
5dee7d519c
Change-Id: I7fbf4c4a02279fe743a1b088d484acbd948ce604
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: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
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
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
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."
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
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
Pyry Haulos [Tue, 13 Sep 2016 17:08:27 +0000 (17:08 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6
am:
69c9f158f3
Change-Id: I4286998b8d23e86efdb8b808716334c53794d3f8
Daniel Xie [Tue, 13 Sep 2016 17:08:25 +0000 (17:08 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f
am:
b97e86700f
Change-Id: Id15f3a2fff1eaee22c18bd5e5cbf9b30e54bfc6b
Pyry Haulos [Tue, 13 Sep 2016 17:08:23 +0000 (17:08 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours
am:
29574ad7e7
Change-Id: I6e04aa746a63e016bc4867c960df92192eea1509
Nanley Chery [Tue, 13 Sep 2016 17:08:21 +0000 (17:08 +0000)]
CP: Fix required sample count tests am:
f6a815214a
am:
dd22d24f36
Change-Id: Ie42409ea9f741e228b81753e1f090fc73b362467
Daniel Xie [Tue, 13 Sep 2016 17:08:19 +0000 (17:08 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am:
f594c550af
am:
c961253471
Change-Id: I6dc436e630eb32577c35e192f82f065ad0226e19
Pyry Haulos [Tue, 13 Sep 2016 17:07:49 +0000 (17:07 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am:
3962010752
am:
f44a35c51b
Change-Id: Iea25996ca228f982e63cb5816b67fc91a34fe77a
Daniel Xie [Tue, 13 Sep 2016 17:07:46 +0000 (17:07 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am:
54d4c9f476
am:
37f5919c34
Change-Id: I3e2fbcbaac1c76e48542dd2f53c55ead31679eae
Pyry Haulos [Tue, 13 Sep 2016 17:07:45 +0000 (17:07 +0000)]
CP: Fix geometry shader support check am:
0da63cfe1d
am:
705c0dd3b0
Change-Id: Ic7102e3b98b25acfeb356f185ba273cc49ef583a
Daniel Xie [Tue, 13 Sep 2016 17:07:43 +0000 (17:07 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am:
b03302d214
am:
c26f38fd47
Change-Id: I7c1cae1d11b2235eaef139f3cff3c6627ed6484c
Pyry Haulos [Tue, 13 Sep 2016 17:07:42 +0000 (17:07 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am:
66ee615c37
am:
b040934957
Change-Id: I0ca3db2495d8fadf1bc897b383a9c2ebc07a0104
Daniel Xie [Tue, 13 Sep 2016 17:00:43 +0000 (17:00 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am:
37eaa88ac2
am:
a7dc5ef89b
Change-Id: Ic518d88a1f22467db42280bcc5e0fc7d413e6c61
Pyry Haulos [Tue, 13 Sep 2016 17:00:41 +0000 (17:00 +0000)]
CP: Limit VkInstance count in object_management.multithreaded* am:
1735b7bcaa
am:
d030a8fd2b
Change-Id: Icb7564c2ab89b212636ad71ea39239deebcab983
Pyry Haulos [Tue, 13 Sep 2016 17:00:38 +0000 (17:00 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
80ddee1f9b
am:
96a5fefcf2
Change-Id: Icfbb32ba5e2e7e5dd2d80a0617cc0a31d9a1b8f6
Daniel Xie [Tue, 13 Sep 2016 16:59:16 +0000 (16:59 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
am:
84173082ee
Change-Id: I987cefc4e0a489154694c1d807c9160ea3174672
Pyry Haulos [Tue, 13 Sep 2016 16:59:16 +0000 (16:59 +0000)]
CP: Require 'master' config to be supported in Android CTS
am:
03d217bb53
Change-Id: I6ee82fc14e103e66fef989567c91e8af4b4d1300
Daniel Xie [Tue, 13 Sep 2016 16:58:58 +0000 (16:58 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev
am:
1ad2703e25
Change-Id: I6bb7df75cf4897482105fa4601b500345f6c3d49
Pyry Haulos [Tue, 13 Sep 2016 16:58:57 +0000 (16:58 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests
am:
521bb16575
Change-Id: Ia2691e970ce7794cd7ea5f6bc90f576a0c9bea25
Daniel Xie [Tue, 13 Sep 2016 16:58:56 +0000 (16:58 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev
am:
451fa7c581
Change-Id: I4a236260012a36ff7c56e98b99f63dc124f9f500
Pyry Haulos [Tue, 13 Sep 2016 16:58:55 +0000 (16:58 +0000)]
Remove a few EGL tests using RGBA4 format from mustpass
am:
3ffc2f243a
Change-Id: I2e9b98a3a18b97b1d77ed8408d468ffa7c6b310c
Daniel Xie [Tue, 13 Sep 2016 16:58:31 +0000 (16:58 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev
am:
a268fcbaff
Change-Id: I18cc3ec3b8aaad7d2a81908045b78bb99cad34c0
Pyry Haulos [Tue, 13 Sep 2016 16:58:30 +0000 (16:58 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device
am:
ef5688dda6
Change-Id: Iad514fcf15e4346d7609b72bbf7a68310f1f740a
Daniel Xie [Tue, 13 Sep 2016 16:57:19 +0000 (16:57 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
am:
83683a367f
Change-Id: I29dee0d68369668c015578941b19c1a04ad12026
Pyry Haulos [Tue, 13 Sep 2016 16:57:19 +0000 (16:57 +0000)]
DO NOT MERGE Allow old behavior in image format property tests
am:
0825a289c0 -s ours
Change-Id: Ieca132cc84b227a00007ac86c69197890a48bdfa
Nanley Chery [Tue, 13 Sep 2016 16:57:18 +0000 (16:57 +0000)]
CP: Fix required sample count tests
am:
f6a815214a
Change-Id: I5fa4a1342e6b8ccefb4d1e3782a456d3bf64328a
Daniel Xie [Tue, 13 Sep 2016 16:57:17 +0000 (16:57 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev
am:
f594c550af
Change-Id: I3625f5712b3608d707772bbd8619098ad2bb7afa
Pyry Haulos [Tue, 13 Sep 2016 16:57:17 +0000 (16:57 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests
am:
3962010752
Change-Id: I03fbe13d5dd307497a33d89c4d4acb2abf758087
Daniel Xie [Tue, 13 Sep 2016 16:57:17 +0000 (16:57 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev
am:
54d4c9f476
Change-Id: I74b0651ad282c00e5ac515acd566252855ad475a
Pyry Haulos [Tue, 13 Sep 2016 16:57:16 +0000 (16:57 +0000)]
CP: Fix geometry shader support check
am:
0da63cfe1d
Change-Id: I450620a3ba64a02a7e4241a7b5f8f3fb2ec22aa0
Daniel Xie [Tue, 13 Sep 2016 16:57:16 +0000 (16:57 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev
am:
b03302d214
Change-Id: If061883679a5e21e9364a0ebe7eaad34ba2faf4c
Pyry Haulos [Tue, 13 Sep 2016 16:57:15 +0000 (16:57 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge
am:
66ee615c37
Change-Id: I91d202db27ad1cf7cfb1c0efcea166daa4257f81
Daniel Xie [Tue, 13 Sep 2016 16:57:15 +0000 (16:57 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev
am:
37eaa88ac2
Change-Id: Ifd718e72afa57309ea88cfb09f9073cd87c1c116
Pyry Haulos [Tue, 13 Sep 2016 16:57:15 +0000 (16:57 +0000)]
CP: Limit VkInstance count in object_management.multithreaded*
am:
1735b7bcaa
Change-Id: I39a1830375fcf215ef30cfc4fbb8571c482f7a7b
Pyry Haulos [Tue, 13 Sep 2016 16:57:13 +0000 (16:57 +0000)]
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests
am:
80ddee1f9b
Change-Id: I425d8b909cf1323888bf06293822fcb958050806
Daniel Xie [Tue, 13 Sep 2016 16:43:43 +0000 (16:43 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:39 +0000 (16:43 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:35 +0000 (16:43 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:30 +0000 (16:43 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:20 +0000 (16:43 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
* changes:
DO NOT MERGE Allow old behavior in image format property tests
CP: Fix required sample count tests
Daniel Xie [Tue, 13 Sep 2016 16:43:15 +0000 (16:43 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:11 +0000 (16:43 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:43:06 +0000 (16:43 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 16:42:54 +0000 (16:42 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev
* changes:
CP: Limit VkInstance count in object_management.multithreaded*
CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests
Kenneth Graunke [Tue, 13 Sep 2016 01:50:41 +0000 (01:50 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
ae7f8e0a07
am:
15c4abf347
Change-Id: I05892db403d9ea130de1619a407ecf2f352bc2ea
Kenneth Graunke [Tue, 13 Sep 2016 01:48:10 +0000 (01:48 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests.
am:
ae7f8e0a07
Change-Id: Iab6253127f05b53ac48d47f8f5372c2bff7ed187
Kenneth Graunke [Mon, 12 Sep 2016 19:37:08 +0000 (12:37 -0700)]
Fix internal format/type for 3D + depth/stencil negative API tests.
According to the ES 3.2 specification:
"Textures with a base internal format of DEPTH_COMPONENT, DEPTH_STENCIL
or STENCIL_INDEX are supported by texture image specification commands
only if target is TEXTURE_2D, TEXTURE_2D_MULTISAMPLE, TEXTURE_2D_ARRAY,
TEXTURE_2D_MULTISAMPLE_ARRAY, TEXTURE_CUBE_MAP or TEXTURE_CUBE_MAP_ARRAY.
Using these formats in conjunction with any other target will result in
an INVALID_OPERATION error."
This subtest tried to check the above error condition, but it specified
GL_DEPTH_STENCIL / GL_DEPTH_COMPONENT as format, rather than internalFormat.
Since the above text calls out "base internal format", we should specify
it as internalFormat.
We also change GL_DEPTH_STENCIL to use GL_UNSIGNED_INT_24_8 rather than
GL_UNSIGNED_BYTE, as that combination was illegal for a different reason
than the one the test intended to check.
Kenneth Graunke [Sun, 4 Sep 2016 07:34:47 +0000 (00:34 -0700)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA.
The dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.
bit_count_per_two_samples.multisample_{texture,renderbuffer}_{1,2}
tests report:
Verifying gl_SampleMaskIn.
Fragment shader may be invoked [ceil(numSamples/2), numSamples] times.
=> gl_SampleMaskIn should have the number of bits set in range
[1, numSamples - ceil(numSamples/2) + 1]:
which suggests that maxBitCount should be ceil(2/2) + 1 = 1 + 1 = 2.
However, it then says:
Setting minBitCount = 1, maxBitCount = 1.
Having two bits should be acceptable for 2x MSAA.
This patch drops the special case for 1x/2x MSAA, making them work
like all the other MSAA levels.
Dan Albert [Fri, 9 Sep 2016 08:02:43 +0000 (08:02 +0000)]
Bump libdeqp to android-22. am:
e0ef7118f8
am:
ce83935903
Change-Id: I4c531b447ff814480275313ca2560a254f5ff2bd
Dan Albert [Fri, 9 Sep 2016 07:59:13 +0000 (07:59 +0000)]
Bump libdeqp to android-22.
am:
e0ef7118f8
Change-Id: If02fbee27cd0efb1b8f9986015555d0fbeca0d53
Dan Albert [Thu, 8 Sep 2016 23:07:20 +0000 (16:07 -0700)]
Bump libdeqp to android-22.
The tests and APK are built with android-22.
Test: mm
Bug: None
Change-Id: I34a677c55443f8750098db1335919704b8b16010
Pyry Haulos [Thu, 8 Sep 2016 22:04:49 +0000 (22:04 +0000)]
Remove XML mustpass lists am:
af8270690a
am:
0988065e4f
Change-Id: Id2fb418780a8614852a42f7e7fd0102b5e0e1ae5
Pyry Haulos [Thu, 8 Sep 2016 22:04:43 +0000 (22:04 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
42d91db0aa
am:
eb419455ef
Change-Id: I6b2863ebc1b2d82b2f8f45d4cecec276e78b0e03
Pyry Haulos [Thu, 8 Sep 2016 22:02:13 +0000 (22:02 +0000)]
Remove XML mustpass lists
am:
af8270690a
Change-Id: Idf68478148dab81be2f0ff9e5dd1fa66d23684b3
Pyry Haulos [Thu, 8 Sep 2016 22:02:11 +0000 (22:02 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
42d91db0aa
Change-Id: If6c23776f35d966d652e23dd3704067a9c15c252
Pyry Haulos [Wed, 24 Aug 2016 22:19:40 +0000 (15:19 -0700)]
Remove XML mustpass lists
Android CTS no longer uses per-package XML test lists.
Change-Id: I5e0ed6f71b0ba36b9d9cefc563154a4768a40a3f
Pyry Haulos [Thu, 8 Sep 2016 20:15:50 +0000 (13:15 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: I093c350e439e256a070c1bd7d199fafdb46bd2d8
Pyry Haulos [Thu, 8 Sep 2016 20:14:06 +0000 (13:14 -0700)]
Add new files to Android.mk
Change-Id: I45a16aba19e12533de3c60eb4a3c75f117c1410e
Pyry Haulos [Thu, 8 Sep 2016 18:31:12 +0000 (14:31 -0400)]
Merge "Add tests for dynamic indexing of push constants" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 18:20:57 +0000 (14:20 -0400)]
Merge "Add tests for simultaneous use of secondary command buffer" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 18:20:37 +0000 (14:20 -0400)]
Merge "Add scissoring tests" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 18:19:48 +0000 (14:19 -0400)]
Merge "Add new pipeline barrier tests to mustpass" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 18:19:32 +0000 (14:19 -0400)]
Merge "Fix wrong test in copies and blitting testcases" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 18:19:10 +0000 (14:19 -0400)]
Merge "dEQP-VK.pipeline.image.*: added test cases for 3D images with NPOT sizes." into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 18:18:36 +0000 (14:18 -0400)]
Merge "Extend shader built-in variable tests" into vulkan-cts-1.0-dev
projects / platform / upstream / VK-GL-CTS.git / log