Kalle Raita [Fri, 28 Apr 2017 23:42:04 +0000 (23:42 +0000)]
Merge "Log which watchdog timer was exceeded" am:
9bd0272d00 am:
00bbea1771 am:
a20ae3d6a8
am:
49c18c6c67
Change-Id: I050f989e6f725a1d8500f680725f27fab13e9002
Kalle Raita [Fri, 28 Apr 2017 23:12:42 +0000 (23:12 +0000)]
Merge "Log which watchdog timer was exceeded" am:
9bd0272d00 am:
00bbea1771
am:
a20ae3d6a8
Change-Id: I7a5bc8bb11c700deffebef11b6d0152c76ff1365
Kalle Raita [Fri, 28 Apr 2017 23:09:11 +0000 (23:09 +0000)]
Merge "Log which watchdog timer was exceeded" am:
9bd0272d00
am:
00bbea1771
Change-Id: I20456e4268e1ef0fd7341bc99100366d2bd5e4ea
Kalle Raita [Fri, 28 Apr 2017 23:05:41 +0000 (23:05 +0000)]
Merge "Log which watchdog timer was exceeded"
am:
9bd0272d00
Change-Id: Ib175faaa4c72f7118bbb34e1921d3cbf780ad5da
Treehugger Robot [Fri, 28 Apr 2017 22:51:12 +0000 (22:51 +0000)]
Merge "Log which watchdog timer was exceeded"
Kalle Raita [Fri, 28 Apr 2017 22:06:22 +0000 (22:06 +0000)]
Restore infinite loop tests into the mustpass am:
39f0e4a6ee
am:
297d0b5cf1 -s ours
Change-Id: Ibcc1fe4e1cd3972c78021154ae89bdda05608f1e
Kalle Raita [Fri, 28 Apr 2017 22:04:21 +0000 (22:04 +0000)]
Restore infinite loop tests into the mustpass
am:
39f0e4a6ee
Change-Id: I87c13892801b0f36c9d169b44104bb671db2f9f4
Kalle Raita [Thu, 27 Apr 2017 18:43:27 +0000 (11:43 -0700)]
Log which watchdog timer was exceeded
Test: Timeout failure for max_concurrent.framebuffer on Marlin
Change-Id: Ie8396c6506e09bbe94c6d5dc6c29fd6e20c7f436
Kalle Raita [Thu, 27 Apr 2017 17:32:34 +0000 (10:32 -0700)]
Restore infinite loop tests into the mustpass
Bug:
34887800
Bug:
37476650
Test: dEQP-EGL.functional.robustness.* on Angler, both ABIs
Change-Id: I7313d09ceb6d08ff67c05f573e9fb049de36061e
Merged-In: Id2b8e4366da75dcb1b3afdeaede325d3a34e3071
Pyry Haulos [Fri, 21 Apr 2017 17:52:05 +0000 (17:52 +0000)]
Update Android CTS Vulkan waivers list to match Khronos CTS am:
bc44daba17
am:
2acdba2927 -s ours
Change-Id: Ifece337548f96f5ef6e691fa66aca2f030e236d6
Pyry Haulos [Fri, 21 Apr 2017 17:48:22 +0000 (17:48 +0000)]
Update Android CTS Vulkan waivers list to match Khronos CTS
am:
bc44daba17
Change-Id: I7cc0563599288564e9a40ed8f79935afc9ab7152
Pyry Haulos [Thu, 20 Apr 2017 22:36:04 +0000 (15:36 -0700)]
Update Android CTS Vulkan waivers list to match Khronos CTS
Bug:
36817508
(cherry picked from commit
96cb7026885d2f457fcfe58d4c8035e7a701cff1)
Merged-In: Ice0a23a345585d035b6fc7a869444459ebbbb9a3
Change-Id: I89ccd864c8d3911dc0ce7f7554795a1f0b216817
Pyry Haulos [Fri, 21 Apr 2017 00:40:36 +0000 (17:40 -0700)]
resolve merge conflicts of
59febde93 to master
Change-Id: Ice0a23a345585d035b6fc7a869444459ebbbb9a3
Pyry Haulos [Fri, 21 Apr 2017 00:29:55 +0000 (17:29 -0700)]
resolve merge conflicts of
bf8899d41 to oc-dev-plus-aosp
Change-Id: I05d0a671554b7455b9773a670080fd04f419360d
Pyry Haulos [Fri, 21 Apr 2017 00:08:27 +0000 (00:08 +0000)]
Update Android CTS Vulkan waivers list to match Khronos CTS am:
96cb702688
am:
2b7154e1f1
Change-Id: Ibb7a4b51d34da0e5a601ea36774a864c9d410ca2
Pyry Haulos [Fri, 21 Apr 2017 00:04:55 +0000 (00:04 +0000)]
Update Android CTS Vulkan waivers list to match Khronos CTS
am:
96cb702688
Change-Id: I6932d9988c885e2b26fee22845c4e064ea5118b7
Pyry Haulos [Thu, 20 Apr 2017 22:36:04 +0000 (15:36 -0700)]
Update Android CTS Vulkan waivers list to match Khronos CTS
Bug:
36817508
Change-Id: Ib394652ca3229a06704a83bea53806a3397c7ec3
Alexander Galazin [Thu, 20 Apr 2017 00:44:31 +0000 (00:44 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer am:
3809b1c7f1
am:
24e713de1b
Change-Id: I507219c061b8e5819dfac678f6855868523f7fcc
Alexander Galazin [Wed, 19 Apr 2017 23:54:21 +0000 (23:54 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer
am:
3809b1c7f1
Change-Id: I9a0e195dd9cfc6245b4ac3b729022837512c8aaa
Alexander Galazin [Wed, 19 Apr 2017 06:33:39 +0000 (08:33 +0200)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer
The GLES2 version of the copytexsubimage2d_incomplete_framebuffer test could
potentially throw INVALID_OPERATION instead of expected INVALID_FRAMEBUFFER_OPERATION
due to the cubemap texture not being defined by a previous TexImage2D.
This change re-uses the GLES3 version of the same test and ensures that
INVALID_FRAMEBUFFER_OPERATION is thrown.
Affects:
dEQP-GLES2.functional.negative_api.texture.copytexsubimage2d_incomplete_framebuffer
Change-Id: I7b3f770ff31c73d770a53f6b6bdae3ea4a37b63a
Components: AOSP
Google bug:
37497541
(cherry picked from commit
89bb39d24906bebd4e506f534e7336ffffec780b)
Alexander Galazin [Wed, 19 Apr 2017 16:48:13 +0000 (16:48 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer am:
89bb39d249 am:
fc8c8e4d78 am:
8c429200b5
am:
28c233c958
Change-Id: Icce50a7b8a22e4a2a62204625ad6d57c137a7af0
Alexander Galazin [Wed, 19 Apr 2017 16:46:17 +0000 (16:46 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer am:
89bb39d249 am:
fc8c8e4d78
am:
8c429200b5
Change-Id: I431920156e60dced3b11094329bd334a42ca43b8
Alexander Galazin [Wed, 19 Apr 2017 16:44:16 +0000 (16:44 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer am:
89bb39d249
am:
fc8c8e4d78
Change-Id: I1542a80ff511796208da91bd64a9759543464628
Alexander Galazin [Wed, 19 Apr 2017 16:42:16 +0000 (16:42 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer
am:
89bb39d249
Change-Id: Iddf43b14d658dc2847f6bdab12258d9015c9e770
Alexander Galazin [Wed, 19 Apr 2017 06:33:39 +0000 (08:33 +0200)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer
The GLES2 version of the copytexsubimage2d_incomplete_framebuffer test could
potentially throw INVALID_OPERATION instead of expected INVALID_FRAMEBUFFER_OPERATION
due to the cubemap texture not being defined by a previous TexImage2D.
This change re-uses the GLES3 version of the same test and ensures that
INVALID_FRAMEBUFFER_OPERATION is thrown.
Affects:
dEQP-GLES2.functional.negative_api.texture.copytexsubimage2d_incomplete_framebuffer
Change-Id: I7b3f770ff31c73d770a53f6b6bdae3ea4a37b63a
Components: AOSP
Google bug:
37497541
Pyry Haulos [Tue, 18 Apr 2017 21:55:25 +0000 (21:55 +0000)]
Temporarily disable 2 VK_KHR_incremental_present tests am:
a542a3ad5b
am:
f5a50cbc79 -s ours
Change-Id: Icb9707fb0e48c14841938acab6a7c707f21c7d9f
Pyry Haulos [Tue, 18 Apr 2017 21:45:19 +0000 (21:45 +0000)]
Temporarily disable 2 VK_KHR_incremental_present tests
am:
a542a3ad5b
Change-Id: Ib2e4b2e4e0dae86ebd9eaabe7ae40b7f38c0bee6
Pyry Haulos [Tue, 18 Apr 2017 19:36:51 +0000 (12:36 -0700)]
Temporarily disable 2 VK_KHR_incremental_present tests
These tests currently time out on a few devices due to a perf
regression.
Bug:
37439915
Change-Id: I3e6e9a35739188797e8d58dff4ddfafbf4fb7e42
Merged-In: Id2b8e4366da75dcb1b3afdeaede325d3a34e3071
Pyry Haulos [Tue, 18 Apr 2017 19:31:16 +0000 (12:31 -0700)]
Skip merging oc-dev mustpass removals
Change-Id: Id2b8e4366da75dcb1b3afdeaede325d3a34e3071
Pyry Haulos [Tue, 18 Apr 2017 19:27:58 +0000 (12:27 -0700)]
Revert "DO NOT MERGE: Temporarily disable failing deqp tests"
This reverts commit
82e66a88f0bc8e5450360410720d076170a6d2e9.
Pyry Haulos [Tue, 18 Apr 2017 00:27:37 +0000 (00:27 +0000)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture am:
8290443470 am:
7e7f286dce am:
5ff8fe0a04
am:
2ee90b476e
Change-Id: I0da8a402fef6199837c52aeadbf9d886bb68cd75
Pyry Haulos [Tue, 18 Apr 2017 00:17:29 +0000 (00:17 +0000)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture am:
8290443470 am:
7e7f286dce
am:
5ff8fe0a04
Change-Id: Ie0095681fe275d0f97550d1bbeae4085e9f3b3ae
Pyry Haulos [Tue, 18 Apr 2017 00:13:03 +0000 (00:13 +0000)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture am:
8290443470
am:
7e7f286dce
Change-Id: Ibca9b3e20d1aa048c5fe19bee1fbed4259a3cac5
Pyry Haulos [Tue, 18 Apr 2017 00:08:58 +0000 (00:08 +0000)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture
am:
8290443470
Change-Id: Ie9f0302738035df22b5c355412c72d68d27b3388
Pyry Haulos [Mon, 17 Apr 2017 19:34:26 +0000 (12:34 -0700)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture
Affects:
dEQP-GLES2.functional.fbo.completeness.*
dEQP-GLES3.functional.fbo.completeness.*
Bug:
36727598
Change-Id: Ic79408c21b80ea458baecf79c042e2694e72e0b2
Mika Isojärvi [Thu, 13 Apr 2017 06:58:50 +0000 (06:58 +0000)]
Merge "DO NOT MERGE: Temporarily disable failing deqp tests" into oc-dev am:
4695739815
am:
261ff27a8c
Change-Id: I5ba20b17958d669f8ba7a29a32f7335b65508edb
Mika Isojärvi [Thu, 13 Apr 2017 06:53:20 +0000 (06:53 +0000)]
Merge "DO NOT MERGE: Temporarily disable failing deqp tests" into oc-dev
am:
4695739815
Change-Id: I9072733e2736c66004baf7511da447996f798683
TreeHugger Robot [Thu, 13 Apr 2017 06:44:15 +0000 (06:44 +0000)]
Merge "DO NOT MERGE: Temporarily disable failing deqp tests" into oc-dev
Brian Anderson [Thu, 13 Apr 2017 04:58:41 +0000 (04:58 +0000)]
EGL_ANDROID_get_frame_timestamps fixes am:
679b3e921a
am:
7f554ec88f
Change-Id: Ib13a6631a6c8a7c9a9f19c51198d25372d230f63
Brian Anderson [Thu, 13 Apr 2017 04:53:10 +0000 (04:53 +0000)]
EGL_ANDROID_get_frame_timestamps fixes
am:
679b3e921a
Change-Id: I86fb3d2bac467e840d59d7d432eadbecc6b24008
Mika Isojärvi [Wed, 12 Apr 2017 23:34:57 +0000 (16:34 -0700)]
DO NOT MERGE: Temporarily disable failing deqp tests
Bug:
34887315
Bug:
34887800
Bug:
36730849
Test: python scripts/check_build_sanity.py
Change-Id: I29d856a1f895ea4c0ffd3f771585dfaa2485d00a
Brian Anderson [Tue, 21 Mar 2017 20:03:33 +0000 (13:03 -0700)]
EGL_ANDROID_get_frame_timestamps fixes
Bug:
36730849
eglGetFrameTimestamps: pending vs. invalid timestamps.
Test: --deqp-case=dEQP-EGL*get_frame_timestamps*
Change-Id: I27718995c82748b55bc53e4d78a7f572e16a45ab
(cherry picked from commit
b4e217e4a19a1400e2beb9d7747bdbd6d1ba71e9)
eglGetFrameTimestamps: Allow optional present support.
Test: --deqp-case=dEQP-EGL*get_frame_timestamps*
Change-Id: I5cfb334966f7f2794fe0043e1809de324a6e3d0e
(cherry picked from commit
afb7428641dd7003b676354e68d4bd94ebf3f6cf)
eglGetFrameTimestamps: Use reserved enum values.
Test: --deqp-case=dEQP-EGL*get_frame_timestamps*
(cherry picked from commit
84574b5c7bf684be8ecbe211810210f712b7c522)
Brian Anderson [Wed, 12 Apr 2017 22:47:36 +0000 (22:47 +0000)]
eglGetFrameTimestamps: Use reserved enum values. am:
84574b5c7b am:
6ee57fc890 am:
475941c82b
am:
8db673346f
Change-Id: I9bac8fd34062be64f0348fa8f99c1bb644498364
Brian Anderson [Wed, 12 Apr 2017 22:47:33 +0000 (22:47 +0000)]
eglGetFrameTimestamps: Allow optional present support. am:
afb7428641 am:
4563d47710 am:
22cb1bb41b
am:
efeaa084a8
Change-Id: I8e6a0db476d24ef80433b8c2a421d40ba53fd57b
Brian Anderson [Wed, 12 Apr 2017 22:47:29 +0000 (22:47 +0000)]
eglGetFrameTimestamps: pending vs. invalid timestamps. am:
b4e217e4a1 am:
61e9fbabf0 am:
a41125daf9
am:
5e38c3842d
Change-Id: I3fc782c77fab372a095d19a68fd9d02e73c7977b
Brian Anderson [Wed, 12 Apr 2017 21:49:51 +0000 (21:49 +0000)]
eglGetFrameTimestamps: Use reserved enum values. am:
84574b5c7b am:
6ee57fc890
am:
475941c82b
Change-Id: I5a1d6ee59c91c170fea10a8d5182681b8852b00d
Brian Anderson [Wed, 12 Apr 2017 21:49:49 +0000 (21:49 +0000)]
eglGetFrameTimestamps: Allow optional present support. am:
afb7428641 am:
4563d47710
am:
22cb1bb41b
Change-Id: Ia1eb9b3020de4ca400a0fb2a0a631b57884914dd
Brian Anderson [Wed, 12 Apr 2017 21:49:45 +0000 (21:49 +0000)]
eglGetFrameTimestamps: pending vs. invalid timestamps. am:
b4e217e4a1 am:
61e9fbabf0
am:
a41125daf9
Change-Id: I604b6f1b349c54fd8fe6709766e2ce938bbb99d7
Brian Anderson [Wed, 12 Apr 2017 21:44:47 +0000 (21:44 +0000)]
eglGetFrameTimestamps: Use reserved enum values. am:
84574b5c7b
am:
6ee57fc890
Change-Id: I714be1607bbcfa77e5589f632d76f139ba5e6c82
Brian Anderson [Wed, 12 Apr 2017 21:44:45 +0000 (21:44 +0000)]
eglGetFrameTimestamps: Allow optional present support. am:
afb7428641
am:
4563d47710
Change-Id: I7a72a2f446ca2c8bd739e6b77dcf3933b5e26a7c
Brian Anderson [Wed, 12 Apr 2017 21:44:42 +0000 (21:44 +0000)]
eglGetFrameTimestamps: pending vs. invalid timestamps. am:
b4e217e4a1
am:
61e9fbabf0
Change-Id: I18300b52d4d195b2b87a0a38744e997640b2a54e
Brian Anderson [Wed, 12 Apr 2017 21:39:49 +0000 (21:39 +0000)]
eglGetFrameTimestamps: Use reserved enum values.
am:
84574b5c7b
Change-Id: Id7278a7635e01366e9a85800ab2716121b31dc8b
Brian Anderson [Wed, 12 Apr 2017 21:39:46 +0000 (21:39 +0000)]
eglGetFrameTimestamps: Allow optional present support.
am:
afb7428641
Change-Id: Iedc02e435a0b340b2ba8ee4edcccb39f60bfd1d1
Brian Anderson [Wed, 12 Apr 2017 21:39:40 +0000 (21:39 +0000)]
eglGetFrameTimestamps: pending vs. invalid timestamps.
am:
b4e217e4a1
Change-Id: I31c58b2fcc465ff1a46c8e4eaa9aaab7f3334751
Brian Anderson [Wed, 12 Apr 2017 00:06:53 +0000 (17:06 -0700)]
eglGetFrameTimestamps: Use reserved enum values.
Test: --deqp-case=dEQP-EGL*get_frame_timestamps*
Brian Anderson [Wed, 5 Apr 2017 19:42:52 +0000 (12:42 -0700)]
eglGetFrameTimestamps: Allow optional present support.
Test: --deqp-case=dEQP-EGL*get_frame_timestamps*
Change-Id: I5cfb334966f7f2794fe0043e1809de324a6e3d0e
Brian Anderson [Tue, 21 Mar 2017 20:03:33 +0000 (13:03 -0700)]
eglGetFrameTimestamps: pending vs. invalid timestamps.
Test: --deqp-case=dEQP-EGL*get_frame_timestamps*
Change-Id: I27718995c82748b55bc53e4d78a7f572e16a45ab
Ian Romanick [Tue, 11 Apr 2017 18:12:00 +0000 (18:12 +0000)]
Merge "Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377 am:
14221e7f43" into nyc-mr2-dev-plus-aosp am:
9f9bdc8201
am:
d07ebc4c7d
Change-Id: Ia16416301c0f380b7f28c4c168fb5f0e896a765f
Ian Romanick [Tue, 11 Apr 2017 18:11:44 +0000 (18:11 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6 am:
995657a4be" into nyc-mr2-dev-plus-aosp am:
fea22331f3
am:
f69e9e35f8
Change-Id: Ifb6fbc3ef6f04204570b1f9814318367c7f5c47d
Ian Romanick [Tue, 11 Apr 2017 18:11:31 +0000 (18:11 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd am:
8ca5b73a02 am:
33055729ed am:
b661c02c90
am:
e7c4c8b2fd
Change-Id: I455888dc4b01cfe33fde101d65705bf91823ddc6
Ian Romanick [Tue, 11 Apr 2017 18:11:18 +0000 (18:11 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377 am:
14221e7f43 am:
1039da878e
am:
4238a089a6
Change-Id: Icc530e4180a1bc40b53cfaa3e1a8e41f0bf1417a
Ian Romanick [Tue, 11 Apr 2017 18:11:02 +0000 (18:11 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6 am:
995657a4be am:
0dc7a59526
am:
dc412875c3
Change-Id: If27fbca668f63c75f22a672a278f2bfcd8b97aa8
Ian Romanick [Tue, 11 Apr 2017 17:46:26 +0000 (17:46 +0000)]
Merge "Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377 am:
14221e7f43" into nyc-mr2-dev-plus-aosp
am:
9f9bdc8201
Change-Id: Ic607b114cdf6cc3801e415a78262991bbf9338c2
Ian Romanick [Tue, 11 Apr 2017 17:46:09 +0000 (17:46 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6 am:
995657a4be" into nyc-mr2-dev-plus-aosp
am:
fea22331f3
Change-Id: Ia58e47cded08b1e5c2e54384442025245a2a9b04
Ian Romanick [Tue, 11 Apr 2017 17:45:54 +0000 (17:45 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd am:
8ca5b73a02 am:
33055729ed
am:
b661c02c90
Change-Id: I1899ece215ce5c0495694f8df018618ff8c59b25
Ian Romanick [Tue, 11 Apr 2017 17:42:43 +0000 (17:42 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377 am:
14221e7f43
am:
1039da878e
Change-Id: I255808b4435983a5784d2bbc291245adef55e294
Ian Romanick [Tue, 11 Apr 2017 17:42:29 +0000 (17:42 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6 am:
995657a4be
am:
0dc7a59526
Change-Id: I91cd127f2c370969dc741406a1dbe6ea53f9ba5f
Android Build Merger (Role) [Tue, 11 Apr 2017 17:36:08 +0000 (17:36 +0000)]
Merge "Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377 am:
14221e7f43" into nyc-mr2-dev-plus-aosp
Ian Romanick [Tue, 11 Apr 2017 17:36:04 +0000 (17:36 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377
am:
14221e7f43
Change-Id: I8cee0ca3ffd15664f4dd6307d89c616795aa78ff
Ian Romanick [Tue, 11 Apr 2017 17:36:03 +0000 (17:36 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377
am:
14221e7f43
Change-Id: I549286b3821fe7b581c83d6c22b20fac02db0700
Android Build Merger (Role) [Tue, 11 Apr 2017 17:35:58 +0000 (17:35 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6 am:
995657a4be" into nyc-mr2-dev-plus-aosp
Ian Romanick [Tue, 11 Apr 2017 17:35:53 +0000 (17:35 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6
am:
995657a4be
Change-Id: Iffc14ae705cfd48ac90a2f7e1c805362d98c0826
Ian Romanick [Tue, 11 Apr 2017 17:35:53 +0000 (17:35 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6
am:
995657a4be
Change-Id: I6c8054a50950a6487cc387b2a8c3367c2456a291
Ian Romanick [Tue, 11 Apr 2017 17:35:51 +0000 (17:35 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd am:
8ca5b73a02
am:
33055729ed
Change-Id: I0881071cbe55d861c25f7da65581830ea8e42094
Ian Romanick [Tue, 11 Apr 2017 17:31:35 +0000 (17:31 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015
am:
1e68201377
Change-Id: I3b9cde7321a9a4907c4de9c7c080bb93f7b7cb34
Ian Romanick [Tue, 11 Apr 2017 17:31:23 +0000 (17:31 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd
am:
8ca5b73a02
Change-Id: I61517c340b5dac80d57e6c41723dae0b3a3c6cf3
Ian Romanick [Tue, 11 Apr 2017 17:31:23 +0000 (17:31 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5
am:
d76c57f2b6
Change-Id: I594f19d5f680816cdcbd36e3f641ad5b13e77142
Ian Romanick [Tue, 11 Apr 2017 17:27:32 +0000 (17:27 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev
am:
768446b015
Change-Id: I008fce677439c28c74c93981b2571b340d231444
Ian Romanick [Tue, 11 Apr 2017 17:27:20 +0000 (17:27 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83
am:
8bb630d3e5
Change-Id: Ic0dc4acc742c6687a1cb666ac521f61917637bf7
Android Build Merger (Role) [Tue, 11 Apr 2017 17:22:26 +0000 (17:22 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev
Ian Romanick [Tue, 11 Apr 2017 17:22:20 +0000 (17:22 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5
am:
a4ddab16dd
Change-Id: Id0387a01061c95f4c51728c8af917aa63354097b
Ian Romanick [Tue, 11 Apr 2017 17:22:19 +0000 (17:22 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11
am:
c7970bbd83
Change-Id: I1a41ff937b2f7328f7ef9b18cc8074614113c242
Ian Romanick [Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5
am:
a4ddab16dd
Change-Id: I18fe6a8ba3ba328513afdf1f5e5d32db6de32373
Ian Romanick [Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5
am:
fdc198ba11
Change-Id: Ieb66f942f4d5e690f1cdfecfc92144deca46d12a
Ian Romanick [Tue, 11 Apr 2017 17:13:20 +0000 (17:13 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev
am:
aeef6dd8f5
Change-Id: Ia384b5bb86c9e07ecc47a0c1002205ce27f4e399
Ian Romanick [Tue, 11 Apr 2017 17:13:17 +0000 (17:13 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev
am:
aeef6dd8f5
Change-Id: I8300511b30c7bd03885a6cb019970852f7e72693
Treehugger Robot [Tue, 11 Apr 2017 16:56:42 +0000 (16:56 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev
Ian Romanick [Thu, 10 Nov 2016 01:29:01 +0000 (17:29 -0800)]
Try harder to defeat GLSL compiler dead-code optimizations
A number of CTS tests generate shaders like like:
#version 310 es
buffer TargetInterface
{
highp float target;
};
highp vec4 readInputs()
{
highp vec4 retValue = vec4(0.0);
retValue += vec4(float(target));
return retValue;
}
void writeOutputs(in highp vec4 dummyValue)
{
target = float(dummyValue.y);
}
void main()
{
writeOutputs(readInputs());
}
After various common optimizations this becomes:
buffer TargetInterface
{
highp float target;
};
void main()
{
target = target;
}
In the absence of memoryBarrier() or qualifiers on the buffer, there is
no guarantee about the order of writes to the buffer. Since this write
is not guaranteed to be visible either on the GPU or the CPU, we
eliminate it. Since there is no access to target in the shader, we
report GL_REFERENCED_BY_FRAGMENT_SHADER = GL_FALSE. The tests expect
GL_TRUE.
The vectored versions of this test swizzle the value read from the
buffer before writing it back. These writes are not eliminated.
Adding a uniform instead of a literal constant also prevents the reads
and writes of the SSBO from being eliminated.
v2: Ignore the uniform named "zero" in
ResourceListTestCase::verifyResourceList. The alternative was to add
zero to the resource list, but that required making small changes
(mostly removing const) from over a dozen places in the code. This
slightly hacky, but localized, change seemed better.
v3: Various coding standards fixes suggested by Alexander Galazin and
Pyry. Add getDummyZeroUniformName to query name of the zero uniform and
a lot more documentation. Both suggested by Pyry.
The following tests are affected:
- dEQP-GLES31.functional.program_interface_query.buffer_variable.random.6
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.compute.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.separable_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_fragment_only_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_geo_fragment_only_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_geo_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_tess_fragment_only_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_tess_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_tess_geo_fragment_only_fragment.unnamed_block.float
- dEQP-GLES31.functional.program_interface_query.buffer_variable.referenced_by.vertex_tess_geo_fragment.unnamed_block.float
Change-Id: I867ad32476269ac1272c09672be0a6d6fe37e31e
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://cvs.khronos.org/bugzilla/show_bug.cgi?id=16114
Google bug:
37228062
Kalle Raita [Sun, 9 Apr 2017 18:05:35 +0000 (18:05 +0000)]
Merge "Allow robustness tests on GLES 3.0" am:
ab3013ef10 am:
b23ee5b160 am:
e801ea5994 am:
ef62cc04d9 am:
49b972090a
am:
9d266e8df4
Change-Id: I141cd585fb0bb1896ed89cdb9d44ac3dc0871da9
Kalle Raita [Sun, 9 Apr 2017 18:00:56 +0000 (18:00 +0000)]
Merge "Allow robustness tests on GLES 3.0" am:
ab3013ef10 am:
b23ee5b160 am:
e801ea5994 am:
ef62cc04d9
am:
49b972090a
Change-Id: I113cf4172a072007c2af1345fe69d03c7049c04c
Kalle Raita [Fri, 7 Apr 2017 20:02:36 +0000 (20:02 +0000)]
Merge "Allow robustness tests on GLES 3.0" am:
ab3013ef10 am:
b23ee5b160 am:
e801ea5994
am:
ef62cc04d9
Change-Id: I9a7fffe577492ca96cad5ba39ff975839513cfb7
(cherry picked from commit
db8c8ab78d376a5ee1ae2870ce943450816500ce)
Original AOSP change:
Allow robustness tests on GLES 3.0
Allow selected robustness tests run on GLES 3.0 instead of always
requiring 3.1.
Change-Id: I1eba67582a8f478f1afcbc24302b0e1dcefff3a8
Affects: dEQP-EGL.functional.robustness.*
Bug:
36428911
Test: dEQP-EGL.functional.robustness.* on Pixel XL
Kalle Raita [Fri, 7 Apr 2017 20:02:36 +0000 (20:02 +0000)]
Merge "Allow robustness tests on GLES 3.0" am:
ab3013ef10 am:
b23ee5b160 am:
e801ea5994
am:
ef62cc04d9
Change-Id: I9a7fffe577492ca96cad5ba39ff975839513cfb7
Kalle Raita [Fri, 7 Apr 2017 19:58:05 +0000 (19:58 +0000)]
Merge "Allow robustness tests on GLES 3.0" am:
ab3013ef10 am:
b23ee5b160
am:
e801ea5994
Change-Id: I52eeb782dfcee1b895c29d3ea774d3cd3428d04f
Kalle Raita [Fri, 7 Apr 2017 19:54:05 +0000 (19:54 +0000)]
Merge "Allow robustness tests on GLES 3.0" am:
ab3013ef10
am:
b23ee5b160
Change-Id: I890cf44e96256d293df7953d55708ed7e1e4e24b
Kalle Raita [Fri, 7 Apr 2017 19:50:05 +0000 (19:50 +0000)]
Merge "Allow robustness tests on GLES 3.0"
am:
ab3013ef10
Change-Id: If6497fda1e89609581607770ec60ac6b0d13c2fd
Kalle Raita [Fri, 7 Apr 2017 19:42:06 +0000 (19:42 +0000)]
Merge "Allow robustness tests on GLES 3.0"
Kalle Raita [Thu, 30 Mar 2017 17:23:47 +0000 (10:23 -0700)]
Allow robustness tests on GLES 3.0
Allow selected robustness tests run on GLES 3.0 instead of always
requiring 3.1.
Affects: dEQP-EGL.functional.robustness.*
Bug:
36428911
Test: dEQP-EGL.functional.robustness.* on Pixel XL
Change-Id: I78f543dcd667b5121f61150b082fd4a4a9c14b23
Pyry Haulos [Fri, 7 Apr 2017 00:50:58 +0000 (00:50 +0000)]
Merge vulkan-cts-1.0.2 into goog/oc-dev am:
605556c673
am:
f3c5fbe817
Change-Id: I71d580deb70a80740722da16eea41fa911077ebe
Pyry Haulos [Fri, 7 Apr 2017 00:44:25 +0000 (00:44 +0000)]
Merge vulkan-cts-1.0.2 into goog/oc-dev
am:
605556c673
Change-Id: I44b218450c8f6208594294be0aa07db2f2224c0d
Pyry Haulos [Thu, 6 Apr 2017 22:59:58 +0000 (22:59 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master am:
55da06144c am:
d905a013d0 am:
c91ce3f2a2
am:
dca02bef80
Change-Id: I9b2783249e92a0bad6dd04ac3f973738df521883
projects / platform / upstream / VK-GL-CTS.git / log