Chromium Code Reviews| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.h |
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h |
| index 4cab05ccc04032fe3c540d7ecc7472926555b943..c7a4773184bcb930dfb5dddbf585ad9c827fe8fc 100644 |
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h |
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h |
| @@ -65,7 +65,7 @@ class GLES2DecoderManualInitTest : public GLES2DecoderWithShaderTest { |
| GLES2DecoderManualInitTest() {} |
| // Override default setup so nothing gets setup. |
| - void SetUp() override; |
| + void SetUp() override {} |
| void DirtyStateMaskTest(GLuint color_bits, |
| bool depth_mask, |
| @@ -76,18 +76,36 @@ class GLES2DecoderManualInitTest : public GLES2DecoderWithShaderTest { |
| class GLES3DecoderTest : public GLES2DecoderTest { |
| public: |
| - GLES3DecoderTest() {} |
| + GLES3DecoderTest() { shader_language_version_ = 300; } |
| + |
| + // Override default setup so ES3 capabilities are enabled by default. |
| + void SetUp() override; |
| +}; |
| + |
| +class GLES3DecoderWithShaderTest : public GLES2DecoderWithShaderTest { |
| + public: |
| + GLES3DecoderWithShaderTest() { shader_language_version_ = 300; } |
| // Override default setup so ES3 capabilities are enabled by default. |
| void SetUp() override; |
| }; |
| -class GLES3DecoderWithESSL3ShaderTest : public GLES2DecoderWithShaderTestBase { |
| +class GLES3DecoderRGBBackbufferTest : public GLES2DecoderRGBBackbufferTest { |
| public: |
| - GLES3DecoderWithESSL3ShaderTest() { shader_language_version_ = 300; } |
| + 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; } |
| + |
| + // Override default setup so ES3 capabilities are enabled by default. |
|
Zhenyao Mo
2016/10/26 22:01:50
This comment is wrong because you did nothing in t
Kai Ninomiya
2016/10/26 22:10:17
Done.
|
| + void SetUp() override {} |
| +}; |
| + |
| } // namespace gles2 |
| } // namespace gpu |