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: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: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 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 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: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 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: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: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 22:38:47 +0000 (22:38 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master am:
55da06144c am:
d905a013d0
am:
c91ce3f2a2
Change-Id: Icb5a99c9ff720093b01f2dc667bd81dda12a5eb5
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:17:25 +0000 (22:17 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found" am:
89c3844ccb am:
17ff0445a7
am:
5fa0204a0a
Change-Id: I41392804c122b06db95263aca81aa64bc22eb0f3
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
Pyry Haulos [Thu, 6 Apr 2017 22:00:39 +0000 (22:00 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found"
Pyry Haulos [Thu, 6 Apr 2017 19:57:13 +0000 (19:57 +0000)]
Do not re-init GL functions after context reset
am:
48870ebe72
Change-Id: Iea6d880b20a2df8bbb6b495a1529e9205faf87d4
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 17:55:51 +0000 (17:55 +0000)]
Do not re-init GL functions after context reset am:
72c880b4c9 am:
a5c0bd16ed
am:
8fd7fdf3df
Change-Id: I0d5ba172952237bf5d364e2a9da0212b0d783780
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 [Thu, 6 Apr 2017 17:52:51 +0000 (17:52 +0000)]
Do not re-init GL functions after context reset am:
72c880b4c9
am:
a5c0bd16ed
Change-Id: I323f8b67e1ace7c2811230d3591582fe9bfa7812
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 [Thu, 6 Apr 2017 17:48:51 +0000 (17:48 +0000)]
Do not re-init GL functions after context reset
am:
72c880b4c9
Change-Id: Ia5c242d2bb897ff2a5424efd41b15127ef0683c0
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
Alexander Galazin [Wed, 5 Apr 2017 19:11:48 +0000 (19:11 +0000)]
Fix shader bugs in OOB tests
am:
609d108f89
Change-Id: I6eefd4a9fb92e18086c1574430633c46870a204b
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)
Alexander Galazin [Wed, 5 Apr 2017 16:15:08 +0000 (16:15 +0000)]
Fix shader bugs in OOB tests am:
cf65c56fb4 am:
baf5ae40a9
am:
afc0b6a272
Change-Id: I30c0ba16f3d004ab73624632d97246f991bc637f
Alexander Galazin [Wed, 5 Apr 2017 16:12:39 +0000 (16:12 +0000)]
Fix shader bugs in OOB tests am:
cf65c56fb4
am:
baf5ae40a9
Change-Id: Ifa47f0d5b8c2f1812464953a2686b473d074c97e
Alexander Galazin [Wed, 5 Apr 2017 16:10:08 +0000 (16:10 +0000)]
Fix shader bugs in OOB tests
am:
cf65c56fb4
Change-Id: Ica7e10c7cf362a452776ff3297a4df9d7ac4eef4
Tapani Pälli [Wed, 5 Apr 2017 06:39:17 +0000 (09:39 +0300)]
x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found
Some tests require GLES1 support and report test failure if support
has not been built. Patch changes build time configure to check GLES1
via pkg-config. If it is found, we turn on GLES1 support so that tests
will run and pass.
Change-Id: I586464c5fb7bffc40355caf57b30438f37ce1f6c
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
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
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)
Pyry Haulos [Mon, 3 Apr 2017 01:17:46 +0000 (18:17 -0700)]
resolve merge conflicts of
433645782 to oc-dev-plus-aosp
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 [Sun, 2 Apr 2017 23:29:00 +0000 (23:29 +0000)]
Use new LOD approximation rules for OpenGL ES am:
0b6dbeb93e am:
d05ba20fed
am:
097f4d1511
Change-Id: Ic884f894c91edfbbd6f82f23da97ce811314b395
Pyry Haulos [Sun, 2 Apr 2017 23:28:55 +0000 (23:28 +0000)]
Relax LOD computation bounds am:
a9a793142c am:
1aae7665eb
am:
126f23f1f4
Change-Id: I0e217f7db726aae86b068345adeb29d2455fa760
Pyry Haulos [Sun, 2 Apr 2017 23:25:28 +0000 (23:25 +0000)]
Use new LOD approximation rules for OpenGL ES am:
0b6dbeb93e
am:
d05ba20fed
Change-Id: I0bf8d40403d169c45d99f2215837791ec4b63219
Pyry Haulos [Sun, 2 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Relax LOD computation bounds am:
a9a793142c
am:
1aae7665eb
Change-Id: I014c58306e2f56b7c25614032b99e28f90d3723e
Pyry Haulos [Sun, 2 Apr 2017 23:21:57 +0000 (23:21 +0000)]
Use new LOD approximation rules for OpenGL ES
am:
0b6dbeb93e
Change-Id: I6b21c0e848086e1d0d37f24a68728adf2858727c
Pyry Haulos [Sun, 2 Apr 2017 23:21:54 +0000 (23:21 +0000)]
Relax LOD computation bounds
am:
a9a793142c
Change-Id: I57b81a54c124694adde363aa5d27d92707ce58e2
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 [Sat, 1 Apr 2017 03:46:38 +0000 (03:46 +0000)]
Merge Vulkan CTS 1.0.2.2 into goog/oc-dev
am:
a44ba43f52
Change-Id: I50f88d0862528311afc082f45d09839c452dc480
Pyry Haulos [Sat, 1 Apr 2017 01:11:55 +0000 (01:11 +0000)]
Merge Vulkan CTS 1.0.2.2 into aosp/master am:
d4891aeb29 am:
9e51a9547a
am:
f6b03a3a50
Change-Id: I33768c0f45804de60b8c2a29c6deb106dbeeb974
Pyry Haulos [Sat, 1 Apr 2017 01:08:57 +0000 (01:08 +0000)]
Merge Vulkan CTS 1.0.2.2 into aosp/master am:
d4891aeb29
am:
9e51a9547a
Change-Id: Iff1addaa5a158087a6f076a84c816c63fcd9d7cc
Pyry Haulos [Sat, 1 Apr 2017 01:06:32 +0000 (01:06 +0000)]
Merge Vulkan CTS 1.0.2.2 into aosp/master
am:
d4891aeb29
Change-Id: Id94d2f40cda6be6d83d7d5f4d920e9294f5b40c4