Remove unused test classes in gpu_unittests
This CL fixes the following warnings when running gpu_unittests:
The following parameterized test case is not instantiated: UninstantiatedParamaterizedTestSuite<GLES3DecoderRGBBackbufferTest>
The following parameterized test case is not instantiated: UninstantiatedParamaterizedTestSuite<GLES2DecoderTest4>
The following parameterized test case is not instantiated: UninstantiatedParamaterizedTestSuite<GLES3DecoderTest4>
The following parameterized test case is not instantiated: UninstantiatedParamaterizedTestSuite<GLES2DecoderTestDisabledExtensions>
The following parameterized test case is not instantiated: UninstantiatedParamaterizedTestSuite<GLES2DecoderTestWithEXTMultisampleCompatibility>
The following parameterized test case is not instantiated: UninstantiatedParamaterizedTestSuite<GLES2DecoderTestWithBlendFuncExtended>
The following parameterized test case is not instantiated: UninstantiatedParamaterizedTestSuite<GLES2DecoderTestWithCHROMIUMRasterTransport>
These test classes were unused so this CL removes them.
Bug: 1045846
Change-Id: I550fca53501fa94bae135ce81d87357a307a1e5b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2318825
Auto-Submit: Alan Cutter <alancutter@chromium.org>
Reviewed-by: James Darpinian <jdarpinian@chromium.org>
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#793393}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4912306e420924b20dd538e20cf745e0cd3509c9
diff --git a/command_buffer/service/gles2_cmd_decoder_unittest.cc b/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 9357973..f6643bc 100644
--- a/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -1881,15 +1881,6 @@
SetupDefaultProgram();
}
-void GLES3DecoderRGBBackbufferTest::SetUp() {
- InitState init;
- init.gl_version = "OpenGL ES 3.0";
- init.bind_generates_resource = true;
- init.context_type = CONTEXT_TYPE_OPENGLES3;
- InitDecoder(init);
- SetupDefaultProgram();
-}
-
INSTANTIATE_TEST_SUITE_P(Service, GLES2DecoderTest, ::testing::Bool());
INSTANTIATE_TEST_SUITE_P(Service,
@@ -1924,9 +1915,5 @@
GLES3DecoderManualInitTest,
::testing::Bool());
-INSTANTIATE_TEST_SUITE_P(Service,
- GLES3DecoderRGBBackbufferTest,
- ::testing::Bool());
-
} // namespace gles2
} // namespace gpu
diff --git a/command_buffer/service/gles2_cmd_decoder_unittest.h b/command_buffer/service/gles2_cmd_decoder_unittest.h
index 80c31cf..ac411b9 100644
--- a/command_buffer/service/gles2_cmd_decoder_unittest.h
+++ b/command_buffer/service/gles2_cmd_decoder_unittest.h
@@ -93,14 +93,6 @@
void SetUp() override;
};
-class GLES3DecoderRGBBackbufferTest : public GLES2DecoderRGBBackbufferTest {
- public:
- GLES3DecoderRGBBackbufferTest() { shader_language_version_ = 300; }
-
- // Override default setup so ES3 capabilities are enabled by default.
- void SetUp() override;
-};
-
class GLES3DecoderManualInitTest : public GLES2DecoderManualInitTest {
public:
GLES3DecoderManualInitTest() { shader_language_version_ = 300; }
diff --git a/command_buffer/service/gles2_cmd_decoder_unittest_4.cc b/command_buffer/service/gles2_cmd_decoder_unittest_4.cc
index 7dad01f..58d5386 100644
--- a/command_buffer/service/gles2_cmd_decoder_unittest_4.cc
+++ b/command_buffer/service/gles2_cmd_decoder_unittest_4.cc
@@ -29,28 +29,6 @@
namespace gpu {
namespace gles2 {
-class GLES2DecoderTest4 : public GLES2DecoderTestBase {
- public:
- GLES2DecoderTest4() = default;
-};
-
-class GLES3DecoderTest4 : public GLES2DecoderTest4 {
- public:
- GLES3DecoderTest4() { shader_language_version_ = 300; }
-
- protected:
- void SetUp() override {
- InitState init;
- init.gl_version = "OpenGL ES 3.0";
- init.bind_generates_resource = true;
- init.context_type = CONTEXT_TYPE_OPENGLES3;
- InitDecoder(init);
- }
-};
-
-INSTANTIATE_TEST_SUITE_P(Service, GLES2DecoderTest4, ::testing::Bool());
-INSTANTIATE_TEST_SUITE_P(Service, GLES3DecoderTest4, ::testing::Bool());
-
#include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_4_autogen.h"
} // namespace gles2
diff --git a/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc b/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc
index 978a837..2599c4f 100644
--- a/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc
+++ b/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc
@@ -23,17 +23,6 @@
namespace gpu {
namespace gles2 {
-// Class to use to test that functions which need feature flags or
-// extensions always return INVALID_OPERATION if the feature flags is not
-// enabled or extension is not present.
-class GLES2DecoderTestDisabledExtensions : public GLES2DecoderTest {
- public:
- GLES2DecoderTestDisabledExtensions() = default;
-};
-INSTANTIATE_TEST_SUITE_P(Service,
- GLES2DecoderTestDisabledExtensions,
- ::testing::Bool());
-
class GLES2DecoderTestWithBlendEquationAdvanced : public GLES2DecoderTest {
public:
GLES2DecoderTestWithBlendEquationAdvanced() = default;
@@ -54,46 +43,6 @@
GLES2DecoderTestWithBlendEquationAdvanced,
::testing::Bool());
-class GLES2DecoderTestWithEXTMultisampleCompatibility
- : public GLES2DecoderTest {
- public:
- GLES2DecoderTestWithEXTMultisampleCompatibility() = default;
-
- void SetUp() override {
- InitState init;
- init.gl_version = "OpenGL ES 3.1";
- init.has_alpha = true;
- init.has_depth = true;
- init.request_alpha = true;
- init.request_depth = true;
- init.bind_generates_resource = true;
- init.extensions = "GL_EXT_multisample_compatibility ";
- InitDecoder(init);
- }
-};
-INSTANTIATE_TEST_SUITE_P(Service,
- GLES2DecoderTestWithEXTMultisampleCompatibility,
- ::testing::Bool());
-
-class GLES2DecoderTestWithBlendFuncExtended : public GLES2DecoderTest {
- public:
- GLES2DecoderTestWithBlendFuncExtended() = default;
- void SetUp() override {
- InitState init;
- init.gl_version = "OpenGL ES 3.0";
- init.has_alpha = true;
- init.has_depth = true;
- init.request_alpha = true;
- init.request_depth = true;
- init.bind_generates_resource = true;
- init.extensions = "GL_EXT_blend_func_extended";
- InitDecoder(init);
- }
-};
-INSTANTIATE_TEST_SUITE_P(Service,
- GLES2DecoderTestWithBlendFuncExtended,
- ::testing::Bool());
-
class GLES2DecoderTestWithCHROMIUMFramebufferMixedSamples
: public GLES2DecoderTest {
public:
@@ -115,26 +64,6 @@
GLES2DecoderTestWithCHROMIUMFramebufferMixedSamples,
::testing::Bool());
-class GLES2DecoderTestWithCHROMIUMRasterTransport : public GLES2DecoderTest {
- public:
- GLES2DecoderTestWithCHROMIUMRasterTransport() = default;
- void SetUp() override {
- InitState init;
- init.gl_version = "OpenGL ES 2.0";
- init.has_alpha = true;
- init.has_depth = true;
- init.request_alpha = true;
- init.request_depth = true;
- init.bind_generates_resource = true;
- init.extensions = "chromium_raster_transport";
- InitDecoder(init);
- }
-};
-
-INSTANTIATE_TEST_SUITE_P(Service,
- GLES2DecoderTestWithCHROMIUMRasterTransport,
- ::testing::Bool());
-
class GLES3DecoderTestWithEXTWindowRectangles : public GLES3DecoderTest {
public:
GLES3DecoderTestWithEXTWindowRectangles() = default;
