Pyry Haulos [Tue, 27 Sep 2016 00:44:39 +0000 (00:44 +0000)]
Merge "Remove few obsolete target files" am:
082248137d am:
6798ebf3c7
am:
9db4f9ce9a
Change-Id: If24f503d771e92efa39f83106e2926d032be7535
Pyry Haulos [Tue, 27 Sep 2016 00:42:39 +0000 (00:42 +0000)]
Merge "Remove few obsolete target files" am:
082248137d
am:
6798ebf3c7
Change-Id: I63c14e9564af14f66306a8c6f54cec12a5caf212
Pyry Haulos [Tue, 27 Sep 2016 00:39:40 +0000 (00:39 +0000)]
Merge "Remove few obsolete target files"
am:
082248137d
Change-Id: Id376d6dec598435c43aa6cfbc0c68e04ec6854ec
Pyry Haulos [Tue, 27 Sep 2016 00:37:09 +0000 (00:37 +0000)]
Merge "Add license header to main CMake files" am:
e2b5873fd8 am:
a6f3496c76
am:
5f34112b30
Change-Id: Ia3e9adba24468cd5feff6bf02718ac021801a985
Pyry Haulos [Tue, 27 Sep 2016 00:34:51 +0000 (00:34 +0000)]
Merge "Be more civil in comments" am:
775f724bcc am:
c678e93e1c
am:
a1669de8bd
Change-Id: I908c0f27358ad101ef39e61675854d172a7c6f75
Pyry Haulos [Tue, 27 Sep 2016 00:34:39 +0000 (00:34 +0000)]
Merge "Add license header to main CMake files" am:
e2b5873fd8
am:
a6f3496c76
Change-Id: Ib5e10b0a474956a0f781e6e1d143a34c08af3797
Pyry Haulos [Tue, 27 Sep 2016 00:32:52 +0000 (00:32 +0000)]
Merge "Be more civil in comments" am:
775f724bcc
am:
c678e93e1c
Change-Id: I9f2ad25ad523cead914617c07b1ac1b172031fe2
Pyry Haulos [Tue, 27 Sep 2016 00:32:38 +0000 (00:32 +0000)]
Merge "Add license header to main CMake files"
am:
e2b5873fd8
Change-Id: If5a447428add8f8ad2ef4c28081ed6e914f71ad1
Treehugger Robot [Tue, 27 Sep 2016 00:32:29 +0000 (00:32 +0000)]
Merge "Remove few obsolete target files"
Pyry Haulos [Tue, 27 Sep 2016 00:30:23 +0000 (00:30 +0000)]
Merge "Be more civil in comments"
am:
775f724bcc
Change-Id: Icdcfd7d5645e9403aa0b31f1a90e6dc1143cebe1
Treehugger Robot [Tue, 27 Sep 2016 00:27:19 +0000 (00:27 +0000)]
Merge "Add license header to main CMake files"
Treehugger Robot [Tue, 27 Sep 2016 00:26:12 +0000 (00:26 +0000)]
Merge "Be more civil in comments"
Pyry Haulos [Tue, 27 Sep 2016 00:18:22 +0000 (00:18 +0000)]
Remove obsolete cmake toolchain files am:
2e95c38041 am:
c196d5602f
am:
2f6f15d081
Change-Id: I6b431a7726c389fb85606722fa2315731ba6a1cf
Pyry Haulos [Tue, 27 Sep 2016 00:13:58 +0000 (00:13 +0000)]
Remove obsolete cmake toolchain files am:
2e95c38041
am:
c196d5602f
Change-Id: Idd9afb1816e8c288548fad1d34b9fad230c9c227
Pyry Haulos [Tue, 27 Sep 2016 00:10:09 +0000 (00:10 +0000)]
Remove obsolete cmake toolchain files
am:
2e95c38041
Change-Id: I19d506fd483d3f24bffee4db9867420d8b488d84
Pyry Haulos [Mon, 26 Sep 2016 22:44:06 +0000 (15:44 -0700)]
Add license header to main CMake files
Change-Id: Ia37e8c0435f3c13403faa6a80585712367bcb1f2
Pyry Haulos [Mon, 26 Sep 2016 22:28:57 +0000 (15:28 -0700)]
Be more civil in comments
Change-Id: I47d75f6d558a80263d4a3cdeaa84f780db02403a
Pyry Haulos [Mon, 26 Sep 2016 22:12:11 +0000 (15:12 -0700)]
Remove obsolete cmake toolchain files
These have not been used for a while and are likely broken at this
point.
Change-Id: I3d470e76b8dc89836eb6baa1377bfb7cd91b65ef
Pyry Haulos [Mon, 26 Sep 2016 22:07:45 +0000 (15:07 -0700)]
Remove few obsolete target files
Unmaintained, likely broken at this point.
Change-Id: Ic38ab7c3bdd78e9e0c9a88ecf6fecaa993eecc7c
Pyry Haulos [Fri, 23 Sep 2016 21:10:40 +0000 (21:10 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
d04e72de0b am:
eac76634d8
am:
ee7ef1e2e9
Change-Id: I433de82651e011e96ff6f79e5780b0f3cbd4b3ab
Pyry Haulos [Fri, 23 Sep 2016 21:08:41 +0000 (21:08 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
d04e72de0b
am:
eac76634d8
Change-Id: I76cd3fb5a750ee46793edbaaec2eeb596e88a1eb
Pyry Haulos [Fri, 23 Sep 2016 21:06:40 +0000 (21:06 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
d04e72de0b
Change-Id: Idf39bf7b3d87b897c3263a0ab8053c0cb21d9059
Pyry Haulos [Fri, 23 Sep 2016 19:23:40 +0000 (12:23 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: Ie1fb552e9f5e1c00ea0c986579e6e81681fdf9c1
Pyry Haulos [Fri, 23 Sep 2016 19:23:30 +0000 (12:23 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: If48367bc695ffe9b74ddcd98936e05ef005eb96c
Pyry Haulos [Fri, 23 Sep 2016 19:21:37 +0000 (15:21 -0400)]
Merge "Build fix for the Glx platform" into vulkan-cts-1.0.1
Kristof Kosztyo [Fri, 23 Sep 2016 08:48:01 +0000 (10:48 +0200)]
Build fix for the Glx platform
Change-Id: I9f3e0254c289c015f61570f71215900e0ab9bfd9
Petros Bantolas [Tue, 20 Sep 2016 08:45:03 +0000 (09:45 +0100)]
Fix clip_volume test drawing points
According to spec, "[...] if no value was written to PointSize, results
are undefined".
Modified tests:
- dEQP-VK.clipping.clip_volume.{inside,outside,depth_clamp}.point_list
- dEQP-VK.clipping.clip_volume.clipped.large_points
Change-Id: I06ed228a9e4563df15801ff402ed5eac946ac9a6
Pyry Haulos [Thu, 22 Sep 2016 23:23:30 +0000 (23:23 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
b3729a6431 am:
1e31d89c2a
am:
d1438e5585
Change-Id: Ibeaa628678ee9ed58ff23c3dbc2e98df8f958dab
Pyry Haulos [Thu, 22 Sep 2016 22:56:00 +0000 (22:56 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
b3729a6431
am:
1e31d89c2a
Change-Id: Iac9199d4ae71a88677db8f5f55d801ce0fe840ba
Pyry Haulos [Thu, 22 Sep 2016 22:44:07 +0000 (22:44 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
b3729a6431
Change-Id: I31218eb8140c0ab39e07f987d273ef7c8f748e3a
Pyry Haulos [Thu, 22 Sep 2016 20:16:08 +0000 (13:16 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: I9a4ae0c9e469c2cd6b865a67bf659dee0e078c4b
Pyry Haulos [Thu, 22 Sep 2016 20:12:16 +0000 (13:12 -0700)]
Add new files to Android.mk
Change-Id: I31d5918e4ce2a367599aeafba45c58c1eb7c4392
Pyry Haulos [Thu, 22 Sep 2016 20:09:30 +0000 (13:09 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ie6d0a102b147cf96fd0442fbf601765c3acf0835
Pyry Haulos [Mon, 19 Sep 2016 20:45:45 +0000 (13:45 -0700)]
Validate KHR extensions reported by the driver
Change-Id: I30f1c86cd0b4db63b7adf0860cfbc32a0d8b75ee
Arkadiusz Sarwa [Wed, 24 Aug 2016 12:43:23 +0000 (14:43 +0200)]
Added xcb and xlib platform support for Vulkan
Fixes #390
Change-Id: I650838665f630c794f4667f518713a7ae87c8955
Szilard Ledan [Fri, 15 Jul 2016 10:28:23 +0000 (12:28 +0200)]
Add Vulkan port of the GLES3 texture shadow tests
Change-Id: I25eaaec34393de76f215c3f553e5f52d5744cd85
Slawomir Cygan [Wed, 10 Aug 2016 17:39:32 +0000 (19:39 +0200)]
Add tests for indexed indirect draw calls and VertexIndex semantics
Fixes #460
- dEQP-VK.draw.indirect_draw.indexed tests are added
- Each VS in these tests now also validates VertexIndex value
- firstVertex and vertexOffset values are no longer 0
Change-Id: Id78bd4c446b3e75a11e824f00775dc7ab96432cc
Pyry Haulos [Thu, 22 Sep 2016 19:13:37 +0000 (12:13 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ie53548764c5b2041cab70286b131bd13c2b21655
Pyry Haulos [Thu, 22 Sep 2016 19:13:36 +0000 (12:13 -0700)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Change-Id: Idcc42afbec63aa6463be09e87dc57247275c6818
Pyry Haulos [Thu, 22 Sep 2016 19:12:53 +0000 (15:12 -0400)]
Merge "Fix barrier stage masks in synchronization tests" into vulkan-cts-1.0.1
Pyry Haulos [Thu, 22 Sep 2016 19:04:59 +0000 (15:04 -0400)]
Merge "Add VK_REMAINING_* defines to vulkan framework" into vulkan-cts-1.0-dev
Slawomir Cygan [Thu, 22 Sep 2016 14:33:02 +0000 (16:33 +0200)]
dEQP-VK.dynamic_state tests: fix sizeof(size) bug
Change-Id: I7e90b30a88bb59bbe73fec00ecb8ce0fd92ac1f0
Pyry Haulos [Thu, 22 Sep 2016 18:50:46 +0000 (14:50 -0400)]
Merge "Fix precision issue in MS interpolation test" into vulkan-cts-1.0-dev
Maciej Jesionowski [Thu, 22 Sep 2016 09:15:18 +0000 (11:15 +0200)]
Add VK_REMAINING_* defines to vulkan framework
Change-Id: I4d4693bab868cdf904d2b4c706fdb954f282ab13
Mika Isojrvi [Wed, 21 Sep 2016 17:43:54 +0000 (17:43 +0000)]
Use LDR decompression in reference for SRGB ASTC formats. am:
4db2fa91a1 am:
723b085184
am:
3cbc836706
Change-Id: I24c0d0e12c84ad6cbb7f83433d4cf01845dd89ad
Mika Isojrvi [Wed, 21 Sep 2016 17:41:24 +0000 (17:41 +0000)]
Use LDR decompression in reference for SRGB ASTC formats. am:
4db2fa91a1
am:
723b085184
Change-Id: Ia8c2ca660f74af486207d31675736cdd56de9306
Mika Isojrvi [Wed, 21 Sep 2016 17:38:23 +0000 (17:38 +0000)]
Use LDR decompression in reference for SRGB ASTC formats.
am:
4db2fa91a1
Change-Id: Ifbb4be431d3c8b959c2967b55541b9f496edb92e
Pyry Haulos [Wed, 21 Sep 2016 17:12:59 +0000 (13:12 -0400)]
Merge "Update glslang" into vulkan-cts-1.0-dev
Pyry Haulos [Wed, 21 Sep 2016 17:12:01 +0000 (13:12 -0400)]
Merge "Update SPIR-V tools" into vulkan-cts-1.0-dev
Maciej Jesionowski [Wed, 21 Sep 2016 10:05:47 +0000 (12:05 +0200)]
Fix precision issue in MS interpolation test
Modified test:
- dEQP-VK.pipeline.multisample_interpolation.offset_interpolate_at_pixel_center.*
Fixes #494
Change-Id: I608294bf190bb50292fa4d7dd72e0f6b18dac3ee
Mika Isojärvi [Tue, 20 Sep 2016 23:19:01 +0000 (16:19 -0700)]
Use LDR decompression in reference for SRGB ASTC formats.
Bug:
31587228
Test: Ran tests on Nexus devices.
Change-Id: Ia5a3c37e45e13acf9078741188821b7be87da6fd
Pyry Haulos [Tue, 20 Sep 2016 22:20:41 +0000 (15:20 -0700)]
Update glslang
Change-Id: I095574ac4969033f1e3929371f7962b7b96a8039
Pyry Haulos [Tue, 20 Sep 2016 22:49:01 +0000 (15:49 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ifea48fac6730fbcaa294c1109a1ee2579298e05b
Pyry Haulos [Tue, 20 Sep 2016 22:48:44 +0000 (18:48 -0400)]
Merge "Remove invalid precision qualifier usage" into vulkan-cts-1.0.1
Pyry Haulos [Tue, 20 Sep 2016 22:14:52 +0000 (15:14 -0700)]
Update SPIR-V tools
Change-Id: Iec5ba9bc4c061a0efe2979761e2f9d24d5fea596
Pyry Haulos [Tue, 20 Sep 2016 22:11:11 +0000 (15:11 -0700)]
Remove invalid precision qualifier usage
dEQP-VK.pipeline.vertex_input tests were incorrectly using highp
qualifier with double types. That is not allowed, and default precision
in GLSL 4.4 shaders is highp anyway.
Fixes #458
Change-Id: I4b17b2273a8bf258bb8aec5737bd1c2a38aa49ce
Pyry Haulos [Tue, 20 Sep 2016 21:56:25 +0000 (14:56 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: I71b844cd76da9c64b1545a6e583f9fc8681c4b34
Pyry Haulos [Tue, 20 Sep 2016 21:47:29 +0000 (14:47 -0700)]
Do not use pointer value after deleting it
Pointer value is undefined after 'delete'.
Change-Id: I30dab519db61073932e3e35cd87809bf89b18dfc
Pyry Haulos [Tue, 20 Sep 2016 20:51:03 +0000 (16:51 -0400)]
Merge "Check line endings in check_whitespace.py" into vulkan-cts-1.0-dev
Pyry Haulos [Tue, 20 Sep 2016 20:19:25 +0000 (13:19 -0700)]
Check line endings in check_whitespace.py
Change-Id: I33f9f64478bcb2792cae3e2d4b6501496a54191d
Pyry Haulos [Tue, 20 Sep 2016 20:15:00 +0000 (13:15 -0700)]
Print test log path into console output
Having test log path printed out is helpful as it makes it clearer
that the console output is not the actual test log. Additionally, on
some platforms, such as Android, the log might be written into
non-obvious location.
Change-Id: I954550f96b2b910eb0cbfd8b83612b2a758669db
Vidar Lilleboe [Fri, 16 Sep 2016 11:21:02 +0000 (13:21 +0200)]
Fix barrier stage masks in synchronization tests
Fixes #497
Change-Id: I225344335a13b0347cf6ad34e38c3f0a181d41cd
Pyry Haulos [Mon, 19 Sep 2016 21:51:00 +0000 (14:51 -0700)]
Update Vulkan framework to vulkan.h 1.0.27
Change-Id: I3c1bf3295982792c4fa47263f7f3868758d4aedb
Pyry Haulos [Mon, 19 Sep 2016 21:49:34 +0000 (17:49 -0400)]
Merge "Fix OpVariable position in OpInBoundsAccessChain tests." into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
1a6d3c9ee7 am:
1d692218d3
am:
927151c175
Change-Id: I20e9d3ac41b67b4731098a64a2be30f1311ec3ad
Pyry Haulos [Thu, 15 Sep 2016 23:35:35 +0000 (23:35 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
1a6d3c9ee7
am:
1d692218d3
Change-Id: I925131a5eac48ef205f80695d6a6261b7fde1ac4
Pyry Haulos [Thu, 15 Sep 2016 23:31:58 +0000 (23:31 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
1a6d3c9ee7
Change-Id: I632b1f98db42f54c4798f51d77a1e743ca3934c6
Pyry Haulos [Thu, 15 Sep 2016 21:43:57 +0000 (14:43 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: I850bae53652ab1e2475754324d972e85f2daff99
Pyry Haulos [Thu, 15 Sep 2016 20:03:24 +0000 (13:03 -0700)]
Move texture_filtering.explicit_lod under dEQP-VK.texture
Change-Id: I25a1a6e5910814ef010942d11787b6c5969b4021
Zoltan Janos Szabo [Fri, 15 Jul 2016 10:21:05 +0000 (12:21 +0200)]
Add Vulkan port of the GLES3 texture mipmap tests
Change-Id: I5c5d9d83a7f284cf0f561d4a4725f95e37cb2842
Peter Siket [Fri, 15 Jul 2016 10:14:39 +0000 (12:14 +0200)]
Add Vulkan port of the GLES3 texture filtering tests
Change-Id: I3aaf5ed38ba63067f5d205317f26818ba42df925
Pyry Haulos [Thu, 15 Sep 2016 20:23:39 +0000 (20:23 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
a25304112b
am:
a9ae8b26a2
Change-Id: I318734d1bc177d2d8631321c1fa75a92eda40a89
Pyry Haulos [Thu, 15 Sep 2016 20:16:46 +0000 (16:16 -0400)]
Merge "Add new files to Android.mk" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 15 Sep 2016 20:15:27 +0000 (20:15 +0000)]
DO NOT MERGE Allow old behavior in image format property tests
am:
a25304112b
Change-Id: I94d91c5df6d360a90aa759df9012992868b0a86d
Pyry Haulos [Thu, 15 Sep 2016 20:05:03 +0000 (13:05 -0700)]
Add new files to Android.mk
Change-Id: Ie9dee591212230db3a2d9cafcbdfbc794c966965
Arkadiusz Sarwa [Thu, 21 Jul 2016 07:38:11 +0000 (09:38 +0200)]
Resolve image test: 2d array
New tests:
- dEQP-VK.api.copy_and_blit.resolve_image.whole_copy_before_resolving*
- dEQP-VK.api.copy_and_blit.resolve_image.whole_array_image*
Fixes #438
Change-Id: Idfc02e7ada4c53b5706ac17cb9d32dfd77d22869
Pyry Haulos [Thu, 15 Sep 2016 19:23:11 +0000 (15:23 -0400)]
Merge "Add multisampled storage image load/store test" into vulkan-cts-1.0-dev
Pyry Haulos [Wed, 31 Aug 2016 16:45:39 +0000 (09:45 -0700)]
DO NOT MERGE Allow old behavior in image format property tests
Vulkan API specification has changed in respect to what sample counts
vkGetPhysicalDeviceImageFormatProperties() should report. The change has
been made after initial Android Nougat drivers were frozen. For NYC CTS
we need to tolerate the old behavior and issue compatibility warning
instead.
Bug:
30739954
Bug:
31516480
(cherry picked from commit
0825a289c0d3fc796906790e0190e5771843c4e1)
Change-Id: I40168152251c7ae55d3eaa995bcf44e9f7cec04f
Pyry Haulos [Tue, 30 Aug 2016 22:50:53 +0000 (15:50 -0700)]
Update framework to vulkan.h 1.0.26
Change-Id: I7ecdeb1dbadd0fb3983f4a49db87781220ef172a
Daniel Xie [Wed, 14 Sep 2016 20:09:32 +0000 (20:09 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
7664fa49e5 am:
05ad37b721
am:
f5ba8f9e42
Change-Id: I17056b375f7ec659eeec4aeacca63e62c5afaaeb
Pyry Haulos [Wed, 14 Sep 2016 20:09:31 +0000 (20:09 +0000)]
resolve merge conflicts of b172f9e to master am:
ed8e08ff82 am:
657bfbfb71
am:
29baf28a2f
Change-Id: Ic5e033debdc6cafba026c9f40efaab8c4f83f746
Daniel Xie [Wed, 14 Sep 2016 20:06:34 +0000 (20:06 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
7664fa49e5
am:
05ad37b721
Change-Id: I740975c499edb69cef680fd9f206c11851fde099
Pyry Haulos [Wed, 14 Sep 2016 20:06:32 +0000 (20:06 +0000)]
resolve merge conflicts of b172f9e to master am:
ed8e08ff82
am:
657bfbfb71
Change-Id: I329c5178d1e1f453313f99ca9019ba9f7ba3fa8c
Daniel Xie [Wed, 14 Sep 2016 20:03:35 +0000 (20:03 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e
am:
7664fa49e5
Change-Id: I0d5742b8d753b9e00e4c688828f4e6461181e2a5
Pyry Haulos [Wed, 14 Sep 2016 20:03:34 +0000 (20:03 +0000)]
resolve merge conflicts of b172f9e to master
am:
ed8e08ff82
Change-Id: I87eea013265484e330874608de507e8f6c193e02
Daniel Xie [Wed, 14 Sep 2016 19:54:32 +0000 (19:54 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev
am:
ec5c5c216e
Change-Id: I740f1709bd42aa1986e31a5d9b3192f9070212e0
Daniel Xie [Wed, 14 Sep 2016 19:05:34 +0000 (19:05 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d am:
9ddfc1fee2 am:
f46c3bd1eb
am:
b97db8c198
Change-Id: I88a1c6097d1d31fe5446b0c0dbfa0fa0a9cc66f3
Kalle Raita [Wed, 14 Sep 2016 19:05:32 +0000 (19:05 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57 am:
8afe1d6b23 am:
26df49710f am:
03af70d91b
am:
b989b67715
Change-Id: Iaaae754abf75f96221d04c42733a2accc5b13ed0
Daniel Xie [Wed, 14 Sep 2016 19:02:31 +0000 (19:02 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d
am:
9c2b1c4012
Change-Id: I209f398e771bf826ee4bd5b2f6c5d612a880a78d
Pyry Haulos [Wed, 14 Sep 2016 19:02:29 +0000 (19:02 +0000)]
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
am:
0d151184d5
Change-Id: I25450768dbdbadf87b17e51453a64c7f7ac7a433
Daniel Xie [Wed, 14 Sep 2016 18:59:32 +0000 (18:59 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e
am:
c992a8ba9d
Change-Id: Ie9a389b9d5b1b478115d25d411f3b13b0a5e3b5f
Daniel Xie [Wed, 14 Sep 2016 18:53:27 +0000 (18:53 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d am:
9ddfc1fee2
am:
f46c3bd1eb
Change-Id: I9a5f16fa7432a612cb25927cd7926bb659f58a2c
Kalle Raita [Wed, 14 Sep 2016 18:53:26 +0000 (18:53 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57 am:
8afe1d6b23 am:
26df49710f
am:
03af70d91b
Change-Id: Iaaf55b3c839b003dbcbaaa2e835126b040a8aef4
Pyry Haulos [Wed, 14 Sep 2016 18:51:18 +0000 (11:51 -0700)]
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
Change-Id: I590938d9af1d9d7071a6c256d38c2e5d006c1e7e
Daniel Xie [Wed, 14 Sep 2016 18:47:57 +0000 (18:47 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e am:
c992a8ba9d
am:
9ddfc1fee2
Change-Id: Id818e9ab4a7dda439ed497a4d01d0bd2fe782533
Kalle Raita [Wed, 14 Sep 2016 18:47:56 +0000 (18:47 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57 am:
8afe1d6b23
am:
26df49710f
Change-Id: I8cb807ff774d7073519206e098e12966a61e7871
Daniel Xie [Wed, 14 Sep 2016 18:41:54 +0000 (18:41 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e
am:
c992a8ba9d
Change-Id: I56c5d4e1a0ca5fdb91b2bf6a3b72a4590ce8ed48
Kalle Raita [Wed, 14 Sep 2016 18:41:54 +0000 (18:41 +0000)]
CP: Split load/store image tests into sub-groups am:
b172f9eb57
am:
8afe1d6b23
Change-Id: Ib26511830bd315177922615543f9592c2496564a
Daniel Xie [Wed, 14 Sep 2016 18:38:57 +0000 (18:38 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev
am:
ec5c5c216e
Change-Id: Ie5a92b067caf223b0df3b07f451579454bd1debc
Kalle Raita [Wed, 14 Sep 2016 18:38:57 +0000 (18:38 +0000)]
CP: Split load/store image tests into sub-groups
am:
b172f9eb57
Change-Id: I073d39676cbe70007fa730e6279cea49c1f3758a
projects / platform / upstream / VK-GL-CTS.git / log