platform/upstream/VK-GL-CTS.git
7 years agoGenerate flat triangles in polygon offset tests.
Alexander Galazin [Fri, 20 Jan 2017 20:27:55 +0000 (20:27 +0000)]
Generate flat triangles in polygon offset tests.
am: 975a59ebca

Change-Id: Ia1226e8da8462deb895b6e7e8113db5fd500565f

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
am: 312a550657

Change-Id: Ic9ad221d68e82f4b2fc31a6ca51f21fc731ca31d

7 years agoresolve merge conflicts of ba455914 to master
Pyry Haulos [Fri, 20 Jan 2017 18:34:24 +0000 (10:34 -0800)]
resolve merge conflicts of ba455914 to master

Change-Id: Iad350278ba3cf6adcc0fa5e4914e8d98db71a567

7 years agoMerge "Fix eglBindAPI negative test" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:31:53 +0000 (18:31 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev
am: 6068dfbf3a

Change-Id: I6830683be5c3f71a47c61202689daa9a98797632

7 years agoFix eglBindAPI negative test
Nicolas Boichat [Fri, 20 Jan 2017 18:31:52 +0000 (18:31 +0000)]
Fix eglBindAPI negative test
am: 09784f8510

Change-Id: I286c03b0221c479bf4c4e98a4122eb6fe7290526

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:31:40 +0000 (18:31 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
am: 3baf7e3be2  -s ours

Change-Id: I57408e9f40640fec25656024aad4a9a047b48e2b

7 years agoDrop incorrect framebuffer texture subtests.
Kenneth Graunke [Fri, 20 Jan 2017 18:31:39 +0000 (18:31 +0000)]
Drop incorrect framebuffer texture subtests.
am: 625d685874  -s ours

Change-Id: I7753f87b0fed949615678a5dda727814dcd6007b

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:31:25 +0000 (18:31 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev
am: c811d42d99

Change-Id: Iff260b7a0cac1f300e09ae4799c0f0bb37e6fd16

7 years agoOptimize swapchain OOM tests
Pyry Haulos [Fri, 20 Jan 2017 18:31:24 +0000 (18:31 +0000)]
Optimize swapchain OOM tests
am: 1614827a71

Change-Id: Ia597d433e2978dea15e46e5dd13cd7e723dd11c2

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 18:31:08 +0000 (18:31 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev
am: 0991459ed1

Change-Id: Iaad1f68482163e3e8940baf9139b29b66c4ed6f2

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests.
Kenneth Graunke [Fri, 20 Jan 2017 18:31:07 +0000 (18:31 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests.
am: 2ed3a5a66f

Change-Id: I979d7d709017237a7e201017b270aacaefc01013

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:29:13 +0000 (18:29 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
am: 13a05434cc  -s ours

Change-Id: Ib0bb082d5c906b0b614387c2c7bfab5e5727b160

7 years agoAdd support for EGL_EXT_pixel_format_float
Mark Adams [Fri, 20 Jan 2017 18:29:10 +0000 (18:29 +0000)]
Add support for EGL_EXT_pixel_format_float
am: 521bf8a7c3  -s ours

Change-Id: I51c41d6dcc7fb454f05dbbefeab1af0413215c4f

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:34 +0000 (18:28 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev

7 years agoMerge "Fix eglBindAPI negative test" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:26 +0000 (18:28 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:18 +0000 (18:28 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:27:50 +0000 (18:27 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 18:27:40 +0000 (18:27 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:27:14 +0000 (18:27 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev

7 years agoMerge "Revert "Workaround for GCC aarch64 compiler bug""
Treehugger Robot [Thu, 19 Jan 2017 23:18:56 +0000 (23:18 +0000)]
Merge "Revert "Workaround for GCC aarch64 compiler bug""

7 years agoRevert "Workaround for GCC aarch64 compiler bug"
Pyry Haulos [Thu, 19 Jan 2017 21:28:17 +0000 (13:28 -0800)]
Revert "Workaround for GCC aarch64 compiler bug"

dEQP in Android CTS is now built with LLVM exclusively so reverting this
old workaround for GCC compiler bug is safe.

This reverts commit 00b60d29a1da01c554a3af8f96112199231145d2.

Bug: 17907351
Change-Id: I8d118195159e8238e6e4911ed187c2608d8418d3

7 years agoReverse the expectation in SSO match_different_[member_]struct_names
Pyry Haulos [Thu, 17 Nov 2016 18:21:09 +0000 (10:21 -0800)]
Reverse the expectation in SSO match_different_[member_]struct_names

The resolution of bug #15866 is that the spec should be changed to
require that "structures have the same name" in order for the types
to match during SSO validation.  These structures differ in name,
so they should not match, and we should get an SSO validation
failure.

Khronos bug #15866
Google bug: 33457655

Change-Id: Ie1f6bdb625661f0ed4585dfde7a0694f32ff3413
(cherry picked from commit bcd52533b14b0772dab895d6d449a02c0c34e043)

7 years agoMerge "Use LDR mode in astc.block_size_remainder sRGB cases"
Treehugger Robot [Thu, 19 Jan 2017 18:55:26 +0000 (18:55 +0000)]
Merge "Use LDR mode in astc.block_size_remainder sRGB cases"

7 years agoUse LDR mode in astc.block_size_remainder sRGB cases
Pyry Haulos [Thu, 19 Jan 2017 17:07:03 +0000 (09:07 -0800)]
Use LDR mode in astc.block_size_remainder sRGB cases

Bug: 34129132
Change-Id: Ibf6d8bbdab1f105796510dda71333ceeb619b50a

7 years agoMerge "Use LDR mode when decompressing sRGB ASTC formats"
Pyry Haulos [Thu, 19 Jan 2017 15:56:48 +0000 (15:56 +0000)]
Merge "Use LDR mode when decompressing sRGB ASTC formats"

7 years agoUse LDR mode when decompressing sRGB ASTC formats
Pyry Haulos [Thu, 19 Jan 2017 01:37:25 +0000 (17:37 -0800)]
Use LDR mode when decompressing sRGB ASTC formats

Bug: 34129132
Change-Id: I0528d2a8001decfd04753d3d91cf7ed08fd31730

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Pyry Haulos [Thu, 19 Jan 2017 01:25:44 +0000 (17:25 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: I3d62340294affc97744a3f215a96d00bd47342d5

7 years agoMerge "ES{2,3}: Clamp the x, y location of the viewport's bottom-left corner"
Treehugger Robot [Wed, 18 Jan 2017 19:33:46 +0000 (19:33 +0000)]
Merge "ES{2,3}: Clamp the x, y location of the viewport's bottom-left corner"

7 years agoGenerate flat triangles in polygon offset tests.
Alexander Galazin [Wed, 11 Jan 2017 07:50:13 +0000 (08:50 +0100)]
Generate flat triangles in polygon offset tests.

The tests setup triangles with a depth slope and then call
glPolygonOffset(factor, units) with variable units and
always 0 slope scaled factor.

According to the GLES 3.2 spec 13.7.2 Depth Offset:
"void PolygonOffset( float factor, float units );
factor scales the maximum depth slope of the polygon, and units scales an
implementation-dependent constant that relates to the usable resolution of the
depth buffer."

If the polygon has a depth slope,
the depth slope factor has to be not equal to zero.
The rationale of the slope scaled factor is to ensure that the offset
(equation 13.11) is greater than max(dz/dx, dz/dy) for all resolutions,
which may not be the case for the constant offset since it doesn't take
the screen resolution into account.

Changed tests:

dEQP-GLES2.functional.polygon_offset.*_displacement_with_units
dEQP-GLES3.functional.polygon_offset.*_displacement_with_units

Bug: 34386628

Change-Id: Ie8009ba1766eb50c3c5a750122aa8bb231144210

7 years agoES{2,3}: Clamp the x, y location of the viewport's bottom-left corner
Anuj Phogat [Fri, 30 Sep 2016 17:46:49 +0000 (10:46 -0700)]
ES{2,3}: Clamp the x, y location of the viewport's bottom-left corner

Affected tests:
dEQP-GLES2.functional.state_query.integers.viewport_getfloat
dEQP-GLES2.functional.state_query.integers.viewport_getinteger
dEQP-GLES3.functional.state_query.integers.viewport_getfloat
dEQP-GLES3.functional.state_query.integers.viewport_getinteger
dEQP-GLES3.functional.state_query.integers.viewport_getinteger64

Above CTS tests are not clamping the x, y location of the viewport's
bottom-left corner as recommended by ARB_viewport_array and
OES_viewport_array.
Tests later compare the clamped x, y values read back from the driver
with reference unclamped  x, y values resulting in to false failures.

From OES_viewport_array:
"The location of the viewport's bottom-left corner, given by (x,y), are
clamped to be within the implementation-dependent viewport bounds range.
The viewport bounds range [min, max] tuple may be determined by calling
GetFloatv with the symbolic constant VIEWPORT_BOUNDS_RANGE_OES"

Bug: 34349411

7 years agoMerge vulkancts/vulkan-cts-1.0.1 into vulkancts/vulkan-cts-1.0.2
Pyry Haulos [Tue, 17 Jan 2017 22:24:59 +0000 (14:24 -0800)]
Merge vulkancts/vulkan-cts-1.0.1 into vulkancts/vulkan-cts-1.0.2

Change-Id: I0ddead63d83e79809d35df7f3108ade58a13d0e6

7 years agoMerge vulkancts/vulkan-cts-1.0.0 into vulkancts/vulkan-cts-1.0.1
Pyry Haulos [Tue, 17 Jan 2017 22:24:57 +0000 (14:24 -0800)]
Merge vulkancts/vulkan-cts-1.0.0 into vulkancts/vulkan-cts-1.0.1

Change-Id: I4742b81f85d9b09efd77b954d432e28fefabf818

7 years agoUpdate zlib dependency to zlib 1.2.11
Alexander Galazin [Mon, 16 Jan 2017 08:15:59 +0000 (09:15 +0100)]
Update zlib dependency to zlib 1.2.11

Fixes Vulkan CTS issue: #579

Change-Id: Ib0cd05616cbb4759d63bcf15ba8e8f6f374e291d

7 years agoDrop incorrect framebuffer texture subtests.
Kenneth Graunke [Fri, 6 Jan 2017 08:25:28 +0000 (00:25 -0800)]
Drop incorrect framebuffer texture subtests.

This patch removes two broken subcases of:
dEQP-GLES31.functional.debug.negative_coverage.log.buffer.framebuffer_texture_layer

These were fixed in dEQP master by commit f28187809176f5eeb1ee25ccfa70d3,
but we cannot backport that to release branches because it changes the
existing expectations, which would break previously passing
implementations.  See buganizer 30287182 and 28090252.

The first subtest incorrectly checked layer (array slice) when it should
have checked miplevel.  The subtest description says:

"GL_INVALID_VALUE is generated if texture is a 2D multisample array
 texture and layer not 0."

which is wrong - array textures can certainly have multiple slices.
The ES 3.1 specification says that:

"An INVALID_VALUE error is generated if texture is not zero and level is
 not a supported texture level for texture, as described above."

and miplevel 0 is the only valid miplevel for a multisample texture.

The second subtest is no longer valid according to the resolution of
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15968.

Bug: 34281627
Merged-In: I500074c1777d88291c0b395498bb0f7d5613d27d

7 years agoRelax line width verification in primitive bbox tests
Pyry Haulos [Tue, 15 Nov 2016 18:28:48 +0000 (10:28 -0800)]
Relax line width verification in primitive bbox tests

Originally contributed by ARM to Khronos OpenGL ES CTS. Cherry-picked
with permission.

Google bug: 22713865
Khronos OpenGL issue: #19

Change-Id: I95359847611144e179819aaab6ac5dfe4bf4e4da

7 years agoBugfix: Allow UBO sparse allocation larger than maxUniformBufferRange
Maciej Jesionowski [Thu, 12 Jan 2017 12:42:45 +0000 (13:42 +0100)]
Bugfix: Allow UBO sparse allocation larger than maxUniformBufferRange

Modified tests:
- dEQP-VK.sparse_resources.buffer.ubo.*

Fixes #573

Change-Id: I33d2098d5b6b783fa8293c7cb1af7e782b51df77

7 years agoFix memoryTypeBits validation in memory.requirements.buffer
Pyry Haulos [Thu, 12 Jan 2017 23:27:44 +0000 (15:27 -0800)]
Fix memoryTypeBits validation in memory.requirements.buffer

Memory type bits returned for a subset of all possible usage flags must
be a superset of memory type bits returned for all usage flags case, not
the other way around.

Affects: dEQP-VK.memory.requirements.buffer.*

Vulkan CTS issue: 578

Change-Id: Iff34ffbf571fa7b0bd2d5e769e32d82a4dc9229e

7 years agoBugfix: provide enough VkClearValues in ImageSamplingInstance
Maciej Jesionowski [Thu, 12 Jan 2017 11:23:44 +0000 (12:23 +0100)]
Bugfix: provide enough VkClearValues in ImageSamplingInstance

Affected tests:
- dEQP-VK.pipeline.image.*
- dEQP-VK.pipeline.image_view.*

Fixes #575

Change-Id: Ie2fbdf9b926c677c54aca4b4cfd6b107be451c7f

7 years agoDo not require unsupported sparse images in image_format_properties test
Slawomir Cygan [Tue, 10 Jan 2017 15:59:29 +0000 (16:59 +0100)]
Do not require unsupported sparse images in image_format_properties test

Affects tests: dEQP-VK.api.info.image_format_properties*

This change removes the requirement for supporting sparse residency images:
- with compressed format
- with non-color format
- with format of pixel size that is not power ot two (for example: RGB).

 Additionally do not require 1D sparse residency images (not in spec),
 and require 2D/3D residency images basing on the device capabilities.

Spec 28.1. Sparse Resource Features:
"A sparse image created using VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT
supports all non-compressed color formats with power-of-two element
size that non-sparse usage supports.

(...)

sparseResidencyImage2D: Support for creating 2D single-sampled VkImage
objects with VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT.

sparseResidencyImage3D: Support for creating 3D VkImage objects with
 VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT.
"

Fixes bug: gitlab!567

Change-Id: If7d72c4392299e4c449a911140632dcc114fc908

7 years agoFix VkCmdImageBlit usage in blitting tests
Alexander Galazin [Thu, 12 Jan 2017 11:53:30 +0000 (12:53 +0100)]
Fix VkCmdImageBlit usage in blitting tests

Some tests call VkCmdImageBlit with a 2D destination image and a region
with dstOffset[0].z=1, dstOffset[1].z=0.

The spec says that it should be the opposite.

Affects:
dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_nearest
dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_y_nearest

Components: Vulkan

Fixes Vulkancts issue: #576

Change-Id: Iaa05f3b38cd46c39d313bd044b37535c112b77dd

7 years agotcuX11: fix to wait for matching ConfigureNotify
Tapani Pälli [Wed, 11 Jan 2017 06:37:54 +0000 (08:37 +0200)]
tcuX11: fix to wait for matching ConfigureNotify

Patch adds a loop to setDimensions that spins until exact
matching ConfigureNotify event is caught. This is done to make
sure X has updated the window size before we get further.

New processEvent method is added so that we can handle possible
WM_DELETE_WINDOW message during the loop as suggested by Pyry.

Test: run dEQP-EGL.functional.resize* on different configurations

Change-Id: Ic32243e9b25ea6cbdb5a7ab6bfccc7a196f1a5b8
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Pyry Haulos [Tue, 10 Jan 2017 20:34:46 +0000 (12:34 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: I3db5264ca20d64d152a9407fcdd1ac7f7c47b45c

7 years agoUpdate mustpass version to 1.0.2 in README.md
Pyry Haulos [Tue, 10 Jan 2017 20:20:15 +0000 (12:20 -0800)]
Update mustpass version to 1.0.2 in README.md

Change-Id: Ia683c10238ede6a712a46d14d936ef0032937e9e

7 years agoAllow unknown KHX extensions
Pyry Haulos [Sun, 8 Jan 2017 22:42:32 +0000 (14:42 -0800)]
Allow unknown KHX extensions

Affects:

dEQP-VK.api.info.instance.extensions
dEQP-VK.api.info.device.extensions

Change-Id: Iece3f83514f5f6e197fd0c1e1cf628f7cfe68bd2

7 years agoMerge "Remove two read-backs from copy image tests"
Kalle Raita [Mon, 9 Jan 2017 18:35:10 +0000 (18:35 +0000)]
Merge "Remove two read-backs from copy image tests"

7 years agoRemove pooled objects from alloc_callback_fail group
Maciej Jesionowski [Mon, 9 Jan 2017 11:05:32 +0000 (12:05 +0100)]
Remove pooled objects from alloc_callback_fail group

The pooled objects (VkDescriptorSet and VkCommandBuffer) are properly
handled in the alloc_callback_fail_multiple group. The removed cases
were redundant, and also didn't work correctly with pooled objects.

Removed tests:
- dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set
- dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary
- dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary

Change-Id: I212b544096e6e1fd5b98c7985d836e41247107e9

7 years agoOptimize swapchain OOM tests
Pyry Haulos [Wed, 4 Jan 2017 22:30:07 +0000 (14:30 -0800)]
Optimize swapchain OOM tests

Swapchain OOM tests were hitting timeouts on some platforms. This commit
optimizes the tests in two ways:

 * VkInstance, VkDevice, and VkSurface are now re-used across all
sub-cases.

 * Loop is re-written to avoid re-creating swapchains for parameters
0..N-1 when testing parameter combination N.

Affects: dEQP-VK.wsi.*.swapchain.simulate_oom.*

Bug: 33555898
(cherry picked from commit 2beac9057d9113ac306632d819ded852691a6842)

Change-Id: I19e9c7c8012a82cd12322a733afab961f4c7a1ae

7 years agoSkip anisotropic filtering tests if the feature is not supported.
Alexander Galazin [Mon, 9 Jan 2017 14:17:02 +0000 (15:17 +0100)]
Skip anisotropic filtering tests if the feature is not supported.

dEQP-VK.texture.filtering_anisotropy.* tests assume that an
implementation supports anisotropic filtering and should be skipped in
case VkPhysicalDeviceFeatures::samplerAnisotropy is VK_FALSE.

Fixes #570

Change-Id: I0601fe67a0e81b71670dac7ec8b83b4dc35c576c

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Pyry Haulos [Fri, 6 Jan 2017 20:45:52 +0000 (12:45 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: I650f4ef2c848a0957f652b3bf8b17ee7a7e4319c

7 years agoMerge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Pyry Haulos [Fri, 6 Jan 2017 20:44:56 +0000 (12:44 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2

Change-Id: Ic1b09c684e6535fcaba6e4d7dd407b2fbbe40b6d

7 years agoOptimize swapchain OOM tests
Pyry Haulos [Wed, 4 Jan 2017 22:30:07 +0000 (14:30 -0800)]
Optimize swapchain OOM tests

Swapchain OOM tests were hitting timeouts on some platforms. This commit
optimizes the tests in two ways:

 * VkInstance, VkDevice, and VkSurface are now re-used across all
sub-cases.

 * Loop is re-written to avoid re-creating swapchains for parameters
0..N-1 when testing parameter combination N.

Affects: dEQP-VK.wsi.*.swapchain.simulate_oom.*

Bug: 33555898
Change-Id: Ib5e1a4944e4c400a5d430c5a3d20fe0930c6eed0

7 years agoSkip unsupported attachment formats in granularity tests
Lionel Landwerlin [Fri, 23 Dec 2016 17:11:14 +0000 (17:11 +0000)]
Skip unsupported attachment formats in granularity tests

Change-Id: Iffbd79d0ddb3c212f75895c266b3e3ec7d2a01da

7 years agoFix framebuffer number of layers in granularity tests
Lionel Landwerlin [Fri, 23 Dec 2016 17:37:56 +0000 (17:37 +0000)]
Fix framebuffer number of layers in granularity tests

Change-Id: Idf2f1ee6f6f9ab5996ad5d07a7fed84241c57e9b

7 years agoReset Android window state when it is released
Pyry Haulos [Wed, 4 Jan 2017 21:46:48 +0000 (13:46 -0800)]
Reset Android window state when it is released

This avoids leaking window state between tests in WSI tests.

Affects: dEQP-VK.wsi.android.*

Change-Id: I618485fbbc1bb83c86437bb04fbcbfa65b4c04c2

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests.
Kenneth Graunke [Mon, 12 Sep 2016 19:37:08 +0000 (12:37 -0700)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests.

This is a port of commit ae7f8e0a07730e693b24d3dc7a23d2372319145e from
the ES 3.1 tests to the ES 3.0 tests.

According to the ES 3.2 specification:

   "Textures with a base internal format of DEPTH_COMPONENT, DEPTH_STENCIL
    or STENCIL_INDEX are supported by texture image specification commands
    only if target is TEXTURE_2D, TEXTURE_2D_MULTISAMPLE, TEXTURE_2D_ARRAY,
    TEXTURE_2D_MULTISAMPLE_ARRAY, TEXTURE_CUBE_MAP or TEXTURE_CUBE_MAP_ARRAY.
    Using these formats in conjunction with any other target will result in
    an INVALID_OPERATION error."

This subtest tried to check the above error condition, but it specified
GL_DEPTH_STENCIL / GL_DEPTH_COMPONENT as format, rather than internalFormat.
Since the above text calls out "base internal format", we should specify
it as internalFormat.

We also change GL_DEPTH_STENCIL to use GL_UNSIGNED_INT_24_8 rather than
GL_UNSIGNED_BYTE, as that combination was illegal for a different reason
than the one the test intended to check.

Affects dEQP-GLES3.functional.negative_api.texture.teximage3d.

Bug: 34103293

Change-Id: Ie01e2d130bb1cadc821153487e3e41593e3ca15e

7 years agoMerge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Pyry Haulos [Thu, 5 Jan 2017 17:58:15 +0000 (09:58 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2

Change-Id: I4dc1513b1528b8182cfd75f4ed9184fa8f383e47

7 years agoMerge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Pyry Haulos [Thu, 5 Jan 2017 17:58:14 +0000 (09:58 -0800)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1

Change-Id: I3ace822f33fb20acd6109886458b0d16c1624bd5

7 years agoFix assert for combined depth/stencil formats
Iago Toral Quiroga [Mon, 2 Jan 2017 11:22:29 +0000 (12:22 +0100)]
Fix assert for combined depth/stencil formats

This was using tcu::isCombinedDepthStencilType(format.type) for this,
but this only checks the type and for 24bit depth formats with a
x8 d24 setup it will incorrectly identify them as combined
depth/stencil even though the underlying format is depth-only. Fix
this by testing if the format has depth and stencil components
instead.

Prevents crashes in tests with the following signature (144 tests):
dEQP-VK.texture.shadow.*x8_d24*

Fixes #563

Change-Id: Ie43e140a0461de49c02e0d97eeed38fa8ef24040

7 years agoFix buffer size and alignment issues in api.buffer
Maciej Jesionowski [Thu, 15 Dec 2016 15:45:31 +0000 (16:45 +0100)]
Fix buffer size and alignment issues in api.buffer

- Don't use maxTexelBufferElements, it doesn't apply here
- Remove unused throw/catch blocks (catch block was never reachable)
- Add a case that exercises huge buffer sizes
- Add a check for sparseAddressSpaceSize

Modified tests:
- dEQP-VK.api.buffer.create_buffer_*

Fixes #558

Change-Id: Ia6b46d8c34a4eef4a6136532d0cb626d0b64b560

7 years agoFix eglBindAPI negative test
Nicolas Boichat [Sun, 18 Dec 2016 16:13:28 +0000 (00:13 +0800)]
Fix eglBindAPI negative test

It is ok for an implementation to not fail eglBindAPI if the current
display does not support the specified client API. However, in that
case, getConfig must not return any configuration for that specific
API.

Bug: 33278378
Affects: dEQP-EGL.functional.negative_api.bind_api
Test: Deploy to elm Chromebook, run with Cherry, test passes.
Change-Id: Idb86971de7a30e1aa78bb0951f971ed2829e2794

7 years agoUpdate zlib and libpng dependencies
Maciej Jesionowski [Thu, 5 Jan 2017 10:21:40 +0000 (11:21 +0100)]
Update zlib and libpng dependencies

Fixes #568

Change-Id: I8ee890a2176bf6d42d3dd8b119b7263034127960

7 years agoMerge "Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master"
Treehugger Robot [Wed, 4 Jan 2017 19:03:50 +0000 (19:03 +0000)]
Merge "Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master"

7 years agoDO NOT MERGE: Remove changed texel buffer access tests from mustpass
Pyry Haulos [Wed, 4 Jan 2017 18:52:48 +0000 (18:52 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass
am: 302bd7c6b3  -s ours

Change-Id: I1cefd7be538f766444576ae02a4b28b639a3e8cb

7 years agoDO NOT MERGE: Remove a few changed Vulkan tests from mustpass
Pyry Haulos [Wed, 4 Jan 2017 18:52:44 +0000 (18:52 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass
am: 09e8b66d03  -s ours

Change-Id: I595b0c3b589b73c806145602957875b57cffe84a

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Pyry Haulos [Wed, 4 Jan 2017 17:32:13 +0000 (09:32 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: Id23cc2f5a2ff4238fbf56d8c9cd4330dd166971a

7 years agoAdd support for EGL_EXT_pixel_format_float
Mark Adams [Wed, 14 Dec 2016 22:02:52 +0000 (17:02 -0500)]
Add support for EGL_EXT_pixel_format_float

This updates the egl.xml version and identifies/skips the float configs

Bug: 32969314
Change-Id: Iacfdf6b1c32c86ea0e6f80ca7ebaaeef583d1135
Merged-In: Iadeb0d4a76a06b2be716f3e76a1cc9fb69aff16a

7 years agoAdd support for EGL_EXT_pixel_format_float
Mark Adams [Wed, 14 Dec 2016 22:02:52 +0000 (17:02 -0500)]
Add support for EGL_EXT_pixel_format_float

This updates the egl.xml version and identifies/skips the float configs

Bug: 32969314
Change-Id: Iadeb0d4a76a06b2be716f3e76a1cc9fb69aff16a

7 years agoDO NOT MERGE: Remove changed texel buffer access tests from mustpass
Pyry Haulos [Wed, 4 Jan 2017 16:20:43 +0000 (08:20 -0800)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass

NYC CTS bug-fix changes the SPIR-V for these tests causing drivers that
passed old CTS fail the new version.

Bug: 33041922
Change-Id: I7e23a700693d5e6ee7c4264e05d449f49f820516

7 years agoDO NOT MERGE: Remove a few changed Vulkan tests from mustpass
Pyry Haulos [Wed, 4 Jan 2017 00:45:19 +0000 (16:45 -0800)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass

Original NYC CTS was decorating struct member locations differently and
this was later fixed causing drivers that pass original NYC CTS fail.

Bug: 34060750
Bug: 33041922
Change-Id: I3fe33960a74fb8f568aa7e1327bc09de8bc3df41

7 years agoRevert "Add new files to Android.mk"
Pyry Haulos [Wed, 4 Jan 2017 00:42:53 +0000 (16:42 -0800)]
Revert "Add new files to Android.mk"

This reverts commit 4ed5a72717f9dc776f7f63aa21aca2c727524d0f.

7 years agoAdd new files to Android.mk
Pyry Haulos [Wed, 4 Jan 2017 00:24:51 +0000 (16:24 -0800)]
Add new files to Android.mk

Change-Id: Ib396f9504a3b5523314cd2d5ab9375a346dbb219

7 years agoMerge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Pyry Haulos [Wed, 4 Jan 2017 00:07:06 +0000 (16:07 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2

7 years agoSkip integer formats that expose a max. sample count of 1
Jorg Wagner [Thu, 15 Dec 2016 21:52:06 +0000 (22:52 +0100)]
Skip integer formats that expose a max. sample count of 1

Actually fixes #538

As agreed in the ticket we need to skip integer formats if they
need to be sampled and only expose a max. sample count of 1.

Change-Id: Ia67c8d84cedcae09804e83cfefeb279b329d07b9

7 years agoinstall.py continues if adb uninstall fails
Kalle Raita [Fri, 16 Dec 2016 17:45:41 +0000 (09:45 -0800)]
install.py continues if adb uninstall fails

ADB uninstall fails with non-zero return code if the package to be
uninstalled does not exist. To allow the installation proceed when
there's no previous package, the non-zero return value should be ignored
for the uninstall step.

There are historical reasons for not relying on -r -d for
install (replace, allow downgrade), which I can't recall right now.

Test: Installed succesfully on device without deqp package.
Bug: 33961937
Change-Id: I401f3861f8d68f352747c041bd60cd372b48134b

7 years agoMerge "Blacklist match_different_[member_]struct_names SSO validation tests." into...
Tina Zhou [Thu, 22 Dec 2016 05:20:13 +0000 (05:20 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev
am: 4acf725866

Change-Id: I2cc66f7fb73fecf721da7704aa5a35384c5f5d4d

7 years agoresolve merge conflicts of b81edb4 to master
David Sodman [Thu, 22 Dec 2016 03:06:13 +0000 (19:06 -0800)]
resolve merge conflicts of b81edb4 to master

Change-Id: I16c7230358a1758afe1bc9ca2b22ae6eff2490b7

7 years agoMerge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat...
Tina Zhou [Thu, 22 Dec 2016 02:34:59 +0000 (02:34 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev
am: ce7ccaab4a

Change-Id: I36f440b4feadda51d9a47c856a820986800c387b

7 years agoChange GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048
Pyry Haulos [Thu, 22 Dec 2016 02:34:59 +0000 (02:34 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048
am: a42836566d

Change-Id: I6cf9f214b1a66360823af5fb219860454bc5a275

7 years agoMerge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
Tina Zhou [Thu, 22 Dec 2016 02:34:38 +0000 (02:34 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
am: 4812d6d47f

Change-Id: I6c5c6201bedac30702f65c2633454dc6bd27b4a5

7 years agoUpdate glslang to d02dc5d
Pyry Haulos [Thu, 22 Dec 2016 02:34:37 +0000 (02:34 +0000)]
Update glslang to d02dc5d
am: b0ce1f083e  -s ours

Change-Id: I12b4d9962c21073cfc89766b87049f4140d69f2a

7 years agoCherry-pick SPIR-V ClipDistance validation fixes
Pyry Haulos [Thu, 22 Dec 2016 02:34:36 +0000 (02:34 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes
am: ef29b7735d  -s ours

Change-Id: I05ec2bc33b606a2500f7991e60a9823b08a5868d

7 years agoCherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev
Pyry Haulos [Thu, 22 Dec 2016 02:34:35 +0000 (02:34 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev
am: e71e3bbacd

Change-Id: Id4477e4ab350a34791c9a59bec747d487b31d5c5

7 years agoMerge "Blacklist match_different_[member_]struct_names SSO validation tests." into...
Tina Zhou [Wed, 21 Dec 2016 22:32:08 +0000 (22:32 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev

7 years agoMerge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat...
Tina Zhou [Wed, 21 Dec 2016 22:31:04 +0000 (22:31 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev

7 years agoMerge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
Tina Zhou [Wed, 21 Dec 2016 22:30:03 +0000 (22:30 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev

* changes:
  Update glslang to d02dc5d
  Cherry-pick SPIR-V ClipDistance validation fixes
  Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev

7 years agoCorrect a typo in blit image test case names
Maciej Jesionowski [Wed, 21 Dec 2016 11:20:28 +0000 (12:20 +0100)]
Correct a typo in blit image test case names

Modified test names:
- dEQP-VK.api.copy_and_blit.blit_image.simple_tests.*

Change-Id: I20b09407101eb3e395d10f324e9f402f5c1c4b77

7 years agoCorrect a typo in blit image test case names
Maciej Jesionowski [Wed, 21 Dec 2016 11:20:28 +0000 (12:20 +0100)]
Correct a typo in blit image test case names

Modified test names:
- dEQP-VK.api.copy_and_blit.blit_image.simple_tests.*

Change-Id: Ia62b9f616466b919f1e92d0a74714586ccc6e313

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509
Nicolas Boichat [Tue, 20 Dec 2016 18:59:40 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name am: dbf9715509
am: 133c610be6

Change-Id: I21054992a16e3e6847a8af086528f4172602d614

7 years agoGetDevices: Also allow `\.` to be part of the host name
Nicolas Boichat [Tue, 20 Dec 2016 18:55:24 +0000 (18:55 +0000)]
GetDevices: Also allow `\.` to be part of the host name
am: dbf9715509

Change-Id: I659ce579867c7ca0c9b47e3b53a734265e0fbb26

7 years agoRemove two read-backs from copy image tests
Kalle Raita [Thu, 1 Sep 2016 20:21:50 +0000 (13:21 -0700)]
Remove two read-backs from copy image tests

Test: Ran copy_image on N6 & N9 with L MR1 image to check for
false-negatives. PixelC and Pixel XL for passing with current OS image.
Change-Id: I7a342b7a51b127d76dc161fc58edfc2bea0fa4a3

7 years agoMerge "Non-compressed copy image target size (64,64,8)"
Kalle Raita [Thu, 15 Dec 2016 23:29:39 +0000 (23:29 +0000)]
Merge "Non-compressed copy image target size (64,64,8)"

7 years agoAlloc callbacks: don't report a quality warning for pooled objects
Maciej Jesionowski [Wed, 7 Dec 2016 09:55:36 +0000 (10:55 +0100)]
Alloc callbacks: don't report a quality warning for pooled objects

Modified tests:
- dEQP-VK.api.object_management.alloc_callback_fail_multiple.descriptor_set
- dEQP-VK.api.object_management.alloc_callback_fail_multiple.command_buffer_primary
- dEQP-VK.api.object_management.alloc_callback_fail_multiple.command_buffer_secondary

Change-Id: I0daea167c4b0c1e0a00039286b85af8c02e410f5
(cherry picked from commit ca634a5ac0b5278736e012f43a59bb25a5234e6f)

7 years agoFix image memory barriers for depth/stencil formats
iostrows [Tue, 13 Dec 2016 10:34:22 +0000 (11:34 +0100)]
Fix image memory barriers for depth/stencil formats

Affected tests:
- dEQP-VK.api.copy_and_blit.image_to_image.all_formats.depth_stencil*

Fixes #562

Change-Id: I59a851d2748f7ae0c2b56fdcd879978de4755ddf

7 years agoSparse resources: create correct device interface
Maciej Jesionowski [Wed, 14 Dec 2016 13:44:19 +0000 (14:44 +0100)]
Sparse resources: create correct device interface

Make sure correct function pointers are used with the a VkDevice.
This should make no actual difference on most implementations.

Affected tests:
- dEQP-VK.sparse_resources.*

Change-Id: Id39cf318c4ae24b47135e1f27308985bd20a0009

7 years agoMerge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Pyry Haulos [Thu, 15 Dec 2016 12:24:03 +0000 (04:24 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2

Change-Id: I5ee52225ed76297caba6ae717e897d7290c20684

7 years agoMerge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Pyry Haulos [Thu, 15 Dec 2016 12:24:01 +0000 (04:24 -0800)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1

Change-Id: I82eb4eb290e5d85b44ac2f1f2efb1eb88aef062a

7 years agoAdd -Wno-delete-non-virtual-dtor to default cxxflags
Pyry Haulos [Thu, 15 Dec 2016 12:11:43 +0000 (14:11 +0200)]
Add -Wno-delete-non-virtual-dtor to default cxxflags

That warning generates some false negatives that are hard to work
around.

Change-Id: Ib451eca3af7bf2a6bfd24aa966f89496257b9f0d

7 years agoMerge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Pyry Haulos [Thu, 15 Dec 2016 12:02:11 +0000 (04:02 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2

7 years agoMerge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Pyry Haulos [Thu, 15 Dec 2016 12:01:22 +0000 (04:01 -0800)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1

7 years agoSynchronization: use the correct device interface
Maciej Jesionowski [Wed, 14 Dec 2016 10:42:03 +0000 (11:42 +0100)]
Synchronization: use the correct device interface

This is a correctness change, likely has no impact
on most implementations.

Affected tests:
- dEQP-VK.synchronization.op.multi_queue.*

Change-Id: Ic2687f60c1ef2c468908c6c7240205b9e77e944c