review.tizen.org Git - platform/upstream/VK-GL-CTS.git/log

projects / platform / upstream / VK-GL-CTS.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Pyry Haulos [Tue, 17 May 2016 16:16:15 +0000 (16:16 +0000)]

Merge "Merge "PipelineCache: track buffer allocation" into nyc-dev am: 0eae982184 am: 354f210248" into nyc-mr1-dev-plus-aosp
am: 62f63c54ce

* commit '62f63c54ce697a26f2a03c952818e5a7ec8e5fea':
PipelineCache: track buffer allocation

Change-Id: I35296ff565b486f945cc53246c87af0a51e74d60

commit | commitdiff | tree

Mika Isojarvi [Tue, 17 May 2016 16:16:14 +0000 (16:16 +0000)]

Merge "Merge "Apply alternatives to vector refract tests" into nyc-dev am: af5eecc70b am: 9b8296857d" into nyc-mr1-dev-plus-aosp
am: 80fe8c8b9b

* commit '80fe8c8b9b6d52a625c5811ee8bcdb5c99a3e9c4':
Apply alternatives to vector refract tests

Change-Id: I304422f6eeb0cc704ad2627b58a587eeef143b12

commit | commitdiff | tree

Mika Isojarvi [Tue, 17 May 2016 16:16:12 +0000 (16:16 +0000)]

Merge "Merge "Free EGLImages at the end of the testcase" into nyc-dev am: 3bd02575e7 am: 7c32eb3276" into nyc-mr1-dev-plus-aosp
am: 6c283b7d47

* commit '6c283b7d471942d489c7eaaf2a37a6d64d39891e':

Change-Id: Id7be193f8aaf09a2863d276fe6fcc4bbeb2a969f

commit | commitdiff | tree

Mika Isojärvi [Tue, 17 May 2016 16:16:10 +0000 (16:16 +0000)]

Merge "Free EGLImages at the end of the testcase" into nyc-dev am: 3bd02575e7 am: ec59829816
am: c01a1fd16b

* commit 'c01a1fd16b68d136e3b1e6dabbcaa783431922d6':
Free EGLImages at the end of the testcase

Change-Id: I5c57bb4bb5a447dbed5bf8a83b93391e27a984b8

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 17 May 2016 16:14:00 +0000 (16:14 +0000)]

Merge "Merge "PipelineCache: track buffer allocation" into nyc-dev am: 0eae982184 am: 354f210248" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 17 May 2016 16:13:57 +0000 (16:13 +0000)]

Merge "Merge "Apply alternatives to vector refract tests" into nyc-dev am: af5eecc70b am: 9b8296857d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 17 May 2016 16:13:54 +0000 (16:13 +0000)]

Merge "Merge "Free EGLImages at the end of the testcase" into nyc-dev am: 3bd02575e7 am: 7c32eb3276" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Pyry Haulos [Tue, 17 May 2016 16:13:37 +0000 (16:13 +0000)]

Merge "PipelineCache: track buffer allocation" into nyc-dev am: 0eae982184
am: 354f210248

* commit '354f21024817f743a7d1245e7d13d98b390b8e70':
PipelineCache: track buffer allocation

Change-Id: I4145f80559e327585729b317873ffcb60392da0f

commit | commitdiff | tree

Mika Isojarvi [Tue, 17 May 2016 16:13:36 +0000 (16:13 +0000)]

Merge "Free EGLImages at the end of the testcase" into nyc-dev am: 3bd02575e7
am: ec59829816

* commit 'ec59829816a020053e9eac0c4a6095249e772f80':
Free EGLImages at the end of the testcase

Change-Id: Iae61c819b63b8f3d718c08c020dab8da21520223

commit | commitdiff | tree

Mika Isojarvi [Tue, 17 May 2016 16:13:36 +0000 (16:13 +0000)]

Merge "Apply alternatives to vector refract tests" into nyc-dev am: af5eecc70b
am: 9b8296857d

* commit '9b8296857dedb433db4d47fa3f04e4050b87b69e':
Apply alternatives to vector refract tests

Change-Id: Iaeea58e64ec7b170b0673f865a2b3de6b24787cd

commit | commitdiff | tree

Mika Isojarvi [Tue, 17 May 2016 16:13:36 +0000 (16:13 +0000)]

Merge "Free EGLImages at the end of the testcase" into nyc-dev am: 3bd02575e7
am: 7c32eb3276

* commit '7c32eb3276b494fabb42e38ee1707b1cbf5c1467':
Free EGLImages at the end of the testcase

Change-Id: I9a553e44d31db0d7c8aa1f4f510da80c280ba5fb

commit | commitdiff | tree

Mika Isojärvi [Tue, 17 May 2016 16:11:16 +0000 (16:11 +0000)]

Merge "Free EGLImages at the end of the testcase" into nyc-dev
am: 3bd02575e7

