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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "gpu/command_buffer/common/gles2_cmd_format.h" 10 #include "gpu/command_buffer/common/gles2_cmd_format.h"
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 } 565 }
566 } 566 }
567 } 567 }
568 }; 568 };
569 569
570 class GLES3DecoderTest2 : public GLES2DecoderTest2 { 570 class GLES3DecoderTest2 : public GLES2DecoderTest2 {
571 public: 571 public:
572 GLES3DecoderTest2() { shader_language_version_ = 300; } 572 GLES3DecoderTest2() { shader_language_version_ = 300; }
573 protected: 573 protected:
574 void SetUp() override { 574 void SetUp() override {
575 base::CommandLine command_line(0, nullptr);
576 command_line.AppendSwitch(switches::kEnableUnsafeES3APIs);
577 InitState init; 575 InitState init;
578 init.gl_version = "OpenGL ES 3.0"; 576 init.gl_version = "OpenGL ES 3.0";
579 init.bind_generates_resource = true; 577 init.bind_generates_resource = true;
580 init.context_type = CONTEXT_TYPE_OPENGLES3; 578 init.context_type = CONTEXT_TYPE_OPENGLES3;
581 InitDecoderWithCommandLine(init, &command_line); 579 InitDecoder(init);
582 } 580 }
583 }; 581 };
584 582
585 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest2, ::testing::Bool()); 583 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest2, ::testing::Bool());
586 INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderTest2, ::testing::Bool()); 584 INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderTest2, ::testing::Bool());
587 585
588 template <> 586 template <>
589 void GLES2DecoderTestBase::SpecializedSetup<cmds::GetProgramInfoLog, 0>( 587 void GLES2DecoderTestBase::SpecializedSetup<cmds::GetProgramInfoLog, 0>(
590 bool /* valid */) { 588 bool /* valid */) {
591 const GLuint kClientVertexShaderId = 5001; 589 const GLuint kClientVertexShaderId = 5001;
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 TestAcceptedUniform(GL_FLOAT_MAT4x2, Program::kUniformMatrix4x2f, true); 1061 TestAcceptedUniform(GL_FLOAT_MAT4x2, Program::kUniformMatrix4x2f, true);
1064 } 1062 }
1065 1063
1066 TEST_P(GLES3DecoderTest2, AcceptsUniform_GL_FLOAT_MAT4x3) { 1064 TEST_P(GLES3DecoderTest2, AcceptsUniform_GL_FLOAT_MAT4x3) {
1067 TestAcceptedUniform(GL_FLOAT_MAT4x3, Program::kUniformMatrix4x3f, true); 1065 TestAcceptedUniform(GL_FLOAT_MAT4x3, Program::kUniformMatrix4x3f, true);
1068 } 1066 }
1069 1067
1070 } // namespace gles2 1068 } // namespace gles2
1071 } // namespace gpu 1069 } // namespace gpu
1072 1070
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698