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

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

Issue 6028005: Make CopyTexImage2D and CopyTexSubImage2D fail if... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years 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 | Annotate | Revision Log
OLDNEW
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.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "gpu/command_buffer/common/gl_mock.h" 7 #include "gpu/command_buffer/common/gl_mock.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_base.h" 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 bool /* valid */) { 173 bool /* valid */) {
174 SetupShaderForUniform(); 174 SetupShaderForUniform();
175 }; 175 };
176 176
177 template <> 177 template <>
178 void GLES2DecoderTestBase::SpecializedSetup<RenderbufferStorage, 0>( 178 void GLES2DecoderTestBase::SpecializedSetup<RenderbufferStorage, 0>(
179 bool valid) { 179 bool valid) {
180 DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_, 180 DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,
181 kServiceRenderbufferId); 181 kServiceRenderbufferId);
182 if (valid) { 182 if (valid) {
183 EXPECT_CALL(*gl_, GetError())
184 .WillOnce(Return(GL_NO_ERROR))
185 .RetiresOnSaturation();
183 EXPECT_CALL(*gl_, 186 EXPECT_CALL(*gl_,
184 RenderbufferStorageEXT(GL_RENDERBUFFER, _, 3, 4)) 187 RenderbufferStorageEXT(GL_RENDERBUFFER, _, 3, 4))
185 .Times(1) 188 .Times(1)
186 .RetiresOnSaturation(); 189 .RetiresOnSaturation();
190 EXPECT_CALL(*gl_, GetError())
191 .WillOnce(Return(GL_NO_ERROR))
192 .RetiresOnSaturation();
187 } 193 }
188 }; 194 };
189 195
190 template <> 196 template <>
191 void GLES2DecoderTestBase::SpecializedSetup<TexParameterf, 0>( 197 void GLES2DecoderTestBase::SpecializedSetup<TexParameterf, 0>(
192 bool /* valid */) { 198 bool /* valid */) {
193 DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); 199 DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
194 }; 200 };
195 201
196 template <> 202 template <>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 .WillOnce(Return(GL_NO_ERROR)) 239 .WillOnce(Return(GL_NO_ERROR))
234 .RetiresOnSaturation(); 240 .RetiresOnSaturation();
235 } 241 }
236 }; 242 };
237 243
238 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h" 244 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h"
239 245
240 } // namespace gles2 246 } // namespace gles2
241 } // namespace gpu 247 } // namespace gpu
242 248
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698