* commit '3bd02575e7bd08fbcd46554b919a7cf259dbf7ec':
Free EGLImages at the end of the testcase

Change-Id: Iae95a6a8617053276090a2a12ae61d76af87bfc4

commit | commitdiff | tree

iostrows [Tue, 17 May 2016 16:11:03 +0000 (16:11 +0000)]

Merge "PipelineCache: track buffer allocation" into nyc-dev
am: 0eae982184

* commit '0eae982184a34c33607a112c10bfe0a4a295d369':
PipelineCache: track buffer allocation

Change-Id: I8ea7aa40cf3b738bea0ace16212a2195f1348151

commit | commitdiff | tree

Mika Isojärvi [Tue, 17 May 2016 16:11:03 +0000 (16:11 +0000)]

Merge "Apply alternatives to vector refract tests" into nyc-dev
am: af5eecc70b

* commit 'af5eecc70b6d2a633e9f2d754354be0b46051feb':
Apply alternatives to vector refract tests

Change-Id: Ie2d0101cce003965ca1414c961873be4471101d2

commit | commitdiff | tree

Mika Isojärvi [Tue, 17 May 2016 16:11:02 +0000 (16:11 +0000)]

Merge "Free EGLImages at the end of the testcase" into nyc-dev
am: 3bd02575e7

* commit '3bd02575e7bd08fbcd46554b919a7cf259dbf7ec':
Free EGLImages at the end of the testcase

Change-Id: I9c8969451fc4e08be9704c677ed2db08f1f25274

commit | commitdiff | tree

Pyry Haulos [Tue, 17 May 2016 16:08:45 +0000 (16:08 +0000)]

Merge "PipelineCache: track buffer allocation" into nyc-dev

commit | commitdiff | tree

Mika Isojarvi [Tue, 17 May 2016 16:06:38 +0000 (16:06 +0000)]

Merge "Apply alternatives to vector refract tests" into nyc-dev

commit | commitdiff | tree

Mika Isojarvi [Tue, 17 May 2016 16:06:29 +0000 (16:06 +0000)]

Merge "Free EGLImages at the end of the testcase" into nyc-dev

commit | commitdiff | tree

Pyry Haulos [Mon, 16 May 2016 23:14:10 +0000 (23:14 +0000)]

Merge "Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846 am: dc6d679957" into nyc-mr1-dev-plus-aosp
am: e65b7df71b

* commit 'e65b7df71b339675aa7b8b622a0897c5ce62dc67':

Change-Id: Ia1b63950eaa523f9e73258e67e2930ecc591290f

commit | commitdiff | tree

Pyry Haulos [Mon, 16 May 2016 23:14:08 +0000 (23:14 +0000)]

Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846 am: 4e236ae655
am: e87e989626

* commit 'e87e989626aeb4f757cd13a1b6113d161393e6c1':
Revert "Touch watchdog during object cleanup in max_concurrent tests"

Change-Id: I24f8894453d177e0f9dc8d3984e10fa56c884864

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 May 2016 23:10:09 +0000 (23:10 +0000)]

Merge "Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846 am: dc6d679957" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Pyry Haulos [Mon, 16 May 2016 23:10:02 +0000 (23:10 +0000)]

Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846
am: dc6d679957

* commit 'dc6d6799578d93e6b60e40bf349cfdfe0ef18a78':
Revert "Touch watchdog during object cleanup in max_concurrent tests"

Change-Id: I109a4be64fae960d649bb545ca9186d3d3f9b37b

commit | commitdiff | tree

Pyry Haulos [Mon, 16 May 2016 23:10:00 +0000 (23:10 +0000)]

Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846
am: 4e236ae655

* commit '4e236ae65576164b2506ece644d547c0786becef':
Revert "Touch watchdog during object cleanup in max_concurrent tests"

Change-Id: Ie4ba07e11b8c3f7c048545f42971e89373c8020c

commit | commitdiff | tree

David Sodman [Mon, 16 May 2016 23:08:04 +0000 (23:08 +0000)]

update event test as original test was inconsistent with Vulkan spec am: f093f4b9e4 am: 4c770aaa2f
am: 06da3c9c5e

* commit '06da3c9c5e3bf3db7324f7c8d10a795a3ebfbbc6':

Change-Id: I54d42c7318f23dad6b94afc4538c60d3a0c86652

commit | commitdiff | tree

Pyry Haulos [Mon, 16 May 2016 23:05:28 +0000 (23:05 +0000)]

Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev
am: 64a1499846

* commit '64a14998467dae667cfc1bee8fc4023ced4ad06d':
Revert "Touch watchdog during object cleanup in max_concurrent tests"

Change-Id: Ia3109b4880cef7cf35110443a9d8df56c114837e

commit | commitdiff | tree

