projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e501c63)
Enable all textureproj* tests.
authorAkos Dirner <adirner.uszeged@partner.samsung.com>
Wed, 15 Jun 2016 13:47:36 +0000 (15:47 +0200)
committerPyry Haulos <phaulos@google.com>
Thu, 14 Jul 2016 19:22:42 +0000 (12:22 -0700)
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp patch | blob | history
external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml patch | blob | history
external/vulkancts/mustpass/1.0.1/vk-default.txt patch | blob | history

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
index ab6a6d9..a0e24b3 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
@@ -2769,20 +2769,6 @@ static void createCaseGroup (tcu::TestCaseGroup* parent, const char* groupName,
 
        for (int ndx = 0; ndx < numCases; ndx++)
        {
-               {
-                       // \todo Remove this hack and enable all tests after glslang issue will be fixed: https://github.com/KhronosGroup/glslang/issues/319
-                       switch (cases[ndx].lookupSpec.function)
-                       {
-                               case FUNCTION_TEXTUREPROJ3:
-                               case FUNCTION_TEXTUREPROJLOD3:
-                               case FUNCTION_TEXTUREPROJGRAD3:
-                                       continue;
-
-                               default:
-                                       break;
-                       }
-               }
-
                std::string name = cases[ndx].name;
                if (cases[ndx].flags & VERTEX)
                {
diff --git a/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml b/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml
index edd1c63..41b74f4 100644 (file)
--- a/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml
+++ b/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml
@@ -243634,6 +243634,42 @@
                                        </Test>
                                </TestCase>
                                <TestCase name="textureproj">
+                                       <Test name="sampler2d_vec3_fixed_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_fixed_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_bias_fixed_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_bias_float_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_bias_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_bias_fragment">
+                                               <TestInstance/>
+                                       </Test>
                                        <Test name="sampler2d_vec4_fixed_vertex">
                                                <TestInstance/>
                                        </Test>
@@ -243708,6 +243744,42 @@
                                        </Test>
                                </TestCase>
                                <TestCase name="textureprojoffset">
+                                       <Test name="sampler2d_vec3_fixed_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_fixed_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_bias_fixed_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_bias_float_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_bias_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_bias_fragment">
+                                               <TestInstance/>
+                                       </Test>
                                        <Test name="sampler2d_vec4_fixed_vertex">
                                                <TestInstance/>
                                        </Test>
@@ -243972,6 +244044,30 @@
                                        </Test>
                                </TestCase>
                                <TestCase name="textureprojlod">
+                                       <Test name="sampler2d_vec3_fixed_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_fixed_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
                                        <Test name="sampler2d_vec4_fixed_vertex">
                                                <TestInstance/>
                                        </Test>
@@ -244016,6 +244112,30 @@
                                        </Test>
                                </TestCase>
                                <TestCase name="textureprojlodoffset">
+                                       <Test name="sampler2d_vec3_fixed_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_fixed_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
                                        <Test name="sampler2d_vec4_fixed_vertex">
                                                <TestInstance/>
                                        </Test>
@@ -244196,6 +244316,30 @@
                                        </Test>
                                </TestCase>
                                <TestCase name="textureprojgrad">
+                                       <Test name="sampler2d_vec3_fixed_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_fixed_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
                                        <Test name="sampler2d_vec4_fixed_vertex">
                                                <TestInstance/>
                                        </Test>
@@ -244246,6 +244390,30 @@
                                        </Test>
                                </TestCase>
                                <TestCase name="textureprojgradoffset">
+                                       <Test name="sampler2d_vec3_fixed_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_fixed_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="sampler2d_vec3_float_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="isampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_vertex">
+                                               <TestInstance/>
+                                       </Test>
+                                       <Test name="usampler2d_vec3_fragment">
+                                               <TestInstance/>
+                                       </Test>
                                        <Test name="sampler2d_vec4_fixed_vertex">
                                                <TestInstance/>
                                        </Test>
diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt
index 5432e27..960ea29 100644 (file)
--- a/external/vulkancts/mustpass/1.0.1/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt
@@ -75558,6 +75558,18 @@ dEQP-VK.glsl.texture_functions.textureoffset.sparse_sampler2dshadow_fragment
 dEQP-VK.glsl.texture_functions.textureoffset.sampler2dshadow_fragment
 dEQP-VK.glsl.texture_functions.textureoffset.sparse_sampler2dshadow_bias_fragment
 dEQP-VK.glsl.texture_functions.textureoffset.sampler2dshadow_bias_fragment
+dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec3_fixed_vertex
+dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec3_fixed_fragment
+dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec3_float_vertex
+dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec3_float_fragment
+dEQP-VK.glsl.texture_functions.textureproj.isampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureproj.isampler2d_vec3_fragment
+dEQP-VK.glsl.texture_functions.textureproj.usampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureproj.usampler2d_vec3_fragment
+dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec3_bias_fixed_fragment
+dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec3_bias_float_fragment
+dEQP-VK.glsl.texture_functions.textureproj.isampler2d_vec3_bias_fragment
+dEQP-VK.glsl.texture_functions.textureproj.usampler2d_vec3_bias_fragment
 dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec4_fixed_vertex
 dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec4_fixed_fragment
 dEQP-VK.glsl.texture_functions.textureproj.sampler2d_vec4_float_vertex
@@ -75582,6 +75594,18 @@ dEQP-VK.glsl.texture_functions.textureproj.sampler3d_bias_fixed_fragment
 dEQP-VK.glsl.texture_functions.textureproj.sampler3d_bias_float_fragment
 dEQP-VK.glsl.texture_functions.textureproj.isampler3d_bias_fragment
 dEQP-VK.glsl.texture_functions.textureproj.usampler3d_bias_fragment
+dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec3_fixed_vertex
+dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec3_fixed_fragment
+dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec3_float_vertex
+dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec3_float_fragment
+dEQP-VK.glsl.texture_functions.textureprojoffset.isampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojoffset.isampler2d_vec3_fragment
+dEQP-VK.glsl.texture_functions.textureprojoffset.usampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojoffset.usampler2d_vec3_fragment
+dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec3_bias_fixed_fragment
+dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec3_bias_float_fragment
+dEQP-VK.glsl.texture_functions.textureprojoffset.isampler2d_vec3_bias_fragment
+dEQP-VK.glsl.texture_functions.textureprojoffset.usampler2d_vec3_bias_fragment
 dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec4_fixed_vertex
 dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec4_fixed_fragment
 dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2d_vec4_float_vertex
@@ -75668,6 +75692,14 @@ dEQP-VK.glsl.texture_functions.texturelodoffset.sparse_sampler2dshadow_vertex
 dEQP-VK.glsl.texture_functions.texturelodoffset.sampler2dshadow_vertex
 dEQP-VK.glsl.texture_functions.texturelodoffset.sparse_sampler2dshadow_fragment
 dEQP-VK.glsl.texture_functions.texturelodoffset.sampler2dshadow_fragment
+dEQP-VK.glsl.texture_functions.textureprojlod.sampler2d_vec3_fixed_vertex
+dEQP-VK.glsl.texture_functions.textureprojlod.sampler2d_vec3_fixed_fragment
+dEQP-VK.glsl.texture_functions.textureprojlod.sampler2d_vec3_float_vertex
+dEQP-VK.glsl.texture_functions.textureprojlod.sampler2d_vec3_float_fragment
+dEQP-VK.glsl.texture_functions.textureprojlod.isampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojlod.isampler2d_vec3_fragment
+dEQP-VK.glsl.texture_functions.textureprojlod.usampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojlod.usampler2d_vec3_fragment
 dEQP-VK.glsl.texture_functions.textureprojlod.sampler2d_vec4_fixed_vertex
 dEQP-VK.glsl.texture_functions.textureprojlod.sampler2d_vec4_fixed_fragment
 dEQP-VK.glsl.texture_functions.textureprojlod.sampler2d_vec4_float_vertex
@@ -75682,6 +75714,14 @@ dEQP-VK.glsl.texture_functions.textureprojlod.sampler3d_float_vertex
 dEQP-VK.glsl.texture_functions.textureprojlod.sampler3d_float_fragment
 dEQP-VK.glsl.texture_functions.textureprojlod.isampler3d_fragment
 dEQP-VK.glsl.texture_functions.textureprojlod.usampler3d_fragment
+dEQP-VK.glsl.texture_functions.textureprojlodoffset.sampler2d_vec3_fixed_vertex
+dEQP-VK.glsl.texture_functions.textureprojlodoffset.sampler2d_vec3_fixed_fragment
+dEQP-VK.glsl.texture_functions.textureprojlodoffset.sampler2d_vec3_float_vertex
+dEQP-VK.glsl.texture_functions.textureprojlodoffset.sampler2d_vec3_float_fragment
+dEQP-VK.glsl.texture_functions.textureprojlodoffset.isampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojlodoffset.isampler2d_vec3_fragment
+dEQP-VK.glsl.texture_functions.textureprojlodoffset.usampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojlodoffset.usampler2d_vec3_fragment
 dEQP-VK.glsl.texture_functions.textureprojlodoffset.sampler2d_vec4_fixed_vertex
 dEQP-VK.glsl.texture_functions.textureprojlodoffset.sampler2d_vec4_fixed_fragment
 dEQP-VK.glsl.texture_functions.textureprojlodoffset.sampler2d_vec4_float_vertex
@@ -75740,6 +75780,14 @@ dEQP-VK.glsl.texture_functions.texturegradoffset.sparse_sampler2dshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegradoffset.sampler2dshadow_vertex
 dEQP-VK.glsl.texture_functions.texturegradoffset.sparse_sampler2dshadow_fragment
 dEQP-VK.glsl.texture_functions.texturegradoffset.sampler2dshadow_fragment
+dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2d_vec3_fixed_vertex
+dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2d_vec3_fixed_fragment
+dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2d_vec3_float_vertex
+dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2d_vec3_float_fragment
+dEQP-VK.glsl.texture_functions.textureprojgrad.isampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojgrad.isampler2d_vec3_fragment
+dEQP-VK.glsl.texture_functions.textureprojgrad.usampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojgrad.usampler2d_vec3_fragment
 dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2d_vec4_fixed_vertex
 dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2d_vec4_fixed_fragment
 dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2d_vec4_float_vertex
@@ -75756,6 +75804,14 @@ dEQP-VK.glsl.texture_functions.textureprojgrad.isampler3d_vertex
 dEQP-VK.glsl.texture_functions.textureprojgrad.isampler3d_fragment
 dEQP-VK.glsl.texture_functions.textureprojgrad.usampler3d_vertex
 dEQP-VK.glsl.texture_functions.textureprojgrad.usampler3d_fragment
+dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2d_vec3_fixed_vertex
+dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2d_vec3_fixed_fragment
+dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2d_vec3_float_vertex
+dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2d_vec3_float_fragment
+dEQP-VK.glsl.texture_functions.textureprojgradoffset.isampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojgradoffset.isampler2d_vec3_fragment
+dEQP-VK.glsl.texture_functions.textureprojgradoffset.usampler2d_vec3_vertex
+dEQP-VK.glsl.texture_functions.textureprojgradoffset.usampler2d_vec3_fragment
 dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2d_vec4_fixed_vertex
 dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2d_vec4_fixed_fragment
 dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2d_vec4_float_vertex
Domain: Graphics System / GL;