Commit ba564751 authored by Saman Sami's avatar Saman Sami Committed by Commit Bot

Revert "Enable the rest of Vulkan viz_unittests"

This reverts commit 03d55735.

Reason for revert: fails in debug builds https://ci.chromium.org/p/chromium/builders/ci/Linux%20Tests%20(dbg)(1)(32)/58947

Original change's description:
> Enable the rest of Vulkan viz_unittests
> 
> Except for the video tests, the rest of the tests now pass with Vulkan.
> 
> Bug: 960795
> Change-Id: Ie27b7228934c5540aaf0e670f55e77da96c1f0c8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1629692
> Reviewed-by: Jonathan Backer <backer@chromium.org>
> Auto-Submit: Saman Sami <samans@chromium.org>
> Commit-Queue: Saman Sami <samans@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#663834}

TBR=backer@chromium.org,samans@chromium.org

Change-Id: I778429685958a2363d9cb3ccbaab41d729cffcc3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 960795
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1632874Reviewed-by: default avatarSaman Sami <samans@chromium.org>
Commit-Queue: Saman Sami <samans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663869}
parent 5b424572
......@@ -887,6 +887,19 @@ using RendererTypes = ::testing::Types<GLRenderer,
>;
TYPED_TEST_SUITE(RendererPixelTest, RendererTypes);
// TODO(samans): Make these tests pass with Vulkan. https://crbug.com/960795
template <typename RendererType>
class NonVulkanRendererPixelTest : public cc::RendererPixelTest<RendererType> {
};
using NonVulkanRendererTypes =
::testing::Types<GLRenderer,
SoftwareRenderer,
SkiaRenderer,
cc::GLRendererWithExpandedViewport,
cc::SoftwareRendererWithExpandedViewport>;
TYPED_TEST_SUITE(NonVulkanRendererPixelTest, NonVulkanRendererTypes);
template <typename RendererType>
class SoftwareRendererPixelTest : public cc::RendererPixelTest<RendererType> {};
......@@ -1014,7 +1027,7 @@ TYPED_TEST(RendererPixelTest, SimpleGreenRect_NonRootRenderPass) {
cc::ExactPixelComparator(true)));
}
TYPED_TEST(RendererPixelTest, PremultipliedTextureWithoutBackground) {
TYPED_TEST(NonVulkanRendererPixelTest, PremultipliedTextureWithoutBackground) {
gfx::Rect rect(this->device_viewport_size_);
int id = 1;
......@@ -1043,7 +1056,7 @@ TYPED_TEST(RendererPixelTest, PremultipliedTextureWithoutBackground) {
cc::FuzzyPixelOffByOneComparator(true)));
}
TYPED_TEST(RendererPixelTest, PremultipliedTextureWithBackground) {
TYPED_TEST(NonVulkanRendererPixelTest, PremultipliedTextureWithBackground) {
gfx::Rect rect(this->device_viewport_size_);
int id = 1;
......@@ -2405,7 +2418,7 @@ TYPED_TEST(RendererPixelTest, EnlargedRenderPassTextureWithAntiAliasing) {
// This tests the case where we have a RenderPass with a mask, but the quad
// for the masked surface does not include the full surface texture.
TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad) {
TYPED_TEST(NonVulkanRendererPixelTest, RenderPassAndMaskWithPartialQuad) {
gfx::Rect viewport_rect(this->device_viewport_size_);
int root_pass_id = 1;
......@@ -2502,7 +2515,7 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad) {
// This tests the case where we have a RenderPass with a mask, but the quad
// for the masked surface does not include the full surface texture.
TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad2) {
TYPED_TEST(NonVulkanRendererPixelTest, RenderPassAndMaskWithPartialQuad2) {
gfx::Rect viewport_rect(this->device_viewport_size_);
int root_pass_id = 1;
......@@ -2597,7 +2610,7 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad2) {
cc::ExactPixelComparator(true)));
}
TYPED_TEST(RendererPixelTest, RenderPassAndMaskForRoundedCorner) {
TYPED_TEST(NonVulkanRendererPixelTest, RenderPassAndMaskForRoundedCorner) {
gfx::Rect viewport_rect(this->device_viewport_size_);
constexpr int kInset = 20;
constexpr int kCornerRadius = 20;
......@@ -2686,7 +2699,8 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskForRoundedCorner) {
cc::FuzzyPixelComparator(true, 0.6f, 0.f, 255.f, 255, 0)));
}
TYPED_TEST(RendererPixelTest, RenderPassAndMaskForRoundedCornerMultiRadii) {
TYPED_TEST(NonVulkanRendererPixelTest,
RenderPassAndMaskForRoundedCornerMultiRadii) {
gfx::Rect viewport_rect(this->device_viewport_size_);
constexpr int kInset = 20;
const SkVector kCornerRadii[4] = {
......@@ -3665,7 +3679,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadNearestNeighbor) {
// This disables filtering by setting |nearest_neighbor| on the
// TileDrawQuad.
TYPED_TEST(RendererPixelTest, TileDrawQuadNearestNeighbor) {
TYPED_TEST(NonVulkanRendererPixelTest, TileDrawQuadNearestNeighbor) {
constexpr bool contents_premultiplied = true;
constexpr bool needs_blending = true;
constexpr bool nearest_neighbor = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment