Alexander Galazin [Mon, 8 May 2017 12:31:15 +0000 (14:31 +0200)]
Fix negative CompressedTexImage2D tests
Certain tests expect GL_VALID_VAULE for
glCompressedTexImage2D(GL_TEXTURE_2D, -1, 0x8b90, 0, 0, 0, 0, 0).
0x8b90 is a palette format PALETTE4_RGB8 and
the OES_compressed_paletted_texture extension allows
negative values for the level parameter:
Accepted by the <level> parameter of CompressedTexImage2D
Zero and negative values. |level| + 1 determines the number of
mip levels defined for the paletted texture.
This change fixes the tests in presence of
the OES_compressed_paletted_texture extension.
Components: AOSP
Google bug:
38109626
Affects:
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_level_tex2d
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_level_cube
Change-Id: Ia37e3fecaf3547abfb209803378114043c63a243
(cherry picked from commit
9de005f0355e389f1782543f34e0fb3c65a0a700)
Pyry Haulos [Wed, 3 May 2017 18:05:12 +0000 (18:05 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
c2594c65ff" into nyc-mr1-dev am:
2190aa2642 am:
7394ee84a1
am:
579c101261
Change-Id: Ib5d026e7e4e689cf07791e6311d63c0e9561a542
Pyry Haulos [Wed, 3 May 2017 18:04:55 +0000 (18:04 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
45d860b737 am:
2196375b32 am:
84ee6b2620 am:
d4c8a3ac82
am:
862196b30a
Change-Id: Ifade543e4262d872142c9d3fa7dd54b23f382a8c
Pyry Haulos [Wed, 3 May 2017 18:04:38 +0000 (18:04 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
9443c9c4c0 am:
578ae6d230 am:
6b5103682e am:
28cc3b34a9
am:
c99530440b
Change-Id: I97eba377b795020191d0cfccee80f33188eb9ac2
Alexander Galazin [Wed, 3 May 2017 18:04:20 +0000 (18:04 +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: I707f8523b65c4e6d18f3c30c848359dbefc140c5
Pyry Haulos [Wed, 3 May 2017 16:17:01 +0000 (09:17 -0700)]
resolve merge conflicts of
eb48f49dd to oc-dev
Test: scripts/check_build_sanity.py
Change-Id: Iebca655530a000eb96e744fae44a4a9f740c91af
Pyry Haulos [Wed, 3 May 2017 16:16:19 +0000 (16:16 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
c2594c65ff" into nyc-mr1-dev am:
2190aa2642
am:
7394ee84a1
Change-Id: I3c7400d5f5b25062d72b00a1fba0719f6bdad171
Pyry Haulos [Wed, 3 May 2017 16:16:06 +0000 (16:16 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
45d860b737 am:
2196375b32 am:
84ee6b2620
am:
d4c8a3ac82
Change-Id: I6d9f11eab0cddb3abe8beb8af5cacfc3f538a23a
Alexander Galazin [Wed, 3 May 2017 16:14:00 +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: I29e45817dd40064cb7e14e1556c0ca7f579d543d
Pyry Haulos [Wed, 3 May 2017 16:13:50 +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: I3fa10677ea6bab3fc6704a7e87f5207e2510aac1
Pyry Haulos [Wed, 3 May 2017 16:13:46 +0000 (16:13 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
c2594c65ff" into nyc-mr1-dev
am:
2190aa2642
Change-Id: I0ca69aeb72966ca1760ddb1b52af5b0896200936
Pyry Haulos [Wed, 3 May 2017 16:13:44 +0000 (16:13 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
9443c9c4c0 am:
578ae6d230 am:
6b5103682e
am:
28cc3b34a9
Change-Id: Iee8955593b7276884cfdcdb38e14a2acaff8d383
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: Id0cb1111377ad3aa758c02faa589bafca2d806c0
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:13:35 +0000 (16:13 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
45d860b737 am:
2196375b32
am:
84ee6b2620
Change-Id: Icbd6e2e82dd0dda0e28881154e1d0ba2ed24af7e
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
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
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
Android Build Merger (Role) [Wed, 3 May 2017 16:11:18 +0000 (16:11 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
c2594c65ff" into nyc-mr1-dev
Pyry Haulos [Wed, 3 May 2017 16:11:16 +0000 (16:11 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
9443c9c4c0 am:
578ae6d230
am:
6b5103682e
Change-Id: I30320577a9c755ac3c437c8bcc967b20b254652b
Pyry Haulos [Wed, 3 May 2017 16:11:07 +0000 (16:11 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
45d860b737
am:
2196375b32
Change-Id: If38159d29357c10a4fcae002dee923433cf48ff6
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:11:06 +0000 (16:11 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f
am:
c2594c65ff
Change-Id: I8b7fab12228e9366c9f96280288a88867bbd4724
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:46 +0000 (16:08 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
9443c9c4c0
am:
578ae6d230
Change-Id: I36eb3d69950032890a944b6ca326ef9dbcc4221a
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
Pyry Haulos [Wed, 3 May 2017 16:08:35 +0000 (16:08 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f
am:
45d860b737
Change-Id: I9bfa731b074538d354a25945f760ba00d9c31ad1
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
Pyry Haulos [Wed, 3 May 2017 16:07:36 +0000 (16:07 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev
am:
acf47d464f
Change-Id: I82bfed0cc9cee128a8552b4e8cf3fb87ced37c9f
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
Pyry Haulos [Wed, 3 May 2017 16:06:47 +0000 (16:06 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47
am:
9443c9c4c0
Change-Id: Iaab965ccbaeb3ca315a5da67ae342b25b1fccb35
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:40 +0000 (16:06 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev
am:
acf47d464f
Change-Id: Iabf1c0d76db9f83f64cae805f89bd60230cd0408
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:04:22 +0000 (16:04 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
am:
9a83ec3f47
Change-Id: I18cb5efebe1ed2b56818fc2c5b8da89f0a4fd1d7
Treehugger Robot [Wed, 3 May 2017 16:04:13 +0000 (16:04 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev
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
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 [Tue, 2 May 2017 17:08:44 +0000 (10:08 -0700)]
Remove all temporary exclusions
Restore following case to the must-pass:
dEQP-VK.ubo.random.all_shared_buffer.48
dEQP-VK.wsi.android.incremental_present.scale_down.fifo.reference
dEQP-VK.wsi.android.incremental_present.scale_down.fifo.incremental_present
dEQP-GLES3.functional.pbo.renderbuffer.rgb565_clears
Reverts commits:
a542a3ad5ba5e03407fcdbce6469bd5a1aaf2b86
82e66a88f0bc8e5450360410720d076170a6d2e9
Bug:
37476650
Bug:
34887315
Bug:
34887800
Bug:
37439915
Test: Via CTS, Angler, Marlin: dEQP-GLES3.functional.pbo.renderbuffer.*
Test: Via CTS, Angler: dEQP-VK.wsi.android.incremental_present.*
Test: Via CTS, Marlin: dEQP-VK.ubo.random.all_shared_buffer.*
Change-Id: I30cebd0f89744a4e8b1363baa60aa13e3b51fb21
Merged-In: Id2b8e4366da75dcb1b3afdeaede325d3a34e3071
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 [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
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 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)
Pyry Haulos [Tue, 18 Apr 2017 23:13:59 +0000 (16:13 -0700)]
Fix color change verification in dithering tests
Tests were supposed to allow color change once per row/column depending
on gradient direction but instead allowed color change in constant
direction only once over whole image.
Affects:
dEQP-GLES2.functional.dither.disabled.gradient_*
dEQP-GLES3.functional.dither.disabled.gradient_*
Bug:
37477346
Change-Id: I37ef06b4ff527f8c316eae56c8a99c88cdaaf4b4
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 [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 [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
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
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)
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: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: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:
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: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 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
Pyry Haulos [Thu, 6 Apr 2017 22:40:05 +0000 (15:40 -0700)]
Merge vulkan-cts-1.0.2 into goog/oc-dev
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: Id94c70d824ca503666adf16c56ccd3de48edac05
Pyry Haulos [Thu, 6 Apr 2017 18:04:35 +0000 (11:04 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Change-Id: Iaedfbb3579c55d33ebfc415197a67b8145725f4f
Marcin Kańtoch [Tue, 4 Apr 2017 12:31:34 +0000 (14:31 +0200)]
Fix - uniform buffer incorrectly dereferenced
Uniform buffer is incorrectly dereferenced in
ssbo layout tests.
Affected tests: dEQP-VK.ssbo.layout.*
Change-Id: I5831ad75f558f8992bed6bdc48b1833d2ee13d26
Pyry Haulos [Thu, 6 Apr 2017 16:03:37 +0000 (09:03 -0700)]
Do not re-init GL functions after context reset
SharedContextResetCase was calling initGLFunctions() using a context
belonging to a share group where context reset has occurred.
initGLFunctions() calls glGetError() internally and at that point it
would return GL_CONTEXT_LOST.
Affects:
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.fragment
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex_and_fragment
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.compute
Bug:
37077017
Change-Id: I27ae0951565760dee0bcc5040bb02a45c8f568f3
(cherry picked from commit
72c880b4c940ca4435f87a4d1679a14678cea364)
Pyry Haulos [Wed, 5 Apr 2017 18:05:03 +0000 (11:05 -0700)]
Use vkGetInstanceProcAddr(NULL) to load platform funcs
Vulkan specification says that only vkGetInstanceProcAddr() has to be
loaded using platform-specific means. Other 'platform'-class functions,
listed below, can be loaded using vkGetInstanceProcAddr(NULL, pName).
Following functions are loaded with vkGetInstanceProcAddr():
* vkEnumerateInstanceExtensionProperties
* vkEnumerateInstanceLayerProperties
* vkCreateInstance
Change-Id: Iab0657bf93d3a36e4f4dda4a1f1550024db0890e
Pyry Haulos [Wed, 5 Apr 2017 18:34:23 +0000 (11:34 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Change-Id: I2614d3a7ce451d47418e7c850a7c2c372f2189a9
Alex Walters [Mon, 3 Apr 2017 10:46:36 +0000 (11:46 +0100)]
Imgtec Waiver for texture_gather*cube*depth32f*
Some versions of Imagination Technologies G6200, G6230, G6400, and
G6430 Rogue Series 6 GPU's are unable to correctly filter CEM corners
with F32 textures, this includes the ability to gather texels for texel
gather instructions.
This CL excludes the affected tests from mustpass.
Affects:
All dEQP-VK.glsl.texture_gather.basic.cube.depth32f* tests except:
dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners*
Components: Vulkan
VK-GL-CTS issue: 336
Change-Id: I4e20d887ad2901f78a7af326035d7a2a9ae5e76a
Alexander Galazin [Wed, 5 Apr 2017 07:30:06 +0000 (09:30 +0200)]
Fix shader bugs in OOB tests
1. Check that the required number of vertex shader storage blocks is supported,
throw NotSupported otherwise.
2. Use an array instead of a vector in local_array tests.
3. Try harder to defeat compiler optimizations on arrays, i.e. initialize it
with different values.
Components: AOSP
Affects:
dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.*.shader_storage_block.vertex*
dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.*.local_array.*
Google bug:
36891454
Change-Id: I2aeb2d454295993126d4048759e5981421d5c0db
(cherry picked from commit
cf65c56fb46b75e3c9819218165d9b97acf25c4a)
Iago Toral Quiroga [Tue, 4 Apr 2017 09:50:37 +0000 (11:50 +0200)]
Add VK_KHR_incremental_present to the list of allowed device extensions
Otherwise dEQP-VK.api.info.device.extensions will fail
for drivers that expose the extension.
Components: Vulkan
VK-GL-CTS issue: 346
Affects:
dEQP-VK.api.info.device.extensions
Change-Id: If1a5d971226adca2bfd1586cb1f568e2ca244b6d
Pyry Haulos [Thu, 30 Mar 2017 23:59:27 +0000 (16:59 -0700)]
Use -std=c++03 with GCC and clang
dEQP currently maintains minimum requirement of c++03 support from
toolchains. Use of c++11 or newer is not allowed
GCC 6.1 enables c++14 mode by default and developers might accidentally
use features from it unless we specify c++03 version.
Change-Id: If9ed0f009310b63b29b6a8a355969030b45139ba
Components: Framework
Pyry Haulos [Thu, 30 Mar 2017 23:42:23 +0000 (16:42 -0700)]
Fix GCC 6.3 warnings in vulkan-cts-1.0.2
Change-Id: Iede7ed79a031ab38c0665d1a115e34d034d2b662
Pyry Haulos [Fri, 27 Jan 2017 00:36:18 +0000 (16:36 -0800)]
Improve check_build_sanity.py
* All steps now respect --tmp-dir argument. This required adding
--build-dir and other args to mustpass scripts.
* --recipe command line argument allows running only a specific build
check recipe.
* --dump-recipes option allows printing out all recipes that are
supported in the current environment.
Components: Vulkan, Framework, AOSP
Change-Id: I6ba4f1369def14dc4ea6b398f367366549eecdc5
(cherry picked from commit
8849259035284f5506802f54f09f99f2b146e0b0)
Alexander Galazin [Wed, 29 Mar 2017 07:14:36 +0000 (09:14 +0200)]
Relax image verification in anisotropic filtering tests
Combining nearest texel selection with anisotropic filtering
is implementation dependent and may not be supported.
Do not expect differences between the rendered and the reference images
for such combination of parameters.
Affects:
dEQP-VK.texture.filtering_anisotropy.basic.anisotropy_2.mag_nearest_min_nearest
dEQP-VK.texture.filtering_anisotropy.basic.anisotropy_4.mag_nearest_min_nearest
dEQP-VK.texture.filtering_anisotropy.basic.anisotropy_8.mag_nearest_min_nearest
dEQP-VK.texture.filtering_anisotropy.basic.anisotropy_max.mag_nearest_min_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_2.mag_nearest_min_nearest_mipmap_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_2.mag_nearest_min_nearest_mipmap_linear
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_4.mag_nearest_min_nearest_mipmap_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_4.mag_nearest_min_nearest_mipmap_linear
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_8.mag_nearest_min_nearest_mipmap_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_8.mag_nearest_min_nearest_mipmap_linear
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_max.mag_nearest_min_nearest_mipmap_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_max.mag_nearest_min_nearest_mipmap_linear
Components: Vulkan
VL-GL-CTS issue: 267
Change-Id: I064c507aea0b8d72205f4399fcf4a91684536667
Pyry Haulos [Tue, 28 Mar 2017 20:17:39 +0000 (13:17 -0700)]
Use new LOD approximation rules for OpenGL ES
This change updates OpenGL ES texture LOD approximation bounds to match
Vulkan. Since rules are now same for both APIs the LodPrecision
parameter introduced in
9f0ff9f49ae3359d9b2e50f5d720fc77460d0f4f is
removed.
Affects:
dEQP-GLES2.texture.*
dEQP-GLES3.texture.*
dEQP-GLES31.texture.*
Khronos spec bug: 16179
Google bug:
28200359
Components: AOSP, Vulkan, Framework
Change-Id: I55ff2e6296c7947af7ee5b7cf915d24c260ae374
(cherry picked from commit
0b6dbeb93e83dcf3b55d2eccce7cb1517c2caee5)
Pyry Haulos [Tue, 28 Mar 2017 20:10:53 +0000 (13:10 -0700)]
Relax LOD computation bounds
This change updates LOD approximation rules to match proposed spec
language in Vulkan texture filtering and mipmap tests.
This is partial cherry-pick of
9f0ff9f49ae3359d9b2e50f5d720fc77460d0f4f.
Mustpass changes are not included.
Affects: dEQP-VK.texture.*
Change-Id: Ic786bc733913a76d27f0cba31f3a61a10f8144fc
(cherry picked from commit
a9a793142c75c8537b3a2229f1e3289278d19fd6)
Pyry Haulos [Fri, 31 Mar 2017 21:32:14 +0000 (14:32 -0700)]
Merge Vulkan CTS 1.0.2.2 into goog/oc-dev
Bug:
36780905
New tests:
* Add tests for VK_KHR_incremental_present
* Add tests for VK_GOOGLE_display_timing
* Handle VK_EXT_swapchain_colorspace in swapchain tests
Fixes:
* Imgtec Waiver for SNORM linear filtering
* Check DynamicIndexing in pipeline.image count tests
* Add missing barrier in synchronization tests
* Fix invalid SPIR-V in dEQP-VK.sparse_resources
* Add missing flushes for basic draws
* Add missing flushes for indirect draws
* Fix precision mismatch issues in dEQP-VK.glsl
* Fix validation errors in dEQP-VK.tessellation
* Fix precision mismatch in dEQP-VK.binding_model
* Fix depth stencil aspect flag in render pass input tests
* Fix image layout in dEQP-VK.image
* Fix validation errors in dEQP-VK.geometry
* Fix issues in pipeline.timestamp.transfer_tests
* Refactor vktShaderExecutor
* Improve precision handling in texture.explicit_lod
* Fix a compilation error on GCC 5.4
* Fix a compilation error on MSVC12
* Fix bug in reallocation callback validation
* Fix input attachment layout in renderpass tests
Change-Id: Ic6689e68194aeb0857a4223b523e2e893e7a2ddc
Steve Hill [Tue, 28 Mar 2017 12:40:59 +0000 (13:40 +0100)]
Respect maxColorAttachments in image tests
Tests in the image section were using up to 8 framebuffer
attachments. The minumum required number is 4.
Affects:
dEQP-VK.pipeline.image.sampling_type.*.count_8.*
Components: Vulkan
VK-GL-CTS issue: 192
Change-Id: I21d957f17ec5ef7f9efc8d49f91c7a6d521da053
Pyry Haulos [Fri, 31 Mar 2017 16:38:21 +0000 (09:38 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Andrey Tuganov [Fri, 3 Mar 2017 21:52:58 +0000 (16:52 -0500)]
Fix SPIR-V generation in dEQP-VK.spirv_assembly
SPIR-V code generated in vktSpvAsmInstructionTests.cpp violates
non-aggregate type declaration uniqueness rule of SPIR-V
specification.
Fixed some of the tests which don't require exstensive changes.
Affects: dEQP-VK.spirv_assembly.instruction.*
Components: Vulkan
VK-GL-CTS issue: 195
Change-Id: Ib352323b08e10f83a0f5371dbf2bbb8b6d1182dd
Marcin Kańtoch [Tue, 28 Mar 2017 13:06:59 +0000 (15:06 +0200)]
Fix - depth/stencil images mandatory only for VK_IMAGE_TYPE_2D
Vulkan spec change https://gitlab.khronos.org/vulkan/vulkan/issues/719
made it mandatory to support depth/stencil formats only for
image type VK_IMAGE_TYPE_2D. For VK_IMAGE_TYPE_1D and VK_IMAGE_TYPE_3D
this support is optional.
Made changes to isRequiredImageParameterCombination()
Tests affected: dEQP-VK.api.info.image_format_properties.*
Change-Id: I9df990ced2e0a735078897324211c6b2a3923f2e
Iago Toral Quiroga [Fri, 24 Mar 2017 11:51:08 +0000 (12:51 +0100)]
Add missing barrier in ssbo layout tests
The tests map storage buffers written by compute shaders
to verify results. Add a barrier before host access to
these buffers.
Components: Vulkan
VK-GL-CTS issue: 326
Affected tests:
dEQP-VK.ssbo.layout.*
Change-Id: I760969e6a572c0f79a6ff2b41721445016a8bba4