platform/upstream/VK-GL-CTS.git
8 years agoMerge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
Daniel Xie [Tue, 13 Sep 2016 19:07:35 +0000 (19:07 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee
am: e9835d0aa0

Change-Id: Ife2715575e55a709cda64fb854743d40cf38332c

8 years agoCP: Require 'master' config to be supported in Android CTS am: 03d217bb53
Pyry Haulos [Tue, 13 Sep 2016 19:07:34 +0000 (19:07 +0000)]
CP: Require 'master' config to be supported in Android CTS am: 03d217bb53
am: 5eaf6f98bd

Change-Id: If2ce0d401e5d46e6746bdbb0ec248bf49fa0d6b3

8 years agoMerge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts...
Daniel Xie [Tue, 13 Sep 2016 19:07:33 +0000 (19:07 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am: 1ad2703e25
am: 913aabf8c3

Change-Id: I8c32d73f6585e7b0c9c28ed19d3a645f8b95c816

8 years agoCP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am: 521bb16575
Pyry Haulos [Tue, 13 Sep 2016 19:07:33 +0000 (19:07 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am: 521bb16575
am: 8d8aa8f78a

Change-Id: I4ba15b1907dce4478ab5c6e532de6c5a962acd31

8 years agoMerge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev...
Daniel Xie [Tue, 13 Sep 2016 19:07:32 +0000 (19:07 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am: 451fa7c581
am: 65b5f9fa73

Change-Id: I4d37488b7995de46c34b0018a3f07ef98a89f335

8 years agoresolve merge conflicts of 3ffc2f2 to master
Pyry Haulos [Tue, 13 Sep 2016 19:05:21 +0000 (19:05 +0000)]
resolve merge conflicts of 3ffc2f2 to master
am: f2c82779ae

Change-Id: If42ab81eae41f7e0c61abb4997df4221361fd0b7

8 years agoMerge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
Daniel Xie [Tue, 13 Sep 2016 19:05:20 +0000 (19:05 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff
am: 30b11fbc7b

Change-Id: I6bd7765879a05665e975b97ae501fcb1616159dd

8 years agoCP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6
Pyry Haulos [Tue, 13 Sep 2016 19:04:45 +0000 (19:04 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6
am: 9872f68221

Change-Id: I397b9b4f8abc857ce917e8a539a65ad4f965715b

8 years agoMerge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f
Daniel Xie [Tue, 13 Sep 2016 19:04:44 +0000 (19:04 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f
am: a69387d887

Change-Id: I9c336b20b449ba22fa94b3a61bbcb9bbec76e8d8

8 years agoDO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s...
Pyry Haulos [Tue, 13 Sep 2016 19:04:38 +0000 (19:04 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0  -s ours
am: c9b0c26d5c  -s ours

Change-Id: I28c85a91c915aee441951ffaffcb7b8fe0c57f5e

8 years agoCP: Fix required sample count tests am: f6a815214a
Nanley Chery [Tue, 13 Sep 2016 19:04:33 +0000 (19:04 +0000)]
CP: Fix required sample count tests am: f6a815214a
am: b738653968

Change-Id: I56546a9ab91eadfcfb6a1e39704652c84376cd7e

8 years agoMerge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat...
Daniel Xie [Tue, 13 Sep 2016 19:04:33 +0000 (19:04 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev am: f594c550af
am: d1f5a0bee2

Change-Id: Ibc284e55ba659f7775c4ad6a1561025bcdea02d7

8 years agoCP: Fix ext check in EXT_draw_buffers_indexed negative tests am: 3962010752
Pyry Haulos [Tue, 13 Sep 2016 19:03:50 +0000 (19:03 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests am: 3962010752
am: bfd422cf9a

Change-Id: I2a572f2925098c51c5f31b592f09e2978cfa92e1

8 years agoMerge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476
Daniel Xie [Tue, 13 Sep 2016 19:03:49 +0000 (19:03 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476
am: 0c725c5a41

Change-Id: I1f44b3c0449459a57c28748c01caa8d012971439

8 years agoCP: Fix geometry shader support check am: 0da63cfe1d
Pyry Haulos [Tue, 13 Sep 2016 19:03:48 +0000 (19:03 +0000)]
CP: Fix geometry shader support check am: 0da63cfe1d
am: f4ad130d7b

Change-Id: Ibd39ccf75c4f9e13dfd89893cd3a6032d95d3334

8 years agoMerge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts...
Daniel Xie [Tue, 13 Sep 2016 19:03:48 +0000 (19:03 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev am: b03302d214
am: 2fd8aaff45

Change-Id: I3d64c12dfcc07bbd10da83f18f393c6ae5a0c222

8 years agoCP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am: 66ee615c37
Pyry Haulos [Tue, 13 Sep 2016 19:03:47 +0000 (19:03 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge am: 66ee615c37
am: aef7f35add

Change-Id: I536c8dcb7d5474489374c8c0ac3d17b58512eb14

8 years agoMerge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2
Daniel Xie [Tue, 13 Sep 2016 19:02:28 +0000 (19:02 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2
am: 89da6ddd7b

Change-Id: Ia669fe57bd54b6a6dd233f00e3501ee5e8864826

8 years agoCP: Limit VkInstance count in object_management.multithreaded* am: 1735b7bcaa
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

8 years agoCP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am: 80ddee1f9b
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

8 years agoMerge "Don't require supported binary formats in negative tests." into marshmallow...
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

8 years agoDon't require supported binary formats in negative tests. am: 7cd59a4409 am: 635f454667
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

8 years agoMerge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
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

8 years agoDO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: b136c...
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

8 years agoMerge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745 am: 5dee7d519c
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

8 years agoFix GLES2 format mismatch am: 4b80682693 am: 9a9c641a84
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

8 years agoIncrease no-data timeout to 5 seconds. am: d00b71cbc3 am: a7afa30111
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

8 years agoMerge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 18:59:03 +0000 (18:59 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
am: 84173082ee

Change-Id: I766949543602454bff23742a314d00c4532f41d5

8 years agoCP: Require 'master' config to be supported in Android CTS
Pyry Haulos [Tue, 13 Sep 2016 18:59:02 +0000 (18:59 +0000)]
CP: Require 'master' config to be supported in Android CTS
am: 03d217bb53

Change-Id: Ic330a2d7eb30081a3f7642b1e804f6ad3adfe83f

8 years agoMerge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 18:59:00 +0000 (18:59 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev
am: 1ad2703e25

Change-Id: I30672a8055d06a2fabaa57ac6b27af29d5a1f786

8 years agoCP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests
Pyry Haulos [Tue, 13 Sep 2016 18:58:59 +0000 (18:58 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests
am: 521bb16575

Change-Id: Ic1cbab12b8439e65790c3f0c9bf10f1bae2e7ebb

8 years agoMerge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 18:58:56 +0000 (18:58 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev
am: 451fa7c581

Change-Id: If88bb8b4171508813a0127bbaf27867a4510a01e

8 years agoresolve merge conflicts of 3ffc2f2 to master
Pyry Haulos [Tue, 13 Sep 2016 18:55:40 +0000 (11:55 -0700)]
resolve merge conflicts of 3ffc2f2 to master

Change-Id: I07d298ed07bd4ddf30742317bab83b660df76fb9

8 years agoMerge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 18:48:41 +0000 (18:48 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev
am: a268fcbaff

Change-Id: Ic3fe280bfa845811e3331b787c5b3ce0e82d3416

8 years agoCP: Reduce max iter count in alloc_callback_fail.device
Pyry Haulos [Tue, 13 Sep 2016 18:48:40 +0000 (18:48 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device
am: ef5688dda6

Change-Id: I6d9a12724828b96cbb9f7ecc74f36d3a9419d167

8 years agoMerge changes I212a8bc2,I476b6586 into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 18:48:35 +0000 (18:48 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
am: 83683a367f

Change-Id: Id16aa41cac62e174574184d9deb00550dbd507a1

8 years agoDO NOT MERGE Allow old behavior in image format property tests
Pyry Haulos [Tue, 13 Sep 2016 18:48:34 +0000 (18:48 +0000)]
DO NOT MERGE Allow old behavior in image format property tests
am: 0825a289c0  -s ours

Change-Id: I3a0eb1f790ddfb0ca10bba0717e964d1139513bf

8 years agoCP: Fix required sample count tests
Nanley Chery [Tue, 13 Sep 2016 18:48:27 +0000 (18:48 +0000)]
CP: Fix required sample count tests
am: f6a815214a

Change-Id: I7e697e19ac7f1648fffc123a3e28ea0766fe5d9b

8 years agoMerge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat...
Daniel Xie [Tue, 13 Sep 2016 18:48:23 +0000 (18:48 +0000)]
Merge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat-cts-dev
am: f594c550af

Change-Id: I1d972e7094a87100847b822413e59914333832fd

8 years agoCP: Fix ext check in EXT_draw_buffers_indexed negative tests
Pyry Haulos [Tue, 13 Sep 2016 18:48:21 +0000 (18:48 +0000)]
CP: Fix ext check in EXT_draw_buffers_indexed negative tests
am: 3962010752

Change-Id: Ia83f5bf6db8579d21e99781883ee59501760e52c

8 years agoMerge "CP: Fix geometry shader support check" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 18:47:30 +0000 (18:47 +0000)]
Merge "CP: Fix geometry shader support check" into nougat-cts-dev
am: 54d4c9f476

Change-Id: I16f170e6a8b1814353473dd382da85aee2508e15

8 years agoCP: Fix geometry shader support check
Pyry Haulos [Tue, 13 Sep 2016 18:47:30 +0000 (18:47 +0000)]
CP: Fix geometry shader support check
am: 0da63cfe1d

Change-Id: Id94fa9a3eaa0bab514bd68f70e4a418565b17a74

8 years agoMerge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 18:47:29 +0000 (18:47 +0000)]
Merge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" into nougat-cts-dev
am: b03302d214

Change-Id: I7279affd1f20795fa61292c05656615fa71f4ae5

8 years agoCP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge
Pyry Haulos [Tue, 13 Sep 2016 18:47:28 +0000 (18:47 +0000)]
CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge
am: 66ee615c37

Change-Id: Ic654aff622dc4c0e2e2b59627bf6a081f805d590

8 years agoMerge changes I85492417,I93389a2c into nougat-cts-dev
Daniel Xie [Tue, 13 Sep 2016 18:47:26 +0000 (18:47 +0000)]
Merge changes I85492417,I93389a2c into nougat-cts-dev
am: 37eaa88ac2

Change-Id: I6d02e17f212b826c62ca711317450214b4a87e71

8 years agoCP: Limit VkInstance count in object_management.multithreaded*
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

8 years agoCP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests
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

8 years agoMerge "Don't require supported binary formats in negative tests." into marshmallow...
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

8 years agoDon't require supported binary formats in negative tests. am: 7cd59a4409
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

8 years agoMerge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
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

8 years agoDO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours
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

8 years agoMerge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745
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

8 years agoFix GLES2 format mismatch am: 4b80682693
Stphane Marchesin [Tue, 13 Sep 2016 18:46:54 +0000 (18:46 +0000)]
Fix GLES2 format mismatch am: 4b80682693
am: 9a9c641a84

Change-Id: Ic24eba3990aa9fb563e1501e749dd3f29d99f75b

8 years agoIncrease no-data timeout to 5 seconds. am: d00b71cbc3
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

8 years agoMerge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA."
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

8 years agoMerge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA."
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."

8 years agoMerge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
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

8 years agoMerge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" 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

8 years agoMerge "Remove a few EGL tests using RGBA4 format from mustpass" 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

8 years agoMerge "CP: Reduce max iter count in alloc_callback_fail.device" 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

8 years agoMerge changes I212a8bc2,I476b6586 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

8 years agoMerge "CP: Fix ext check in EXT_draw_buffers_indexed negative tests" into nougat...
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

8 years agoMerge "CP: Fix geometry shader support check" 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

8 years agoMerge "CP: Check and enable VK_KHR_sampler_mirror_clamp_to_edge" 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

8 years agoMerge changes I85492417,I93389a2c 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

8 years agoFix internal format/type for 3D + depth/stencil negative API tests.
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

8 years agoFix internal format/type for 3D + depth/stencil negative API tests.
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.

8 years agoFix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA.
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.

8 years agoBump libdeqp to android-22.
Dan Albert [Fri, 9 Sep 2016 07:59:13 +0000 (07:59 +0000)]
Bump libdeqp to android-22.
am: e0ef7118f8

Change-Id: If02fbee27cd0efb1b8f9986015555d0fbeca0d53

8 years agoBump libdeqp to android-22.
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

8 years agoRemove XML mustpass lists
Pyry Haulos [Thu, 8 Sep 2016 22:02:13 +0000 (22:02 +0000)]
Remove XML mustpass lists
am: af8270690a

Change-Id: Idf68478148dab81be2f0ff9e5dd1fa66d23684b3

8 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
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

8 years agoRemove XML mustpass lists
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

8 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
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

8 years agoAdd new files to Android.mk
Pyry Haulos [Thu, 8 Sep 2016 20:14:06 +0000 (13:14 -0700)]
Add new files to Android.mk

Change-Id: I45a16aba19e12533de3c60eb4a3c75f117c1410e

8 years agoMerge "Add tests for dynamic indexing of push constants" into vulkan-cts-1.0-dev
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

8 years agoMerge "Add tests for simultaneous use of secondary command buffer" into vulkan-cts...
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

8 years agoMerge "Add scissoring tests" 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

8 years agoMerge "Add new pipeline barrier tests to mustpass" 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

8 years agoMerge "Fix wrong test in copies and blitting testcases" 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

8 years agoMerge "dEQP-VK.pipeline.image.*: added test cases for 3D images with NPOT sizes....
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

8 years agoMerge "Extend shader built-in variable tests" 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

8 years agoMerge "Multisampled depth/stencil attachment test" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 18:18:14 +0000 (14:18 -0400)]
Merge "Multisampled depth/stencil attachment test" into vulkan-cts-1.0-dev

8 years agoMerge "Add tests for initialized and uninitialized cases." into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 18:17:49 +0000 (14:17 -0400)]
Merge "Add tests for initialized and uninitialized cases." into vulkan-cts-1.0-dev

8 years agoAdd multisampled storage image load/store on a rendered image
Maciej Jesionowski [Thu, 28 Jul 2016 12:20:15 +0000 (14:20 +0200)]
Add multisampled storage image load/store on a rendered image

New test:

- dEQP-VK.pipeline.multisample.storage_image.*

Fixes #439

Change-Id: If4d6d9511db5d1c6aa9e6d54ce04dcba8e1de5cd

8 years agoAdd multisampled image texel fetch test
Maciej Jesionowski [Wed, 20 Jul 2016 10:51:49 +0000 (12:51 +0200)]
Add multisampled image texel fetch test

New test:

- dEQP-VK.pipeline.multisample.sampled_image.*

Fixes #428

Change-Id: I947053c5fc48f7d479fab80a6fc31823da3e5c1a

8 years agoMerge "dEQP-VK.pipeline.vertex_input: sequential attributes test" into vulkan-cts...
Pyry Haulos [Thu, 8 Sep 2016 17:59:43 +0000 (13:59 -0400)]
Merge "dEQP-VK.pipeline.vertex_input: sequential attributes test" into vulkan-cts-1.0-dev

8 years agoMerge "dEQP-VK.pipeline: multisample interpolation tests" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 8 Sep 2016 17:59:17 +0000 (13:59 -0400)]
Merge "dEQP-VK.pipeline: multisample interpolation tests" into vulkan-cts-1.0-dev

8 years agoMerge "Build scripts: add support for NMake project generator" into vulkan-cts-1...
Pyry Haulos [Thu, 8 Sep 2016 17:38:24 +0000 (13:38 -0400)]
Merge "Build scripts: add support for NMake project generator" into vulkan-cts-1.0-dev

8 years agoBuild scripts: add support for NMake project generator
Slawomir Cygan [Thu, 11 Aug 2016 14:02:19 +0000 (16:02 +0200)]
Build scripts: add support for NMake project generator

Requires nmake.exe in PATH (try running from Visual Studio Command
Prompt, or use vcvars*.bat).

Change-Id: I2bfcfa46a5529066000745209673804b1863f1fc

8 years agoAdd new pipeline barrier tests to mustpass
Pyry Haulos [Mon, 29 Aug 2016 22:02:15 +0000 (15:02 -0700)]
Add new pipeline barrier tests to mustpass

Change-Id: Ibc499ad78c5a5d1268096d14033447192cc44552

8 years agoAdd tests for simultaneous use of secondary command buffer
Tobin Ehlis [Wed, 31 Aug 2016 18:49:07 +0000 (12:49 -0600)]
Add tests for simultaneous use of secondary command buffer

Fixes #335

Add simultaneousUseSecondaryBufferOnePrimaryBufferTest() test. This test
creates a single secondary command with SIMULTANEOUS_USE flag set and add
two instances of it to the same primary command buffer. Then verify that
each instance executes correctly.
Also add simultaneousUseSecondaryBufferTwoPrimaryBuffersTest(). Similar to
above test but same secondary command buffer is bound into two different
primary comman buffers that are then executed simultaneously.
In both cases the secondary command buffers are each atomically
incrementing a count from within a compute shader.

Update the mustpass lists.

Also made a few minor infrastructure additions:
Add a generic createDataBuffer() function to create a single buffer that
isn't built around a vec4 of color data.
Add a simpler createDescriptorSet() function that binds a results buffer
to binding 0 and an input uniform to binding 1.
Provide the compute result buffer initialization value in a parameter
which defaults to -1.0f. This allows flexibility for other tests that may
want a different default value, such as the new test mentioned above.

Change-Id: Icf6ebbac0e1975e1cf49f60e5aa8afb32f9885de

8 years agoAdd tests for dynamic indexing of push constants
Cody Northrop [Wed, 31 Aug 2016 01:52:59 +0000 (19:52 -0600)]
Add tests for dynamic indexing of push constants

Fixes #465

Change-Id: Ia20d7a9906db300ec79be82c2c936e40e699d452

8 years agodEQP-VK.pipeline: multisample interpolation tests
Kantoch [Thu, 28 Jul 2016 14:39:48 +0000 (16:39 +0200)]
dEQP-VK.pipeline: multisample interpolation tests

New test:
- dEQP-VK.pipeline.multisample_interpolation.*

Fixes #427

Change-Id: I235dc4781dff92e89ea645778e046d61b3909b32

8 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Pyry Haulos [Thu, 1 Sep 2016 19:32:50 +0000 (19:32 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am: f2ed7081f2

Change-Id: I749d3e5f5cbf9bdaeebaa9ba267dc58fe00c8b02

8 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Pyry Haulos [Thu, 1 Sep 2016 17:50:53 +0000 (10:50 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: Ic526d403eb9f9134d62c43476860ef0ad9e044d1

8 years agoCMake: Use find_package to ensure getting python 2.7 instead of 3.x
Cody Northrop [Thu, 1 Sep 2016 16:49:59 +0000 (10:49 -0600)]
CMake: Use find_package to ensure getting python 2.7 instead of 3.x

Change-Id: I0be171e0579acb99428378fa847e619a0d858d55

8 years agoAdd scissoring tests
Maciej Jesionowski [Thu, 4 Aug 2016 13:07:25 +0000 (15:07 +0200)]
Add scissoring tests

Scissoring tests based on GLES 2.0.

New test:
- dEQP-VK.fragment_operations.scissor.*

Fixes #452

Change-Id: I8bd7cb1dfc0889249d1f7bfb159f51defdf55a2d

8 years agoDO NOT MERGE Allow old behavior in image format property tests
Pyry Haulos [Wed, 31 Aug 2016 16:45:39 +0000 (09:45 -0700)]
DO NOT MERGE Allow old behavior in image format property tests

Vulkan API specification has changed in respect to what sample counts
vkGetPhysicalDeviceImageFormatProperties() should report. The change has
been made after initial Android Nougat drivers were frozen. For NYC CTS
we need to tolerate the old behavior and issue compatibility warning
instead.

Bug: 30739954
Change-Id: I212a8bc2b948760d3bf457e1c0e1199e0a8cc31e

8 years agoCP: Fix required sample count tests
Nanley Chery [Tue, 19 Apr 2016 19:13:58 +0000 (12:13 -0700)]
CP: Fix required sample count tests

According to,

   Table 11.1. Image and image view parameter compatibility requirements

Only non-cube images with type VK_IMAGE_TYPE_2D can have sample counts
greater than one.

In addition, the following properties should hold for multisampled
images: the formats must support being used in a color or depth/stencil
attachment, or in a storage image when shaderStorageImageMultisample is
supported. Images not fitting the above descriptions may have a sample
count of one or zero (in error conditions). Align tests for sample
counts to this behavior.

Bug: 30739954

(cherry picked from commit dc4227d5ec87080f5dad810b5e33ae3b3fa014a4)

Change-Id: I476b6586c351bddfb9f0b92cd7ec45fb9cc297c8