Restore disabled texture function tests
authorPiotr Byszewski <piotr.byszewski@mobica.com>
Wed, 12 Feb 2020 14:57:16 +0000 (15:57 +0100)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Fri, 28 Feb 2020 07:30:45 +0000 (02:30 -0500)
Commit restores 12 tests. Only 2 of those tests were now failing.
This happened because of hitting cubemap edge and was resolved by
modifying MaxDx test parameter (to the same value used in other
cube texture format tests).

Components: Vulkan

VK-GL-CTS issue: 864

Affects:
dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_*

Change-Id: I09e012463fb0e633409d0aa58913d666f555998a

external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
external/vulkancts/mustpass/master/src/excluded-tests.txt
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt

index 1653f5c9368b4c28e705cdaff0dd0a077f6a2c6d..cdeb0f3757a55f66eee93ed7361bc1f5e2aa94c1 100644 (file)
@@ -3961,9 +3961,9 @@ void ShaderTextureFunctionTests::init (void)
                GRAD_CASE_SPEC(usamplercubearray,               FUNCTION_TEXTUREGRAD,   Vec4(-1.0f, -1.0f, -1.01f, -0.5f),      Vec4( 1.0f,  1.0f, -1.01f,  1.5f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.2f,  0.0f),      false,  IVec3(0),       texCubeArrayMipmapUint,         evalTextureCubeArrayGrad,       BOTH),
 
                GRAD_CASE_SPEC(sampler2dshadow,                 FUNCTION_TEXTUREGRAD,   Vec4(-0.2f, -0.4f,  0.0f,  0.0f),       Vec4( 1.5f,  2.3f,  1.0f,  0.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.2f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      false,  IVec3(0),       tex2DMipmapShadow,              evalTexture2DShadowGrad,                BOTH),
-               GRAD_CASE_SPEC(samplercubeshadow,               FUNCTION_TEXTUREGRAD,   Vec4(-1.0f, -1.0f,  1.01f,  0.0f),      Vec4( 1.0f,  1.0f,  1.01f,  1.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.2f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      false,  IVec3(0),       texCubeMipmapShadow,    evalTextureCubeShadowGrad,              BOTH),
-               GRAD_CASE_SPEC(sampler2darrayshadow,    FUNCTION_TEXTUREGRAD,   Vec4(-1.2f, -0.4f,  -0.5f,  0.0f),      Vec4( 1.5f,  2.3f,  3.5f,  1.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.2f,  0.0f,  0.0f),      false,  IVec3(0),       tex2DArrayMipmapShadow, evalTexture2DArrayShadowGrad,   VERTEX),
-               GRAD_CASE_SPEC(sampler2darrayshadow,    FUNCTION_TEXTUREGRAD,   Vec4(-1.2f, -0.4f,  -0.5f,  0.0f),      Vec4( 1.5f,  2.3f,  3.5f,  1.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f, -0.2f,  0.0f),      false,  IVec3(0),       tex2DArrayMipmapShadow, evalTexture2DArrayShadowGrad,   FRAGMENT),
+               GRAD_CASE_SPEC(samplercubeshadow,               FUNCTION_TEXTUREGRAD,   Vec4(-1.0f, -1.0f,  1.01f, 0.0f),       Vec4( 1.0f,  1.0f,  1.01f, 1.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f, -0.2f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      false,  IVec3(0),       texCubeMipmapShadow,    evalTextureCubeShadowGrad,              BOTH),
+               GRAD_CASE_SPEC(sampler2darrayshadow,    FUNCTION_TEXTUREGRAD,   Vec4(-1.2f, -0.4f, -0.5f,  0.0f),       Vec4( 1.5f,  2.3f,  3.5f,  1.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.2f,  0.0f,  0.0f),      false,  IVec3(0),       tex2DArrayMipmapShadow, evalTexture2DArrayShadowGrad,   VERTEX),
+               GRAD_CASE_SPEC(sampler2darrayshadow,    FUNCTION_TEXTUREGRAD,   Vec4(-1.2f, -0.4f, -0.5f,  0.0f),       Vec4( 1.5f,  2.3f,  3.5f,  1.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f, -0.2f,  0.0f),      false,  IVec3(0),       tex2DArrayMipmapShadow, evalTexture2DArrayShadowGrad,   FRAGMENT),
                GRAD_CASE_SPEC(sampler1dshadow,                 FUNCTION_TEXTUREGRAD,   Vec4(-0.2f,  0.0f,  0.0f,  0.0f),       Vec4( 1.5f,  0.0f,  1.0f,  0.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.2f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      false,  IVec3(0),       tex1DMipmapShadow,              evalTexture1DShadowGrad,                BOTH),
                GRAD_CASE_SPEC(sampler1darrayshadow,    FUNCTION_TEXTUREGRAD,   Vec4(-1.2f, -0.5f,  0.0f,  0.0f),       Vec4( 1.5f,  3.5f,  1.0f,  0.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.2f,  0.0f,  0.0f),      false,  IVec3(0),       tex1DArrayMipmapShadow, evalTexture1DArrayShadowGrad,   VERTEX),
                GRAD_CASE_SPEC(sampler1darrayshadow,    FUNCTION_TEXTUREGRAD,   Vec4(-1.2f, -0.5f,  0.0f,  0.0f),       Vec4( 1.5f,  3.5f,  1.0f,  0.0f),       Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3( 0.0f,  0.0f,  0.0f),      Vec3(-0.2f,  0.0f,  0.0f),      false,  IVec3(0),       tex1DArrayMipmapShadow, evalTexture1DArrayShadowGrad,   FRAGMENT),
index 1593cc1500a60215d1deecb51c083b1f03f07675..2d2dc325760c10a9f83177ec56ae2a2817163ef2 100644 (file)
@@ -1,25 +1,6 @@
-# Excluded texture function tests according to the Android GLES3 issue list
-dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_fragment
-dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_vertex
-
-# Excluded sparse version of the above texture function tests
+# Excluded sparse version of texture function tests according to the Android GLES3 issue list
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercubeshadow_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercubeshadow_vertex
-dEQP-VK.glsl.texture_functions.texturegrad.sparse_isamplercube_fragment
-dEQP-VK.glsl.texture_functions.texturegrad.sparse_isamplercube_vertex
-dEQP-VK.glsl.texture_functions.texturegrad.sparse_usamplercube_fragment
-dEQP-VK.glsl.texture_functions.texturegrad.sparse_isampler3d_vertex
-
-
-# Issue 419: Failing sparse tests (Image mismatch)
-dEQP-VK.glsl.texture_functions.texture.sparse_isampler2d_bias_fragment
-dEQP-VK.glsl.texture_functions.texture.sparse_usampler2d_bias_fragment
-dEQP-VK.glsl.texture_functions.texture.sparse_isamplercube_bias_fragment
-dEQP-VK.glsl.texture_functions.texture.sparse_usamplercube_bias_fragment
-dEQP-VK.glsl.texture_functions.texture.sparse_isampler2darray_bias_fragment
-dEQP-VK.glsl.texture_functions.texture.sparse_usampler2darray_bias_fragment
-dEQP-VK.glsl.texture_functions.texture.sparse_isampler3d_bias_fragment
-dEQP-VK.glsl.texture_functions.texture.sparse_usampler3d_bias_fragment
 
 # Excluded Amber example tests
 dEQP-VK.amber-example.*
index bbada7635649a8f6d0900db2586bc5a5fcd7c25b..2ed8985465216f40aeb34a01ee33ae2c743873c4 100644 (file)
@@ -347129,7 +347129,9 @@ dEQP-VK.glsl.texture_functions.texture.sparse_sampler2d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler2d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler2d_bias_float_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler2d_bias_float_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_isampler2d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.isampler2d_bias_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_usampler2d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.usampler2d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_samplercube_fixed_vertex
 dEQP-VK.glsl.texture_functions.texture.samplercube_fixed_vertex
@@ -347151,7 +347153,9 @@ dEQP-VK.glsl.texture_functions.texture.sparse_samplercube_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.samplercube_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_samplercube_bias_float_fragment
 dEQP-VK.glsl.texture_functions.texture.samplercube_bias_float_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_isamplercube_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.isamplercube_bias_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_usamplercube_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.usamplercube_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler2darray_fixed_vertex
 dEQP-VK.glsl.texture_functions.texture.sampler2darray_fixed_vertex
@@ -347173,7 +347177,9 @@ dEQP-VK.glsl.texture_functions.texture.sparse_sampler2darray_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler2darray_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler2darray_bias_float_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler2darray_bias_float_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_isampler2darray_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.isampler2darray_bias_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_usampler2darray_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.usampler2darray_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler3d_fixed_vertex
 dEQP-VK.glsl.texture_functions.texture.sampler3d_fixed_vertex
@@ -347195,7 +347201,9 @@ dEQP-VK.glsl.texture_functions.texture.sparse_sampler3d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler3d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler3d_bias_float_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler3d_bias_float_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_isampler3d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.isampler3d_bias_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_usampler3d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.usampler3d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler1d_fixed_vertex
 dEQP-VK.glsl.texture_functions.texture.sampler1d_fixed_fragment
@@ -347863,10 +347871,13 @@ dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercube_float_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.samplercube_float_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercube_float_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.samplercube_float_fragment
+dEQP-VK.glsl.texture_functions.texturegrad.sparse_isamplercube_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.isamplercube_vertex
+dEQP-VK.glsl.texture_functions.texturegrad.sparse_isamplercube_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.isamplercube_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_usamplercube_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.usamplercube_vertex
+dEQP-VK.glsl.texture_functions.texturegrad.sparse_usamplercube_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.usamplercube_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2darray_fixed_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sampler2darray_fixed_vertex
@@ -347892,6 +347903,7 @@ dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler3d_float_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sampler3d_float_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler3d_float_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sampler3d_float_fragment
+dEQP-VK.glsl.texture_functions.texturegrad.sparse_isampler3d_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.isampler3d_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_isampler3d_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.isampler3d_fragment
@@ -347927,6 +347939,8 @@ dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2dshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sampler2dshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2dshadow_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sampler2dshadow_fragment
+dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_vertex
+dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2darrayshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sampler2darrayshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2darrayshadow_fragment
index d4c9e20ad93ac7be02ab0865ef36ff4c557c34b1..aed15f654067b0e86d1cbf0bacc8d99894b66157 100644 (file)
@@ -347129,7 +347129,9 @@ dEQP-VK.glsl.texture_functions.texture.sparse_sampler2d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler2d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler2d_bias_float_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler2d_bias_float_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_isampler2d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.isampler2d_bias_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_usampler2d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.usampler2d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_samplercube_fixed_vertex
 dEQP-VK.glsl.texture_functions.texture.samplercube_fixed_vertex
@@ -347151,7 +347153,9 @@ dEQP-VK.glsl.texture_functions.texture.sparse_samplercube_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.samplercube_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_samplercube_bias_float_fragment
 dEQP-VK.glsl.texture_functions.texture.samplercube_bias_float_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_isamplercube_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.isamplercube_bias_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_usamplercube_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.usamplercube_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler2darray_fixed_vertex
 dEQP-VK.glsl.texture_functions.texture.sampler2darray_fixed_vertex
@@ -347173,7 +347177,9 @@ dEQP-VK.glsl.texture_functions.texture.sparse_sampler2darray_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler2darray_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler2darray_bias_float_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler2darray_bias_float_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_isampler2darray_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.isampler2darray_bias_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_usampler2darray_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.usampler2darray_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler3d_fixed_vertex
 dEQP-VK.glsl.texture_functions.texture.sampler3d_fixed_vertex
@@ -347195,7 +347201,9 @@ dEQP-VK.glsl.texture_functions.texture.sparse_sampler3d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler3d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_sampler3d_bias_float_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler3d_bias_float_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_isampler3d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.isampler3d_bias_fragment
+dEQP-VK.glsl.texture_functions.texture.sparse_usampler3d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.usampler3d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sampler1d_fixed_vertex
 dEQP-VK.glsl.texture_functions.texture.sampler1d_fixed_fragment
@@ -347863,10 +347871,13 @@ dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercube_float_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.samplercube_float_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercube_float_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.samplercube_float_fragment
+dEQP-VK.glsl.texture_functions.texturegrad.sparse_isamplercube_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.isamplercube_vertex
+dEQP-VK.glsl.texture_functions.texturegrad.sparse_isamplercube_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.isamplercube_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_usamplercube_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.usamplercube_vertex
+dEQP-VK.glsl.texture_functions.texturegrad.sparse_usamplercube_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.usamplercube_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2darray_fixed_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sampler2darray_fixed_vertex
@@ -347892,6 +347903,7 @@ dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler3d_float_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sampler3d_float_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler3d_float_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sampler3d_float_fragment
+dEQP-VK.glsl.texture_functions.texturegrad.sparse_isampler3d_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.isampler3d_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_isampler3d_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.isampler3d_fragment
@@ -347927,6 +347939,8 @@ dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2dshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sampler2dshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2dshadow_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sampler2dshadow_fragment
+dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_vertex
+dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_fragment
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2darrayshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sampler2darrayshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegrad.sparse_sampler2darrayshadow_fragment