Pyry Haulos [Mon, 16 May 2016 23:05:26 +0000 (23:05 +0000)]

Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev
am: 64a1499846

* commit '64a14998467dae667cfc1bee8fc4023ced4ad06d':
Revert "Touch watchdog during object cleanup in max_concurrent tests"

Change-Id: Iaeb40e0d74b39a93af612102c6d6a03f01428ad8

commit | commitdiff | tree

David Sodman [Mon, 16 May 2016 23:02:58 +0000 (23:02 +0000)]

update event test as original test was inconsistent with Vulkan spec am: f093f4b9e4
am: 4c770aaa2f

* commit '4c770aaa2febf66acaccb0dc96fb49c528fbbcfb':

Change-Id: I332eb5eeee4d11755b28db8a7144ec62dc641228

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 May 2016 23:02:27 +0000 (23:02 +0000)]

Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev

commit | commitdiff | tree

David Sodman [Mon, 16 May 2016 22:59:56 +0000 (22:59 +0000)]

update event test as original test was inconsistent with Vulkan spec am: f093f4b9e4 am: 99bf9ecdf3
am: d3086caa3a

* commit 'd3086caa3a9526ac4eca65871ef9b36968858739':
update event test as original test was inconsistent with Vulkan spec

Change-Id: Idf1e9a175341eaac82056a9669d1b5a15fce6973

commit | commitdiff | tree

David Sodman [Mon, 16 May 2016 22:54:11 +0000 (22:54 +0000)]

update event test as original test was inconsistent with Vulkan spec am: f093f4b9e4
am: 99bf9ecdf3

* commit '99bf9ecdf35ae59af7cc5c15c499c18d2cc767b5':
update event test as original test was inconsistent with Vulkan spec

Change-Id: I185f82b05a6b8609542d7137f6e71165be81be0e

commit | commitdiff | tree

David Sodman [Mon, 16 May 2016 22:45:37 +0000 (22:45 +0000)]

update event test as original test was inconsistent with Vulkan spec
am: f093f4b9e4

* commit 'f093f4b9e448947e887868ffc0d23b45c31ee9b0':
update event test as original test was inconsistent with Vulkan spec

Change-Id: If7066f5cc2cd7c68c6c3b32a578ca3aef656fcfc

commit | commitdiff | tree

David Sodman [Mon, 16 May 2016 22:45:37 +0000 (22:45 +0000)]

update event test as original test was inconsistent with Vulkan spec
am: f093f4b9e4

* commit 'f093f4b9e448947e887868ffc0d23b45c31ee9b0':
update event test as original test was inconsistent with Vulkan spec

Change-Id: Ifa643688768c02d4392e8adf95115e59e7f1c53b

commit | commitdiff | tree

iostrows [Fri, 29 Apr 2016 11:38:52 +0000 (13:38 +0200)]

PipelineCache: track buffer allocation

Bug: 28676376

(cherry picked from commit 653704c5bc0f03512b0b43a84615b6a9138fa057)

Change-Id: Idf9c4a00928aa88c0f67cfc7db4c96c695689809

commit | commitdiff | tree

Pyry Haulos [Mon, 16 May 2016 21:26:02 +0000 (14:26 -0700)]

Revert "Touch watchdog during object cleanup in max_concurrent tests"

This reverts commit 9bd29e9ddec5c2404fd26ec0676422bf8b9eddcd.

Bug: 28436275
Change-Id: Ia3396445f0d1174559ab7d79aa1ccea3c27fe4b4

commit | commitdiff | tree

Mika Isojärvi [Fri, 13 May 2016 17:40:19 +0000 (10:40 -0700)]

Free EGLImages at the end of the testcase

Bug: 28641861
Change-Id: I578d06f0cf312102f6e180a6e9697fbf160c63c7

commit | commitdiff | tree

David Sodman [Fri, 13 May 2016 21:21:24 +0000 (14:21 -0700)]

update event test as original test was inconsistent with Vulkan spec

BUG 28074219

Change-Id: I797fddfc4d96feb7b847409b50e94c1f84d22cf8

commit | commitdiff | tree

Mika Isojärvi [Mon, 16 May 2016 18:05:05 +0000 (11:05 -0700)]

Apply alternatives to vector refract tests

Bug: 28657855
Bug: 27266906
Change-Id: I0ea0211c8292805338d55c1dc01692135761a428

commit | commitdiff | tree

Pablo Ceballos [Wed, 13 Apr 2016 04:07:09 +0000 (21:07 -0700)]

Add tests for EGL_KHR_mutable_render_buffer

Change-Id: Idf4201dfdbb364736bc4b50ae3c61a98cb03fda5

commit | commitdiff | tree

Maciej Jesionowski [Fri, 13 May 2016 19:35:30 +0000 (19:35 +0000)]

Merge "Validation fixes for dEQP-VK.synchronization am: 226a0db84f am: 86b9cf1615" into nyc-mr1-dev-plus-aosp
am: 61c6406135

* commit '61c64061352ab394a35175a7cf4e97f74512bae9':

Change-Id: I5ae5322cd72f566b254444716f556bc9fa191ab1

commit | commitdiff | tree

Maciej Jesionowski [Fri, 13 May 2016 19:35:29 +0000 (19:35 +0000)]

Validation fixes for dEQP-VK.synchronization am: 226a0db84f am: 342c7aee4d
am: 4eb203e29f

* commit '4eb203e29f0dfe8d979ff7d10061e5d07f074261':
Validation fixes for dEQP-VK.synchronization

Change-Id: I1918500bba3b2fe93118b529693c9e86b2b3c933

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 13 May 2016 19:33:04 +0000 (19:33 +0000)]

Merge "Validation fixes for dEQP-VK.synchronization am: 226a0db84f am: 86b9cf1615" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Maciej Jesionowski [Fri, 13 May 2016 19:32:56 +0000 (19:32 +0000)]

Validation fixes for dEQP-VK.synchronization am: 226a0db84f
am: 342c7aee4d

* commit '342c7aee4d54e4f3f9a46946c0ab541d74c7cb0a':
Validation fixes for dEQP-VK.synchronization

Change-Id: Idd26533419b3f02966d566d2bc21499763a8c895

commit | commitdiff | tree

Maciej Jesionowski [Fri, 13 May 2016 19:32:55 +0000 (19:32 +0000)]

Validation fixes for dEQP-VK.synchronization am: 226a0db84f
am: 86b9cf1615

* commit '86b9cf1615ca8f21998e349f08c1f0ec04952c21':
Validation fixes for dEQP-VK.synchronization

Change-Id: I63d652537534f20af06c6ca5c873f1c38e3f9c3b

commit | commitdiff | tree

Maciej Jesionowski [Fri, 13 May 2016 19:30:23 +0000 (19:30 +0000)]

Validation fixes for dEQP-VK.synchronization
am: 226a0db84f

* commit '226a0db84fb22264e27c52ed54d55592baf1693a':
Validation fixes for dEQP-VK.synchronization

Change-Id: I7d468a51a8e6be59b57a0228dcfb17fbbbe9600c

commit | commitdiff | tree

Maciej Jesionowski [Fri, 13 May 2016 19:30:22 +0000 (19:30 +0000)]

Validation fixes for dEQP-VK.synchronization
am: 226a0db84f

* commit '226a0db84fb22264e27c52ed54d55592baf1693a':
Validation fixes for dEQP-VK.synchronization

Change-Id: I50b955e0aa9d521c2c202ca7c199120a8a76be72

commit | commitdiff | tree

Maciej Jesionowski [Tue, 26 Apr 2016 13:27:46 +0000 (15:27 +0200)]

Validation fixes for dEQP-VK.synchronization

- Initialize some structure fields to required values
- Use pWaitDstStageMask when waiting on a semaphore
- Move vkCmdSetEvent outside the render pass
- Provide expected number of queue priorities to VkDeviceQueueCreateInfo

Bug: 28074219

(cherry picked from commit 94fdc7fcde984ff6c21ea7ccf6fd758fbf90a0d9)

Change-Id: I71835bb7bc0e9fec528c24aec35e2c864f763aa9

commit | commitdiff | tree

Pyry Haulos [Thu, 12 May 2016 14:59:56 +0000 (14:59 +0000)]

Merge "Fix allocator in WSI swapchain render test am: f31905d3c4 am: 99290ba6e7" into nyc-mr1-dev-plus-aosp
am: 316410640a

* commit '316410640a475162b8d21b08570a3f82b0e7505e':

Change-Id: I5e570a5ed406ccdbe54c07d70c91152404c44a10

commit | commitdiff | tree

Pyry Haulos [Thu, 12 May 2016 14:59:56 +0000 (14:59 +0000)]

Fix allocator in WSI swapchain render test am: f31905d3c4 am: 92f7706365
am: 23a168f995

* commit '23a168f99586a5793474d981af546e018e00fdc0':
Fix allocator in WSI swapchain render test

Change-Id: I330dc21c95d08fecf9fdde155a49ef7f8e9a3b10

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 May 2016 14:57:14 +0000 (14:57 +0000)]

Merge "Fix allocator in WSI swapchain render test am: f31905d3c4 am: 99290ba6e7" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Pyry Haulos [Thu, 12 May 2016 14:56:59 +0000 (14:56 +0000)]

Fix allocator in WSI swapchain render test am: f31905d3c4
am: 92f7706365

* commit '92f77063655d45448ff44021b7b75e51f47f48ca':
Fix allocator in WSI swapchain render test

Change-Id: I254ed0f3541ec1226276440152043fa324e94832

