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

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

Issue 2444813002: Remove unsafe mode to enable es3 api by default for WebGL2 and ES3 context (Closed)
Patch Set: remove runtime flag unsafeES3APIs from blink webgl module 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 "gpu/command_buffer/common/gles2_cmd_format.h" 9 #include "gpu/command_buffer/common/gles2_cmd_format.h"
10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
(...skipping 25 matching lines...) Expand all
36 } 36 }
37 } // namespace 37 } // namespace
38 38
39 class GLES2DecoderTest2 : public GLES2DecoderTestBase { 39 class GLES2DecoderTest2 : public GLES2DecoderTestBase {
40 public: 40 public:
41 GLES2DecoderTest2() { } 41 GLES2DecoderTest2() { }
42 42
43 void TestAcceptedUniform(GLenum uniform_type, 43 void TestAcceptedUniform(GLenum uniform_type,
44 uint32_t accepts_apis, 44 uint32_t accepts_apis,
45 bool es3_enabled) { 45 bool es3_enabled) {
46 decoder_->set_unsafe_es3_apis_enabled(es3_enabled); 46 decoder_->set_es3_apis_enabled(es3_enabled);
47 47
48 SetupShaderForUniform(uniform_type); 48 SetupShaderForUniform(uniform_type);
49 bool valid_uniform = false; 49 bool valid_uniform = false;
50 50
51 EXPECT_CALL(*gl_, Uniform1i(1, _)).Times(AnyNumber()); 51 EXPECT_CALL(*gl_, Uniform1i(1, _)).Times(AnyNumber());
52 EXPECT_CALL(*gl_, Uniform1iv(1, _, _)).Times(AnyNumber()); 52 EXPECT_CALL(*gl_, Uniform1iv(1, _, _)).Times(AnyNumber());
53 EXPECT_CALL(*gl_, Uniform2iv(1, _, _)).Times(AnyNumber()); 53 EXPECT_CALL(*gl_, Uniform2iv(1, _, _)).Times(AnyNumber());
54 EXPECT_CALL(*gl_, Uniform3iv(1, _, _)).Times(AnyNumber()); 54 EXPECT_CALL(*gl_, Uniform3iv(1, _, _)).Times(AnyNumber());
55 EXPECT_CALL(*gl_, Uniform4iv(1, _, _)).Times(AnyNumber()); 55 EXPECT_CALL(*gl_, Uniform4iv(1, _, _)).Times(AnyNumber());
56 EXPECT_CALL(*gl_, Uniform1f(1, _)).Times(AnyNumber()); 56 EXPECT_CALL(*gl_, Uniform1f(1, _)).Times(AnyNumber());
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 TestAcceptedUniform(GL_FLOAT_MAT4x2, Program::kUniformMatrix4x2f, true); 1048 TestAcceptedUniform(GL_FLOAT_MAT4x2, Program::kUniformMatrix4x2f, true);
1049 } 1049 }
1050 1050
1051 TEST_P(GLES2DecoderTest2, AcceptsUniform_GL_FLOAT_MAT4x3) { 1051 TEST_P(GLES2DecoderTest2, AcceptsUniform_GL_FLOAT_MAT4x3) {
1052 TestAcceptedUniform(GL_FLOAT_MAT4x3, Program::kUniformMatrix4x3f, true); 1052 TestAcceptedUniform(GL_FLOAT_MAT4x3, Program::kUniformMatrix4x3f, true);
1053 } 1053 }
1054 1054
1055 } // namespace gles2 1055 } // namespace gles2
1056 } // namespace gpu 1056 } // namespace gpu
1057 1057
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698