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

Revert "Add Vulkan viz_unittests"

This reverts commit f0de58c9.

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:
> Add Vulkan viz_unittests
> 
> This CL enables all viz_unittests that pass with Vulkan.
> 
> Bug: 961373
> Change-Id: Ie0d0c590d58a930bf5e005dc233240203d76e773
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1625015
> Commit-Queue: Saman Sami <samans@chromium.org>
> Auto-Submit: Saman Sami <samans@chromium.org>
> Reviewed-by: Jonathan Backer <backer@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#663761}

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

Change-Id: I60cbc3ee0ade13de5f830f4957a08630254be2b1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 961373
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1632875Reviewed-by: default avatarSaman Sami <samans@chromium.org>
Commit-Queue: Saman Sami <samans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663876}
parent 6ed996f7
...@@ -7,7 +7,6 @@ include_rules = [ ...@@ -7,7 +7,6 @@ include_rules = [
"+gpu/command_buffer/client/shared_memory_limits.h", "+gpu/command_buffer/client/shared_memory_limits.h",
"+gpu/command_buffer/common/context_creation_attribs.h", "+gpu/command_buffer/common/context_creation_attribs.h",
"+gpu/command_buffer/common/skia_utils.h", "+gpu/command_buffer/common/skia_utils.h",
"+gpu/command_buffer/service/gpu_switches.h",
"+gpu/command_buffer/service/image_factory.h", "+gpu/command_buffer/service/image_factory.h",
"+gpu/config/gpu_feature_type.h", "+gpu/config/gpu_feature_type.h",
"+gpu/config/gpu_info.h", "+gpu/config/gpu_info.h",
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include "components/viz/test/test_shared_bitmap_manager.h" #include "components/viz/test/test_shared_bitmap_manager.h"
#include "gpu/command_buffer/client/gles2_interface.h" #include "gpu/command_buffer/client/gles2_interface.h"
#include "gpu/command_buffer/client/shared_memory_limits.h" #include "gpu/command_buffer/client/shared_memory_limits.h"
#include "gpu/command_buffer/service/gpu_switches.h"
#include "gpu/command_buffer/service/service_utils.h" #include "gpu/command_buffer/service/service_utils.h"
#include "gpu/config/gpu_feature_type.h" #include "gpu/config/gpu_feature_type.h"
#include "gpu/config/gpu_info.h" #include "gpu/config/gpu_info.h"
...@@ -272,12 +271,7 @@ void PixelTest::SetUpGLRenderer(bool flipped_output_surface) { ...@@ -272,12 +271,7 @@ void PixelTest::SetUpGLRenderer(bool flipped_output_surface) {
renderer_->SetVisible(true); renderer_->SetVisible(true);
} }
void PixelTest::SetUpSkiaRenderer(bool flipped_output_surface, void PixelTest::SetUpSkiaRenderer(bool flipped_output_surface) {
bool enable_vulkan) {
if (enable_vulkan) {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
::switches::kEnableVulkan);
}
// Set up the GPU service. // Set up the GPU service.
gpu_service_holder_ = viz::TestGpuServiceHolder::GetInstance(); gpu_service_holder_ = viz::TestGpuServiceHolder::GetInstance();
......
...@@ -112,7 +112,7 @@ class PixelTest : public testing::Test { ...@@ -112,7 +112,7 @@ class PixelTest : public testing::Test {
void SetUpGLWithoutRenderer(bool flipped_output_surface); void SetUpGLWithoutRenderer(bool flipped_output_surface);
void SetUpGLRenderer(bool flipped_output_surface); void SetUpGLRenderer(bool flipped_output_surface);
void SetUpSkiaRenderer(bool flipped_output_surface, bool enable_vulkan); void SetUpSkiaRenderer(bool flipped_output_surface);
void SetUpSoftwareRenderer(); void SetUpSoftwareRenderer();
void TearDown() override; void TearDown() override;
...@@ -207,35 +207,6 @@ class SkiaRendererWithFlippedSurface : public viz::SkiaRenderer { ...@@ -207,35 +207,6 @@ class SkiaRendererWithFlippedSurface : public viz::SkiaRenderer {
mode) {} mode) {}
}; };
class VulkanSkiaRenderer : public viz::SkiaRenderer {
public:
VulkanSkiaRenderer(const viz::RendererSettings* settings,
viz::OutputSurface* output_surface,
viz::DisplayResourceProvider* resource_provider,
viz::SkiaOutputSurface* skia_output_surface,
DrawMode mode)
: SkiaRenderer(settings,
output_surface,
resource_provider,
skia_output_surface,
mode) {}
};
class VulkanSkiaRendererWithFlippedSurface : public viz::SkiaRenderer {
public:
VulkanSkiaRendererWithFlippedSurface(
const viz::RendererSettings* settings,
viz::OutputSurface* output_surface,
viz::DisplayResourceProvider* resource_provider,
viz::SkiaOutputSurface* skia_output_surface,
DrawMode mode)
: SkiaRenderer(settings,
output_surface,
resource_provider,
skia_output_surface,
mode) {}
};
template <> template <>
inline void RendererPixelTest<viz::GLRenderer>::SetUp() { inline void RendererPixelTest<viz::GLRenderer>::SetUp() {
SetUpGLRenderer(false); SetUpGLRenderer(false);
...@@ -263,26 +234,17 @@ inline void RendererPixelTest<SoftwareRendererWithExpandedViewport>::SetUp() { ...@@ -263,26 +234,17 @@ inline void RendererPixelTest<SoftwareRendererWithExpandedViewport>::SetUp() {
template <> template <>
inline void RendererPixelTest<viz::SkiaRenderer>::SetUp() { inline void RendererPixelTest<viz::SkiaRenderer>::SetUp() {
SetUpSkiaRenderer(false, false); SetUpSkiaRenderer(false);
} }
template <> template <>
inline void RendererPixelTest<SkiaRendererWithFlippedSurface>::SetUp() { inline void RendererPixelTest<SkiaRendererWithFlippedSurface>::SetUp() {
SetUpSkiaRenderer(true, false); SetUpSkiaRenderer(true);
}
template <>
inline void RendererPixelTest<VulkanSkiaRenderer>::SetUp() {
SetUpSkiaRenderer(false, true);
}
template <>
inline void RendererPixelTest<VulkanSkiaRendererWithFlippedSurface>::SetUp() {
SetUpSkiaRenderer(true, true);
} }
typedef RendererPixelTest<viz::GLRenderer> GLRendererPixelTest; typedef RendererPixelTest<viz::GLRenderer> GLRendererPixelTest;
typedef RendererPixelTest<viz::SoftwareRenderer> SoftwareRendererPixelTest; typedef RendererPixelTest<viz::SoftwareRenderer> SoftwareRendererPixelTest;
typedef RendererPixelTest<viz::SkiaRenderer> SkiaRendererPixelTest;
} // namespace cc } // namespace cc
......
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