commit | commitdiff | tree

Pyry Haulos [Thu, 12 May 2016 14:56:59 +0000 (14:56 +0000)]

Fix allocator in WSI swapchain render test am: f31905d3c4
am: 99290ba6e7

* commit '99290ba6e76b8da5bddb63dbceb1b3bd84ba7320':
Fix allocator in WSI swapchain render test

Change-Id: I0eeba5773f9f0fb992039829d405c1c17ac1d8c7

commit | commitdiff | tree

Pyry Haulos [Thu, 12 May 2016 14:54:12 +0000 (14:54 +0000)]

Fix allocator in WSI swapchain render test
am: f31905d3c4

* commit 'f31905d3c4bcdd5978d7dc21ddf2723a89454a3b':
Fix allocator in WSI swapchain render test

Change-Id: Icccc64861f6abe25fac60047c36ca07d323994c7

commit | commitdiff | tree

Pyry Haulos [Thu, 12 May 2016 14:54:12 +0000 (14:54 +0000)]

Fix allocator in WSI swapchain render test
am: f31905d3c4

* commit 'f31905d3c4bcdd5978d7dc21ddf2723a89454a3b':
Fix allocator in WSI swapchain render test

Change-Id: I61d494ad6fa32867a1c9150017d767ce2a80941e

commit | commitdiff | tree

Pyry Haulos [Wed, 11 May 2016 20:39:24 +0000 (13:39 -0700)]

Fix allocator in WSI swapchain render test

TriangleRenderer was using default device allocator with custom device
created with WSI extension enabled.

Bug: 28676093
Change-Id: Iad45ee21f1f0cfca09f24d68529a6862de5ba701

commit | commitdiff | tree

Mika Isojärvi [Fri, 6 May 2016 19:22:29 +0000 (19:22 +0000)]

Merge "resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: 5e80b7e463" into nyc-mr1-dev-plus-aosp
am: 48687114b6

* commit '48687114b6c5310c8939700c8422a2c80bcddfca':

Change-Id: I06acfccdcc894c105171682095d58c1787912302

commit | commitdiff | tree

Daniel Xie [Fri, 6 May 2016 19:22:28 +0000 (19:22 +0000)]

resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: a6eacd8101
am: 1b8fe1f999

* commit '1b8fe1f99900105f97dca9d1534d96214bde57a8':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: Iada16e2bc7b70824153e140db7e8b607b552ad4c

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 May 2016 19:17:51 +0000 (19:17 +0000)]

Merge "resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: 5e80b7e463" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mika Isojärvi [Fri, 6 May 2016 19:17:38 +0000 (19:17 +0000)]

resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214
am: a6eacd8101

* commit 'a6eacd810172a6b01938470ba105121ca742761b':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: I1622b91e38e1f480ee298385d2a187cff8a8e96a

commit | commitdiff | tree

Mika Isojärvi [Fri, 6 May 2016 19:17:37 +0000 (19:17 +0000)]

resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214
am: 5e80b7e463

* commit '5e80b7e46307c206f4df887202119da61c096ecd':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: I900430dad177b690ea13d018467126c396de41e0

commit | commitdiff | tree

Daniel Xie [Fri, 6 May 2016 19:12:59 +0000 (19:12 +0000)]

resolve merge conflicts of cfeb3c0 to nyc-dev
am: 518f489214

* commit '518f4892140466feacb6c7c772357c76a86c3a27':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: Ie2f928384f03ae0354405124263ce4e8e819f0db

commit | commitdiff | tree

Daniel Xie [Fri, 6 May 2016 19:12:54 +0000 (19:12 +0000)]

resolve merge conflicts of cfeb3c0 to nyc-dev
am: 518f489214

* commit '518f4892140466feacb6c7c772357c76a86c3a27':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: I23fadf595d2733a9898baedd17e8e6fe9679fa63

commit | commitdiff | tree

Mika Isojärvi [Fri, 6 May 2016 17:40:09 +0000 (10:40 -0700)]

resolve merge conflicts of cfeb3c0 to nyc-dev

Change-Id: I7172a107debe1356601a60154234660d8f8b3c71

commit | commitdiff | tree

Daniel Xie [Thu, 5 May 2016 22:55:07 +0000 (22:55 +0000)]

Merge "Remove GLES2-texture.wrap tests from mustpass" into marshmallow-cts-dev am: 4e0555590e am: 20f0bfce22 am: 0e8d4374cf
am: ba052feff9

* commit 'ba052feff907a901564771b34b2c2bd17a375a17':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: Ide7f48341c4ea1322f1fa5abe836199f5716bd04

commit | commitdiff | tree

David Sodman [Thu, 5 May 2016 22:50:30 +0000 (22:50 +0000)]

Merge "Remove GLES2-texture.wrap tests from mustpass" into marshmallow-cts-dev am: 4e0555590e am: 20f0bfce22
am: 0e8d4374cf

