Alexander Galazin [Wed, 3 May 2017 16:16:08 +0000 (16:16 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
71a9bc447d am:
620c938d61 am:
62aeee5d3e am:
f83b3c5679
am:
64598a3e94
Change-Id: I8eda5991f3fc92e64bdcea31f4f4bfed1c2929b4
Android Build Merger (Role) [Wed, 3 May 2017 16:14:23 +0000 (16:14 +0000)]
Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9" into nyc-mr1-dev am:
26ff3a55fd am:
4f2accd121 am:
eb48f49ddc -s ours" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Wed, 3 May 2017 16:14:15 +0000 (16:14 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9" into nyc-mr1-dev am:
26ff3a55fd am:
4f2accd121
am:
eb48f49ddc -s ours
Change-Id: Ib55e83cc935c9e921f7511534af7a5d3649a9eac
Android Build Merger (Role) [Wed, 3 May 2017 16:14:10 +0000 (16:14 +0000)]
Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908" into nyc-mr1-dev am:
cbd57d8ea2 am:
e63231fb5e am:
282f941efc" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 3 May 2017 16:14:06 +0000 (16:14 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9 -s ours am:
18231b0d34 -s ours am:
df2c784664 -s ours" into nyc-mr2-dev-plus-aosp
Alexander Galazin [Wed, 3 May 2017 16:14:06 +0000 (16:14 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908" into nyc-mr1-dev am:
cbd57d8ea2 am:
e63231fb5e
am:
282f941efc
Change-Id: I2289455e7e7d0d30105b4b6e931cb917fe5201d3
Android Build Merger (Role) [Wed, 3 May 2017 16:14:00 +0000 (16:14 +0000)]
Merge "Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
e94af4b69f am:
d92ff56cca" into nyc-mr1-dev am:
2e135d60c4 am:
b804e15573 am:
f981189859" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Wed, 3 May 2017 16:14:00 +0000 (16:14 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9 -s ours am:
18231b0d34 -s ours
am:
df2c784664 -s ours
Change-Id: I50ce03149d8ca74ed207910688f1ec4652e9e3db
Android Build Merger (Role) [Wed, 3 May 2017 16:13:55 +0000 (16:13 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908 am:
0543f8e619 am:
261a03ba31" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Wed, 3 May 2017 16:13:54 +0000 (16:13 +0000)]
Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
e94af4b69f am:
d92ff56cca" into nyc-mr1-dev am:
2e135d60c4 am:
b804e15573
am:
f981189859
Change-Id: Ic97d42989936d7b590d13abe8a09e07fbe5bf378
Alexander Galazin [Wed, 3 May 2017 16:13:51 +0000 (16:13 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908 am:
0543f8e619
am:
261a03ba31
Change-Id: Ib16cfe7f0642abf81fb43e6c416433669c5e485c
Android Build Merger (Role) [Wed, 3 May 2017 16:13:49 +0000 (16:13 +0000)]
Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387 am:
8b78db19fd am:
9d0568c51e am:
e6eb42c8fd" into nyc-mr2-dev-plus-aosp
Pyry Haulos [Wed, 3 May 2017 16:13:39 +0000 (16:13 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387 am:
8b78db19fd am:
9d0568c51e
am:
e6eb42c8fd
Change-Id: I58ad9518a226f67acc4c3d6ceba58928daec3135
Pyry Haulos [Wed, 3 May 2017 16:13:36 +0000 (16:13 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387 am:
d1aa6c62e3
am:
347c7f4d8b
Change-Id: I7497ac1f06891ddeb33a726cb1568980ef7dea71
Alexander Galazin [Wed, 3 May 2017 16:13:35 +0000 (16:13 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
71a9bc447d am:
620c938d61 am:
62aeee5d3e
am:
f83b3c5679
Change-Id: Idc2a767f42d571de025ed99538f769e50a6e089d
Pyry Haulos [Wed, 3 May 2017 16:11:42 +0000 (16:11 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9" into nyc-mr1-dev am:
26ff3a55fd
am:
4f2accd121
Change-Id: If4e842f041eb09e0b9490944b722fa2f621ddd26
Pyry Haulos [Wed, 3 May 2017 16:11:34 +0000 (16:11 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9 -s ours
am:
18231b0d34 -s ours
Change-Id: Icb4d6d9b23cbb19186192b5219f310c157e97922
Alexander Galazin [Wed, 3 May 2017 16:11:31 +0000 (16:11 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908" into nyc-mr1-dev am:
cbd57d8ea2
am:
e63231fb5e
Change-Id: Iebfca6923d5c6bd9daef134283c5492bc5a88852
Alexander Galazin [Wed, 3 May 2017 16:11:22 +0000 (16:11 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908
am:
0543f8e619
Change-Id: I187d2d189d102d193717bf43ca4398cd6e8e975b
Pyry Haulos [Wed, 3 May 2017 16:11:18 +0000 (16:11 +0000)]
Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
e94af4b69f am:
d92ff56cca" into nyc-mr1-dev am:
2e135d60c4
am:
b804e15573
Change-Id: I5a67bd5cc95891335f7a78613b8c2754db1b4f59
Pyry Haulos [Wed, 3 May 2017 16:11:10 +0000 (16:11 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387
am:
d1aa6c62e3
Change-Id: Ie638176a5fb9b8b843b1c1995c01468c4503d39b
Pyry Haulos [Wed, 3 May 2017 16:11:06 +0000 (16:11 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387 am:
8b78db19fd
am:
9d0568c51e
Change-Id: I0a9effff3029e36c01ac36104ea961afbfa78274
Alexander Galazin [Wed, 3 May 2017 16:11:06 +0000 (16:11 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
71a9bc447d am:
620c938d61
am:
62aeee5d3e
Change-Id: I0539b2cf51815eef95eba86e72557813e9bd1937
Pyry Haulos [Wed, 3 May 2017 16:09:13 +0000 (16:09 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9" into nyc-mr1-dev
am:
26ff3a55fd
Change-Id: I546fb08c2c59d10ca3a95fd2307251e11d72623e
Alexander Galazin [Wed, 3 May 2017 16:09:01 +0000 (16:09 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908" into nyc-mr1-dev
am:
cbd57d8ea2
Change-Id: Icc96166d287cf874820f734375a4f60a4620ff43
Pyry Haulos [Wed, 3 May 2017 16:08:49 +0000 (16:08 +0000)]
Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
e94af4b69f am:
d92ff56cca" into nyc-mr1-dev
am:
2e135d60c4
Change-Id: I91b5e5909e78a996273bc7103c5d8978cc6c2a7f
Pyry Haulos [Wed, 3 May 2017 16:08:36 +0000 (16:08 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387
am:
8b78db19fd
Change-Id: I76337ccc173fb8bce30b26aa1e50a0e88ecc7918
Alexander Galazin [Wed, 3 May 2017 16:08:35 +0000 (16:08 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
71a9bc447d
am:
620c938d61
Change-Id: I5f0ad6166b794a441678451ccb70c9628f3100ca
Android Build Merger (Role) [Wed, 3 May 2017 16:07:03 +0000 (16:07 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9" into nyc-mr1-dev
Pyry Haulos [Wed, 3 May 2017 16:06:57 +0000 (16:06 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47
am:
90e6678bc9
Change-Id: I06a9f451d5ba510d77b89c01dbe33229bbd75319
Android Build Merger (Role) [Wed, 3 May 2017 16:06:52 +0000 (16:06 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908" into nyc-mr1-dev
Alexander Galazin [Wed, 3 May 2017 16:06:47 +0000 (16:06 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52
am:
2585331908
Change-Id: Ide25b381041f3c545b53906842a2caa7733b7ddc
Android Build Merger (Role) [Wed, 3 May 2017 16:06:44 +0000 (16:06 +0000)]
Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
e94af4b69f am:
d92ff56cca" into nyc-mr1-dev
Pyry Haulos [Wed, 3 May 2017 16:06:36 +0000 (16:06 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f
am:
eba26e2387
Change-Id: I849814817f65bd5e127463af9fb5a27a9759870c
Alexander Galazin [Wed, 3 May 2017 16:06:35 +0000 (16:06 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52
am:
71a9bc447d
Change-Id: Iba7f7005d3fe89e5a927cf5afe07a13a3312a525
Pyry Haulos [Wed, 3 May 2017 16:06:35 +0000 (16:06 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
e94af4b69f
am:
d92ff56cca
Change-Id: I4b38bd10ac0d0748948c7ec5e72c5595689ac7b7
Pyry Haulos [Wed, 3 May 2017 16:05:58 +0000 (16:05 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47
am:
90e6678bc9 -s ours
Change-Id: I157b06b418801793909c853f0e3f51c574283d15
Alexander Galazin [Wed, 3 May 2017 16:05:41 +0000 (16:05 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52
am:
2585331908
Change-Id: Ibc91272a8ad15f813f273cf05bb6b6f846ae600f
Alexander Galazin [Wed, 3 May 2017 16:04:08 +0000 (16:04 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
am:
eebcec1b52
Change-Id: I4c726cca01d733fadfeef64f9ade6318bed6e66b
Pyry Haulos [Wed, 3 May 2017 16:04:06 +0000 (16:04 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f
am:
e94af4b69f
Change-Id: Ia413488ae565cb75cc79260362ff4dd7cf1c2ef5
Pyry Haulos [Wed, 3 May 2017 16:03:19 +0000 (16:03 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
am:
9a83ec3f47
Change-Id: I1dfb480ed3b5fb7f384a8fe9b0a852134fde1500
Alexander Galazin [Wed, 3 May 2017 16:03:07 +0000 (16:03 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
am:
eebcec1b52
Change-Id: Ib4d673157f82d00d0d27ab3496ac8a1dc6634fe1
Pyry Haulos [Wed, 3 May 2017 16:02:07 +0000 (16:02 +0000)]
Try to determine renderable format in lifetime tests
am:
c0a5dc217f
Change-Id: I36f65b41ac4958f0794e4ca52a9703e80aa37fab
Pyry Haulos [Wed, 3 May 2017 16:01:08 +0000 (16:01 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f
am:
eba26e2387
Change-Id: I374e4e781d4b3d89c9e6a9e97deffe466298ddea
Treehugger Robot [Wed, 3 May 2017 16:01:05 +0000 (16:01 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
Treehugger Robot [Wed, 3 May 2017 15:59:50 +0000 (15:59 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
Pyry Haulos [Wed, 3 May 2017 15:58:34 +0000 (15:58 +0000)]
Try to determine renderable format in lifetime tests
am:
c0a5dc217f
Change-Id: I99514ee1a3ccb9a0aa397f0a8e9e7d45b47ec9ba
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 [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
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 12:08:44 +0000 (14:08 +0200)]
Fix error mask generation in checkLineContinuity
Even if some pixels are missing the function could return
all-zero errorMask if the messageLimitcounter was exhausted.
Components: AOSP
Affects: dEQP-GLES31.functional.primitive_bounding_box.lines.*
Google bug:
35987764
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 [Mon, 17 Apr 2017 21:34:27 +0000 (14:34 -0700)]
Try to determine renderable format in lifetime tests
Affects:
dEQP-GLES2.functional.lifetime.attach.deleted_input.renderbuffer_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_input.texture_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_output.renderbuffer_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_output.texture_framebuffer
Bug:
36724173
Change-Id: I46196317c144f294adce65ff4690571d28e1caf3
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
Merged-In: Ic79408c21b80ea458baecf79c042e2694e72e0b2
Change-Id: Ib302b21b2b28d4f13aa6df8bdcac878f22ae51be
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
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
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: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: 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:
fdc198ba11
Change-Id: Ieb66f942f4d5e690f1cdfecfc92144deca46d12a
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: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 [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 [Thu, 6 Apr 2017 22:35:15 +0000 (22:35 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master am:
55da06144c
am:
d905a013d0
Change-Id: I11090976693bc93d2c7e788787117d8827085307
Pyry Haulos [Thu, 6 Apr 2017 22:31:15 +0000 (22:31 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master
am:
55da06144c
Change-Id: Icf62fe8d7d8d905fd5fde4e7e4b5543ef4cfe4ca
Pyry Haulos [Thu, 6 Apr 2017 22:11:48 +0000 (22:11 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found" am:
89c3844ccb
am:
17ff0445a7
Change-Id: Ide162a44dc871ed6667348e3ab6fb19cddbfa1fa
Pyry Haulos [Thu, 6 Apr 2017 22:07:10 +0000 (22:07 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found"
am:
89c3844ccb
Change-Id: I07f4c66c34d7f55dc3116fe65902f7a932f2a059
Pyry Haulos [Thu, 6 Apr 2017 22:02:17 +0000 (15:02 -0700)]
Merge vulkan-cts-1.0.2 into aosp/master
Contains following fixes that have been made after vulkan-cts-1.0.2.2:
* Fix - uniform buffer incorrectly dereferenced
* Use vkGetInstanceProcAddr(NULL) to load platform funcs
* Imgtec Waiver for texture_gather*cube*depth32f*
* Add VK_KHR_incremental_present to the list of allowed device
extensions
* Use -std=c++03 with GCC and clang
* Fix GCC 6.3 warnings in vulkan-cts-1.0.2
* Improve check_build_sanity.py
* Relax image verification in anisotropic filtering tests
* Respect maxColorAttachments in image tests
* Fix SPIR-V generation in dEQP-VK.spirv_assembly
* Fix - depth/stencil images mandatory only for VK_IMAGE_TYPE_2D
* Add missing barrier in ssbo layout tests
This merge doesn't match any Vulkan CTS release tag.
Bug:
36899783
Bug:
36817508
Change-Id: I5dff02835e5296e1c25ba67675c06e2261e5c476