Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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.h" | 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 InitState init; | 136 InitState init; |
| 137 init.gl_version = "opengl es 3.1"; | 137 init.gl_version = "opengl es 3.1"; |
| 138 init.has_alpha = true; | 138 init.has_alpha = true; |
| 139 init.has_depth = true; | 139 init.has_depth = true; |
| 140 init.request_alpha = true; | 140 init.request_alpha = true; |
| 141 init.request_depth = true; | 141 init.request_depth = true; |
| 142 init.bind_generates_resource = true; | 142 init.bind_generates_resource = true; |
| 143 init.extensions = "GL_NV_path_rendering"; | 143 init.extensions = "GL_NV_path_rendering"; |
| 144 base::CommandLine command_line(0, NULL); | 144 base::CommandLine command_line(0, NULL); |
| 145 command_line.AppendSwitch(switches::kEnableGLPathRendering); | 145 command_line.AppendSwitch(switches::kEnableGLPathRendering); |
| 146 command_line.AppendSwitch(switches::kEnableUnsafeES3APIs); | |
|
Zhenyao Mo
2015/09/14 21:12:06
No, don't append this. ES2 is still our shipping c
qiankun
2015/09/15 09:14:58
Done.
| |
| 146 InitDecoderWithCommandLine(init, &command_line); | 147 InitDecoderWithCommandLine(init, &command_line); |
| 147 | 148 |
| 148 EXPECT_CALL(*gl_, GenPathsNV(1)) | 149 EXPECT_CALL(*gl_, GenPathsNV(1)) |
| 149 .WillOnce(Return(kServicePathId)) | 150 .WillOnce(Return(kServicePathId)) |
| 150 .RetiresOnSaturation(); | 151 .RetiresOnSaturation(); |
| 151 cmds::GenPathsCHROMIUM cmd; | 152 cmds::GenPathsCHROMIUM cmd; |
| 152 cmd.Init(client_path_id_, 1); | 153 cmd.Init(client_path_id_, 1); |
| 153 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); | 154 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); |
| 154 } | 155 } |
| 155 | 156 |
| (...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 991 TestPathCommandsCHROMIUMCoordTypes<GLshort>(); | 992 TestPathCommandsCHROMIUMCoordTypes<GLshort>(); |
| 992 TestPathCommandsCHROMIUMCoordTypes<GLushort>(); | 993 TestPathCommandsCHROMIUMCoordTypes<GLushort>(); |
| 993 TestPathCommandsCHROMIUMCoordTypes<GLfloat>(); | 994 TestPathCommandsCHROMIUMCoordTypes<GLfloat>(); |
| 994 } | 995 } |
| 995 | 996 |
| 996 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autog en.h" | 997 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autog en.h" |
| 997 | 998 |
| 998 } // namespace gles2 | 999 } // namespace gles2 |
| 999 } // namespace gpu | 1000 } // namespace gpu |
| 1000 | 1001 |
| OLD | NEW |