* commit '0e8d4374cfc449324f6945bdf5e3d8f9049e6fb1':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: I7b2b513523808851cafeb1e6abdf43f2aca35d71

commit | commitdiff | tree

Daniel Xie [Thu, 5 May 2016 22:45:47 +0000 (22:45 +0000)]

Merge "Remove GLES2-texture.wrap tests from mustpass" into marshmallow-cts-dev am: 4e0555590e
am: 20f0bfce22

* commit '20f0bfce228434f530d6224cb96e0c05c2740500':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: Ie7ceb82821044d4c601b3ee8b912b9f9bd5e51e6

commit | commitdiff | tree

David Sodman [Thu, 5 May 2016 22:41:06 +0000 (22:41 +0000)]

Merge "Remove GLES2-texture.wrap tests from mustpass" into marshmallow-cts-dev
am: 4e0555590e

* commit '4e0555590ea2e0c08b7333773543f03fc5e12d21':
Remove GLES2-texture.wrap tests from mustpass

Change-Id: Iea248c97ce1e3a2fad223d814c302e777f1f1678

commit | commitdiff | tree

Daniel Xie [Thu, 5 May 2016 22:28:50 +0000 (22:28 +0000)]

Merge "Remove GLES2-texture.wrap tests from mustpass" into marshmallow-cts-dev

commit | commitdiff | tree

Mika Isojrvi [Thu, 5 May 2016 03:31:47 +0000 (03:31 +0000)]

Remove random ssbo test generating large shader from mustpass am: 5b68169381 am: e6fd942518
am: 3669b3b227

* commit '3669b3b227edc79336761b3ce6d668d99c1e7eef':

Change-Id: I6acec070cf0f98712b2f5c8bd2c95eaced6e96ab

commit | commitdiff | tree

Mika Isojrvi [Thu, 5 May 2016 03:31:46 +0000 (03:31 +0000)]

Remove random ssbo test generating large shader from mustpass am: 5b68169381 am: 1721efeeb0
am: 19a28445a2

* commit '19a28445a216a4b12c0af8e35e78986dcabe1859':
Remove random ssbo test generating large shader from mustpass

Change-Id: Ica85cfc8a61a73b2bf14f625aee2b35d3268111f

commit | commitdiff | tree

Mika Isojärvi [Thu, 5 May 2016 03:29:18 +0000 (03:29 +0000)]

Remove random ssbo test generating large shader from mustpass am: 5b68169381
am: e6fd942518

* commit 'e6fd94251859763da8f1746891f096ed534c3a85':

Change-Id: Ia7c790f0d037d55c9bf01485ac7b958155cd84ea

commit | commitdiff | tree

Mika Isojärvi [Thu, 5 May 2016 03:29:02 +0000 (03:29 +0000)]

Remove random ssbo test generating large shader from mustpass am: 5b68169381
am: 1721efeeb0

* commit '1721efeeb0fe7fb5880ee49be1e60e21266dbc4a':
Remove random ssbo test generating large shader from mustpass

Change-Id: If8f6121ac29b5dcec9bc07e7d806a0e3400f2c2c

commit | commitdiff | tree

Mika Isojrvi [Thu, 5 May 2016 03:26:20 +0000 (03:26 +0000)]

Remove random ssbo test generating large shader from mustpass
am: 5b68169381

* commit '5b681693813028911a90471aefb052f390404f57':
Remove random ssbo test generating large shader from mustpass

Change-Id: I1eb9cc3298fc217a7af48095c2f86cca9b8596a4

commit | commitdiff | tree

Mika Isojrvi [Thu, 5 May 2016 03:26:06 +0000 (03:26 +0000)]

Remove random ssbo test generating large shader from mustpass
am: 5b68169381

* commit '5b681693813028911a90471aefb052f390404f57':
Remove random ssbo test generating large shader from mustpass

Change-Id: I612ff7abda5c20f0faea20f78a4d24eecb6ad7d1

commit | commitdiff | tree

Mika Isojärvi [Wed, 4 May 2016 21:13:26 +0000 (14:13 -0700)]

Remove random ssbo test generating large shader from mustpass

Bug: 28052337
Bug: 28594488
Change-Id: I9b4216c3a3fcaafda86411aaeda7889c5cd17b33

commit | commitdiff | tree

Mika Isojarvi [Tue, 3 May 2016 18:03:49 +0000 (18:03 +0000)]

Merge "Merge "Split WSI OOM tests over multiple iterations." into nyc-dev am: 991f09ba41 am: 643dc2cdad" into nyc-mr1-dev-plus-aosp
am: 451f060799

* commit '451f06079937220d0a10fbb8b75b5353d1c871f5':

Change-Id: Iee5939b15982436965e4a5c6640847a60ecfe55f

