Merge "Use square cubemap textures in negative tests" into nyc-dev

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 389b170..1935724 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -70485,44 +70485,6 @@
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
                                                </TestCase>
-                                               <TestCase name="projected">
-                                                       <Test name="nearest_nearest_clamp">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="nearest_nearest_repeat">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="nearest_nearest_mirror">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="linear_nearest_clamp">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="linear_nearest_repeat">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="linear_nearest_mirror">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="nearest_linear_clamp">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="nearest_linear_repeat">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="nearest_linear_mirror">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="linear_linear_clamp">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="linear_linear_repeat">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="linear_linear_mirror">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                               </TestCase>
                                                <TestCase name="bias">
                                                        <Test name="nearest_nearest">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 2cd197f..b91ba3e 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -22335,18 +22335,6 @@ dEQP-GLES3.functional.texture.mipmap.2d.affine.nearest_linear_mirror
 dEQP-GLES3.functional.texture.mipmap.2d.affine.linear_linear_clamp
 dEQP-GLES3.functional.texture.mipmap.2d.affine.linear_linear_repeat
 dEQP-GLES3.functional.texture.mipmap.2d.affine.linear_linear_mirror
-dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_clamp
-dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_repeat
-dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_mirror
-dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_clamp
-dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_repeat
-dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_mirror
-dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_clamp
-dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_repeat
-dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_mirror
-dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_clamp
-dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_repeat
-dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_mirror
 dEQP-GLES3.functional.texture.mipmap.2d.bias.nearest_nearest
 dEQP-GLES3.functional.texture.mipmap.2d.bias.linear_nearest
 dEQP-GLES3.functional.texture.mipmap.2d.bias.nearest_linear

diff --git a/android/cts/master/src/gles3-hw-issues.txt b/android/cts/master/src/gles3-hw-issues.txt
index a6f753b..c8e649e 100644 (file)
--- a/android/cts/master/src/gles3-hw-issues.txt
+++ b/android/cts/master/src/gles3-hw-issues.txt
@@ -883,3 +883,6 @@ dEQP-GLES3.functional.texture.filtering.3d.formats.rgba16f_linear_mipmap_linear
 # Bug 22920759
 dEQP-GLES3.functional.texture.mipmap.cube.projected.nearest_linear
 dEQP-GLES3.functional.texture.mipmap.cube.max_level.nearest_nearest
+
+# Bug 28200359
+dEQP-GLES3.functional.texture.mipmap.2d.projected.*

diff --git a/external/vulkancts/modules/vulkan/vktSynchronization.cpp b/external/vulkancts/modules/vulkan/vktSynchronization.cpp
index ff22ca8..c3a5c77 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktSynchronization.cpp
+++ b/external/vulkancts/modules/vulkan/vktSynchronization.cpp
@@ -740,6 +740,9 @@ void generateWork (TestContext& testContext)
        testContext.imageAllocation                             = image.allocation;
        testContext.image                                               = image.image;
 
+       for (size_t ndx = 0; ndx < image.imageMemoryBarrier.size(); ++ndx)
+               imageBarriers.push_back(image.imageMemoryBarrier[ndx]);
+
        renderPassParameters.colorFormat                = VK_FORMAT_R8G8B8A8_UNORM;
        renderPassParameters.colorSamples               = VK_SAMPLE_COUNT_1_BIT;
        createColorOnlyRenderPass(deviceInterface, testContext.device, renderPassParameters, testContext.renderPass);
@@ -809,15 +812,27 @@ void generateWork (TestContext& testContext)
        depthStencilState.depthWriteEnable                      = VK_FALSE;
        depthStencilState.depthBoundsTestEnable         = VK_FALSE;
        depthStencilState.stencilTestEnable                     = VK_FALSE;
+       depthStencilState.depthCompareOp                        = VK_COMPARE_OP_ALWAYS;
+       depthStencilState.front.failOp                          = VK_STENCIL_OP_KEEP;
+       depthStencilState.front.passOp                          = VK_STENCIL_OP_KEEP;
+       depthStencilState.front.depthFailOp                     = VK_STENCIL_OP_KEEP;
+       depthStencilState.back                                          = depthStencilState.front;
 
        deMemset(&blendAttachment, 0xcd, sizeof(blendAttachment));
        blendAttachment.blendEnable                                     = VK_FALSE;
+       blendAttachment.srcColorBlendFactor                     = VK_BLEND_FACTOR_ZERO;
+       blendAttachment.srcAlphaBlendFactor                     = VK_BLEND_FACTOR_ZERO;
+       blendAttachment.dstColorBlendFactor                     = VK_BLEND_FACTOR_ZERO;
+       blendAttachment.dstAlphaBlendFactor                     = VK_BLEND_FACTOR_ZERO;
+       blendAttachment.colorBlendOp                            = VK_BLEND_OP_ADD;
+       blendAttachment.alphaBlendOp                            = VK_BLEND_OP_ADD;
 
        deMemset(&blendState, 0xcd, sizeof(blendState));
        blendState.sType                                                        = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
        blendState.pNext                                                        = DE_NULL;
        blendState.flags                                                        = 0;
        blendState.logicOpEnable                                        = VK_FALSE;
+       blendState.logicOp                                                      = VK_LOGIC_OP_COPY;
        blendState.attachmentCount                                      = 1;
        blendState.pAttachments                                         = &blendAttachment;