Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc

Issue 2471853002: remove 'unsafe' from ES3 apis in gpu process (Closed)
Patch Set: forgot to save file Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "gpu/command_buffer/common/gles2_cmd_format.h" 8 #include "gpu/command_buffer/common/gles2_cmd_format.h"
9 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 9 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
(...skipping 21 matching lines...) Expand all
32 class GLES2DecoderTest1 : public GLES2DecoderTestBase { 32 class GLES2DecoderTest1 : public GLES2DecoderTestBase {
33 public: 33 public:
34 GLES2DecoderTest1() { } 34 GLES2DecoderTest1() { }
35 }; 35 };
36 36
37 class GLES3DecoderTest1 : public GLES2DecoderTest1 { 37 class GLES3DecoderTest1 : public GLES2DecoderTest1 {
38 public: 38 public:
39 GLES3DecoderTest1() { shader_language_version_ = 300; } 39 GLES3DecoderTest1() { shader_language_version_ = 300; }
40 protected: 40 protected:
41 void SetUp() override { 41 void SetUp() override {
42 base::CommandLine command_line(0, nullptr);
43 command_line.AppendSwitch(switches::kEnableUnsafeES3APIs);
44 InitState init; 42 InitState init;
45 init.gl_version = "OpenGL ES 3.0"; 43 init.gl_version = "OpenGL ES 3.0";
46 init.bind_generates_resource = true; 44 init.bind_generates_resource = true;
47 init.context_type = CONTEXT_TYPE_OPENGLES3; 45 init.context_type = CONTEXT_TYPE_OPENGLES3;
48 InitDecoderWithCommandLine(init, &command_line); 46 InitDecoder(init);
49 } 47 }
50 }; 48 };
51 49
52 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest1, ::testing::Bool()); 50 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest1, ::testing::Bool());
53 INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderTest1, ::testing::Bool()); 51 INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderTest1, ::testing::Bool());
54 52
55 template <> 53 template <>
56 void GLES2DecoderTestBase::SpecializedSetup<cmds::GenerateMipmap, 0>( 54 void GLES2DecoderTestBase::SpecializedSetup<cmds::GenerateMipmap, 0>(
57 bool valid) { 55 bool valid) {
58 DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); 56 DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 .Times(1) 201 .Times(1)
204 .RetiresOnSaturation(); 202 .RetiresOnSaturation();
205 } 203 }
206 } 204 }
207 205
208 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" 206 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"
209 207
210 } // namespace gles2 208 } // namespace gles2
211 } // namespace gpu 209 } // namespace gpu
212 210
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698