| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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_unittest_base.h" | 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" |
| 6 #include "app/gfx/gl/gl_mock.h" | 6 #include "app/gfx/gl/gl_mock.h" |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.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/cmd_buffer_engine.h" | 10 #include "gpu/command_buffer/service/cmd_buffer_engine.h" |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 // All Tests should have read all their GLErrors before getting here. | 194 // All Tests should have read all their GLErrors before getting here. |
| 195 EXPECT_EQ(GL_NO_ERROR, GetGLError()); | 195 EXPECT_EQ(GL_NO_ERROR, GetGLError()); |
| 196 EXPECT_CALL(*gl_, DeleteTextures(1, _)) | 196 EXPECT_CALL(*gl_, DeleteTextures(1, _)) |
| 197 .Times(2) | 197 .Times(2) |
| 198 .RetiresOnSaturation(); | 198 .RetiresOnSaturation(); |
| 199 EXPECT_CALL(*gl_, DeleteBuffersARB(1, _)) | 199 EXPECT_CALL(*gl_, DeleteBuffersARB(1, _)) |
| 200 .Times(1) | 200 .Times(1) |
| 201 .RetiresOnSaturation(); | 201 .RetiresOnSaturation(); |
| 202 decoder_->Destroy(); | 202 decoder_->Destroy(); |
| 203 decoder_.reset(); | 203 decoder_.reset(); |
| 204 group_.Destroy(false); |
| 204 engine_.reset(); | 205 engine_.reset(); |
| 205 ::gfx::GLInterface::SetGLInterface(NULL); | 206 ::gfx::GLInterface::SetGLInterface(NULL); |
| 206 gl_.reset(); | 207 gl_.reset(); |
| 207 } | 208 } |
| 208 | 209 |
| 209 GLint GLES2DecoderTestBase::GetGLError() { | 210 GLint GLES2DecoderTestBase::GetGLError() { |
| 210 EXPECT_CALL(*gl_, GetError()) | 211 EXPECT_CALL(*gl_, GetError()) |
| 211 .WillOnce(Return(GL_NO_ERROR)) | 212 .WillOnce(Return(GL_NO_ERROR)) |
| 212 .RetiresOnSaturation(); | 213 .RetiresOnSaturation(); |
| 213 GetError cmd; | 214 GetError cmd; |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 const char* GLES2DecoderWithShaderTestBase::kAttrib2Name = "attrib2"; | 667 const char* GLES2DecoderWithShaderTestBase::kAttrib2Name = "attrib2"; |
| 667 const char* GLES2DecoderWithShaderTestBase::kAttrib3Name = "attrib3"; | 668 const char* GLES2DecoderWithShaderTestBase::kAttrib3Name = "attrib3"; |
| 668 const char* GLES2DecoderWithShaderTestBase::kUniform1Name = "uniform1"; | 669 const char* GLES2DecoderWithShaderTestBase::kUniform1Name = "uniform1"; |
| 669 const char* GLES2DecoderWithShaderTestBase::kUniform2Name = "uniform2[0]"; | 670 const char* GLES2DecoderWithShaderTestBase::kUniform2Name = "uniform2[0]"; |
| 670 const char* GLES2DecoderWithShaderTestBase::kUniform3Name = "uniform3[0]"; | 671 const char* GLES2DecoderWithShaderTestBase::kUniform3Name = "uniform3[0]"; |
| 671 | 672 |
| 672 } // namespace gles2 | 673 } // namespace gles2 |
| 673 } // namespace gpu | 674 } // namespace gpu |
| 674 | 675 |
| 675 | 676 |
| OLD | NEW |