| OLD | NEW |
| 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_unittest_base.h" | 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1189 | 1189 |
| 1190 EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(service_id))) | 1190 EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(service_id))) |
| 1191 .Times(1) | 1191 .Times(1) |
| 1192 .RetiresOnSaturation(); | 1192 .RetiresOnSaturation(); |
| 1193 | 1193 |
| 1194 GenHelper<cmds::DeleteTexturesImmediate>(client_id); | 1194 GenHelper<cmds::DeleteTexturesImmediate>(client_id); |
| 1195 } | 1195 } |
| 1196 } | 1196 } |
| 1197 | 1197 |
| 1198 void GLES2DecoderTestBase::DoBindTexImage2DCHROMIUM(GLenum target, | 1198 void GLES2DecoderTestBase::DoBindTexImage2DCHROMIUM(GLenum target, |
| 1199 GLint image_id) { | 1199 GLint image_id, |
| 1200 GLint fence_id) { |
| 1200 cmds::BindTexImage2DCHROMIUM bind_tex_image_2d_cmd; | 1201 cmds::BindTexImage2DCHROMIUM bind_tex_image_2d_cmd; |
| 1201 bind_tex_image_2d_cmd.Init(target, image_id); | 1202 bind_tex_image_2d_cmd.Init(target, image_id, fence_id); |
| 1202 EXPECT_CALL(*gl_, GetError()) | 1203 EXPECT_CALL(*gl_, GetError()) |
| 1203 .WillOnce(Return(GL_NO_ERROR)) | 1204 .WillOnce(Return(GL_NO_ERROR)) |
| 1204 .WillOnce(Return(GL_NO_ERROR)) | 1205 .WillOnce(Return(GL_NO_ERROR)) |
| 1205 .RetiresOnSaturation(); | 1206 .RetiresOnSaturation(); |
| 1206 EXPECT_EQ(error::kNoError, ExecuteCmd(bind_tex_image_2d_cmd)); | 1207 EXPECT_EQ(error::kNoError, ExecuteCmd(bind_tex_image_2d_cmd)); |
| 1207 EXPECT_EQ(GL_NO_ERROR, GetGLError()); | 1208 EXPECT_EQ(GL_NO_ERROR, GetGLError()); |
| 1208 } | 1209 } |
| 1209 | 1210 |
| 1210 void GLES2DecoderTestBase::DoTexImage2D(GLenum target, | 1211 void GLES2DecoderTestBase::DoTexImage2D(GLenum target, |
| 1211 GLint level, | 1212 GLint level, |
| (...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2113 SetupDefaultProgram(); | 2114 SetupDefaultProgram(); |
| 2114 } | 2115 } |
| 2115 | 2116 |
| 2116 // Include the auto-generated part of this file. We split this because it means | 2117 // Include the auto-generated part of this file. We split this because it means |
| 2117 // we can easily edit the non-auto generated parts right here in this file | 2118 // we can easily edit the non-auto generated parts right here in this file |
| 2118 // instead of having to edit some template or the code generator. | 2119 // instead of having to edit some template or the code generator. |
| 2119 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" | 2120 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" |
| 2120 | 2121 |
| 2121 } // namespace gles2 | 2122 } // namespace gles2 |
| 2122 } // namespace gpu | 2123 } // namespace gpu |
| OLD | NEW |