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

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

Issue 147593011: Hookup clear_uniforms_before_first_program_use workaround with implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months 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) 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.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "gpu/command_buffer/common/gles2_cmd_format.h" 7 #include "gpu/command_buffer/common/gles2_cmd_format.h"
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
10 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 10 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 Program* program = GetProgram(client_program_id_); 244 Program* program = GetProgram(client_program_id_);
245 ASSERT_TRUE(program != NULL); 245 ASSERT_TRUE(program != NULL);
246 246
247 cmds::AttachShader attach_cmd; 247 cmds::AttachShader attach_cmd;
248 attach_cmd.Init(client_program_id_, kClientVertexShaderId); 248 attach_cmd.Init(client_program_id_, kClientVertexShaderId);
249 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); 249 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));
250 250
251 attach_cmd.Init(client_program_id_, kClientFragmentShaderId); 251 attach_cmd.Init(client_program_id_, kClientFragmentShaderId);
252 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); 252 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));
253 253
254 program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); 254 program->Link(NULL, NULL, NULL, base::Bind(&ShaderCacheCb));
255 }; 255 };
256 256
257 template <> 257 template <>
258 void GLES2DecoderTestBase::SpecializedSetup<cmds::GetVertexAttribfv, 0>( 258 void GLES2DecoderTestBase::SpecializedSetup<cmds::GetVertexAttribfv, 0>(
259 bool valid) { 259 bool valid) {
260 DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId); 260 DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId);
261 DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0); 261 DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0);
262 if (valid) { 262 if (valid) {
263 EXPECT_CALL(*gl_, GetError()) 263 EXPECT_CALL(*gl_, GetError())
264 .WillOnce(Return(GL_NO_ERROR)) 264 .WillOnce(Return(GL_NO_ERROR))
(...skipping 13 matching lines...) Expand all
278 .WillOnce(Return(GL_NO_ERROR)) 278 .WillOnce(Return(GL_NO_ERROR))
279 .RetiresOnSaturation(); 279 .RetiresOnSaturation();
280 } 280 }
281 }; 281 };
282 282
283 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" 283 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"
284 284
285 } // namespace gles2 285 } // namespace gles2
286 } // namespace gpu 286 } // namespace gpu
287 287
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698