| 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 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1205 | 1205 |
| 1206 EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(service_id))) | 1206 EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(service_id))) |
| 1207 .Times(1) | 1207 .Times(1) |
| 1208 .RetiresOnSaturation(); | 1208 .RetiresOnSaturation(); |
| 1209 | 1209 |
| 1210 GenHelper<cmds::DeleteTexturesImmediate>(client_id); | 1210 GenHelper<cmds::DeleteTexturesImmediate>(client_id); |
| 1211 } | 1211 } |
| 1212 } | 1212 } |
| 1213 | 1213 |
| 1214 void GLES2DecoderTestBase::DoBindTexImage2DCHROMIUM(GLenum target, | 1214 void GLES2DecoderTestBase::DoBindTexImage2DCHROMIUM(GLenum target, |
| 1215 GLint image_id) { | 1215 GLint image_id, |
| 1216 GLint fence_id) { |
| 1216 cmds::BindTexImage2DCHROMIUM bind_tex_image_2d_cmd; | 1217 cmds::BindTexImage2DCHROMIUM bind_tex_image_2d_cmd; |
| 1217 bind_tex_image_2d_cmd.Init(target, image_id); | 1218 bind_tex_image_2d_cmd.Init(target, image_id, fence_id); |
| 1218 EXPECT_CALL(*gl_, GetError()) | 1219 EXPECT_CALL(*gl_, GetError()) |
| 1219 .WillOnce(Return(GL_NO_ERROR)) | 1220 .WillOnce(Return(GL_NO_ERROR)) |
| 1220 .WillOnce(Return(GL_NO_ERROR)) | 1221 .WillOnce(Return(GL_NO_ERROR)) |
| 1221 .RetiresOnSaturation(); | 1222 .RetiresOnSaturation(); |
| 1222 EXPECT_EQ(error::kNoError, ExecuteCmd(bind_tex_image_2d_cmd)); | 1223 EXPECT_EQ(error::kNoError, ExecuteCmd(bind_tex_image_2d_cmd)); |
| 1223 EXPECT_EQ(GL_NO_ERROR, GetGLError()); | 1224 EXPECT_EQ(GL_NO_ERROR, GetGLError()); |
| 1224 } | 1225 } |
| 1225 | 1226 |
| 1226 void GLES2DecoderTestBase::DoTexImage2D(GLenum target, | 1227 void GLES2DecoderTestBase::DoTexImage2D(GLenum target, |
| 1227 GLint level, | 1228 GLint level, |
| (...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2129 SetupDefaultProgram(); | 2130 SetupDefaultProgram(); |
| 2130 } | 2131 } |
| 2131 | 2132 |
| 2132 // Include the auto-generated part of this file. We split this because it means | 2133 // Include the auto-generated part of this file. We split this because it means |
| 2133 // we can easily edit the non-auto generated parts right here in this file | 2134 // we can easily edit the non-auto generated parts right here in this file |
| 2134 // instead of having to edit some template or the code generator. | 2135 // instead of having to edit some template or the code generator. |
| 2135 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" | 2136 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" |
| 2136 | 2137 |
| 2137 } // namespace gles2 | 2138 } // namespace gles2 |
| 2138 } // namespace gpu | 2139 } // namespace gpu |
| OLD | NEW |