commit | commitdiff | tree

Mika Isojärvi [Tue, 3 May 2016 18:03:48 +0000 (18:03 +0000)]

Merge "Split WSI OOM tests over multiple iterations." into nyc-dev am: 991f09ba41 am: 1510e135cd
am: bba6429f54

* commit 'bba6429f541b6ffa4f6e22d57c08ef0b7f3a4f53':
Split WSI OOM tests over multiple iterations.

Change-Id: Ie960eb5b6d68d676a0375446987d0d0ab4e645ae

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 3 May 2016 18:01:39 +0000 (18:01 +0000)]

Merge "Merge "Split WSI OOM tests over multiple iterations." into nyc-dev am: 991f09ba41 am: 643dc2cdad" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mika Isojarvi [Tue, 3 May 2016 18:01:29 +0000 (18:01 +0000)]

Merge "Split WSI OOM tests over multiple iterations." into nyc-dev am: 991f09ba41
am: 1510e135cd

* commit '1510e135cdc18351f1430e76b5f1fb183a861958':
Split WSI OOM tests over multiple iterations.

Change-Id: Icab65ed69de0280106826417755500da6ac59801

commit | commitdiff | tree

Mika Isojarvi [Tue, 3 May 2016 18:01:29 +0000 (18:01 +0000)]

Merge "Split WSI OOM tests over multiple iterations." into nyc-dev am: 991f09ba41
am: 643dc2cdad

* commit '643dc2cdad5cf60d0500e5ebf064d28b03005f71':
Split WSI OOM tests over multiple iterations.

Change-Id: I85c4608a95d3f38f10d72959b82a323b14c23b20

commit | commitdiff | tree

Mika Isojärvi [Tue, 3 May 2016 17:59:07 +0000 (17:59 +0000)]

Merge "Split WSI OOM tests over multiple iterations." into nyc-dev
am: 991f09ba41

* commit '991f09ba4156e4270dd11f846b079b4eb43f6754':
Split WSI OOM tests over multiple iterations.

Change-Id: I8b36fc1a8f72e57d4dede5604350f68bcd156948

commit | commitdiff | tree

Mika Isojärvi [Tue, 3 May 2016 17:59:07 +0000 (17:59 +0000)]

Merge "Split WSI OOM tests over multiple iterations." into nyc-dev
am: 991f09ba41

* commit '991f09ba4156e4270dd11f846b079b4eb43f6754':
Split WSI OOM tests over multiple iterations.

Change-Id: Ice58b372a5bd61a636d305c7e61988b76c12257c

commit | commitdiff | tree

Mika Isojarvi [Tue, 3 May 2016 17:49:39 +0000 (17:49 +0000)]

Merge "Split WSI OOM tests over multiple iterations." into nyc-dev

commit | commitdiff | tree

Mika Isojärvi [Mon, 2 May 2016 23:24:53 +0000 (23:24 +0000)]

Merge "Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62 am: bce8cee6fe" into nyc-mr1-dev-plus-aosp
am: 5c4c77f3da

* commit '5c4c77f3dab024662af74de919d674ec7209d0db':

Change-Id: I7661a9f66e6754ad8ef8583652e519bd37568c97

commit | commitdiff | tree

Mika Isojrvi [Mon, 2 May 2016 23:24:53 +0000 (23:24 +0000)]

Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62 am: 8904f4d197
am: c88c61b9bb

* commit 'c88c61b9bb39ba62fb6553a2d80d8c628ee6392f':
Revert "Add timeout to eglClientWaitSync() tests."

Change-Id: I915a3cfb064ad6617255ed6349748a4d5d0a72fc

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 May 2016 23:19:13 +0000 (23:19 +0000)]

Merge "Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62 am: bce8cee6fe" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mika Isojärvi [Mon, 2 May 2016 23:19:04 +0000 (23:19 +0000)]

Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62
am: 8904f4d197

* commit '8904f4d1976495bca223dc3fb2d435e622e4841d':
Revert "Add timeout to eglClientWaitSync() tests."

Change-Id: I606be66eeb538ad51f86f049633e2cbed0ba0c3d

commit | commitdiff | tree

Mika Isojärvi [Mon, 2 May 2016 23:19:03 +0000 (23:19 +0000)]

Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62
am: bce8cee6fe

* commit 'bce8cee6fe5d43c9e02c560ff097de6c1edd8925':
Revert "Add timeout to eglClientWaitSync() tests."

Change-Id: Icc131edd844bc716ed88b42cfd475693ce70562e

commit | commitdiff | tree

Mika Isojrvi [Mon, 2 May 2016 23:14:04 +0000 (23:14 +0000)]

Revert "Add timeout to eglClientWaitSync() tests."
am: ca64481a62

* commit 'ca64481a62fff6c94e9d81abc1d6866fadc5f42c':
Revert "Add timeout to eglClientWaitSync() tests."

Change-Id: I63209583c8afa622966e7025c7af48bf16f420c9

commit | commitdiff | tree

Mika Isojrvi [Mon, 2 May 2016 23:14:03 +0000 (23:14 +0000)]

Revert "Add timeout to eglClientWaitSync() tests."
am: ca64481a62

* commit 'ca64481a62fff6c94e9d81abc1d6866fadc5f42c':
Revert "Add timeout to eglClientWaitSync() tests."

Change-Id: I87d52c4bf8fc303f8d398739a3b277142843de69

commit | commitdiff | tree

Mika Isojärvi [Mon, 2 May 2016 22:42:46 +0000 (15:42 -0700)]

Split WSI OOM tests over multiple iterations.

Bug: 28533310
Bug: 28052337
Bug: 28052526
Change-Id: Ia4794a3c6e9d923dce2f267316db485de6d0a9df

commit | commitdiff | tree

Mika Isojärvi [Mon, 2 May 2016 01:08:17 +0000 (18:08 -0700)]

Revert "Add timeout to eglClientWaitSync() tests."

This reverts commit 921259c6f01b9a70baf7b2d4701258fcdf53dd47.

Bug: 28052212

commit | commitdiff | tree

Mika Isojärvi [Fri, 29 Apr 2016 05:58:17 +0000 (05:58 +0000)]

Merge "Take reference data into account in memory usage tracking am: d923e3ef94 am: f11d0aef46" into nyc-mr1-dev-plus-aosp
am: 99b563c1bf

* commit '99b563c1bfd459a44a5cb95de65c0c23e9592a44':

Change-Id: I4fa80e8d492787901c709454cef53abb82798b68

commit | commitdiff | tree

Mika Isojrvi [Fri, 29 Apr 2016 05:58:17 +0000 (05:58 +0000)]

Take reference data into account in memory usage tracking am: d923e3ef94 am: 6a29014914
am: b5031e5f4a

* commit 'b5031e5f4a5c247fcd182567298adfc73c98b4f0':
Take reference data into account in memory usage tracking

Change-Id: Ia1f22d5eeda939bcce3d5b88cfcc5641af5c408c

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 05:55:36 +0000 (05:55 +0000)]

Merge "Take reference data into account in memory usage tracking am: d923e3ef94 am: f11d0aef46" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mika Isojärvi [Fri, 29 Apr 2016 05:55:21 +0000 (05:55 +0000)]

Take reference data into account in memory usage tracking am: d923e3ef94
am: 6a29014914

* commit '6a29014914feb112ee8a4cc2f39d6a9c98ae0315':
Take reference data into account in memory usage tracking

Change-Id: I4cdde90726894c0ced9dd87652fd51d7f42234b5

commit | commitdiff | tree

Mika Isojärvi [Fri, 29 Apr 2016 05:55:21 +0000 (05:55 +0000)]

Take reference data into account in memory usage tracking am: d923e3ef94
am: f11d0aef46

* commit 'f11d0aef4607ba6e4ddcb3ff29a2473565fb2221':
Take reference data into account in memory usage tracking

Change-Id: I1c30acc624db6494ab490340ff1256c521c7e881

commit | commitdiff | tree

Mika Isojrvi [Fri, 29 Apr 2016 05:52:49 +0000 (05:52 +0000)]

Take reference data into account in memory usage tracking
am: d923e3ef94

* commit 'd923e3ef9440bd571f283d1745d552e134f6f1dd':
Take reference data into account in memory usage tracking

Change-Id: Id463cba32d1bf15e6b766256e4b7015f8957d23e

commit | commitdiff | tree

Mika Isojrvi [Fri, 29 Apr 2016 05:52:49 +0000 (05:52 +0000)]

Take reference data into account in memory usage tracking
am: d923e3ef94

* commit 'd923e3ef9440bd571f283d1745d552e134f6f1dd':
Take reference data into account in memory usage tracking

Change-Id: I83188927733906771767cc846900cbc4a18812a6

commit | commitdiff | tree

Mika Isojärvi [Thu, 28 Apr 2016 23:26:51 +0000 (16:26 -0700)]

Take reference data into account in memory usage tracking

Bug: 28052105
Bug: 28052526
Change-Id: I47caae5d0ae1353ad015866d08b727a2ebcc4fdb

commit | commitdiff | tree

Mika Isojärvi [Thu, 28 Apr 2016 19:29:13 +0000 (19:29 +0000)]

Merge "Remove EGLImage tests affected by rounding issues from mustpass" into nyc-dev am: c187389cd2 am: 9d337902c5
am: 469ae0248e

* commit '469ae0248e03081ce47735968942de6f149f330c':

Change-Id: I4fd203ab8713b6041e18c5c06a7815d59c5cabca

Domain: Graphics System / GL;