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

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

Issue 10808041: On desktop GL, don't disable vertex attribute 0 when restoring state, or nothing will be drawn duri… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 .RetiresOnSaturation(); 1318 .RetiresOnSaturation();
1319 EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, 0)) 1319 EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, 0))
1320 .Times(1) 1320 .Times(1)
1321 .RetiresOnSaturation(); 1321 .RetiresOnSaturation();
1322 EXPECT_CALL(*gl_, VertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, NULL)) 1322 EXPECT_CALL(*gl_, VertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, NULL))
1323 .Times(1) 1323 .Times(1)
1324 .RetiresOnSaturation(); 1324 .RetiresOnSaturation();
1325 EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, buffer_id)) 1325 EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, buffer_id))
1326 .Times(1) 1326 .Times(1)
1327 .RetiresOnSaturation(); 1327 .RetiresOnSaturation();
1328
1329 EXPECT_CALL(*gl_, DisableVertexAttribArray(0))
1330 .Times(1)
1331 .RetiresOnSaturation();
1332 } 1328 }
1333 } 1329 }
1334 1330
1335 void GLES2DecoderTestBase::AddExpectationsForSimulatedAttrib0( 1331 void GLES2DecoderTestBase::AddExpectationsForSimulatedAttrib0(
1336 GLsizei num_vertices, GLuint buffer_id) { 1332 GLsizei num_vertices, GLuint buffer_id) {
1337 AddExpectationsForSimulatedAttrib0WithError( 1333 AddExpectationsForSimulatedAttrib0WithError(
1338 num_vertices, buffer_id, GL_NO_ERROR); 1334 num_vertices, buffer_id, GL_NO_ERROR);
1339 } 1335 }
1340 1336
1341 void GLES2DecoderWithShaderTestBase::SetUp() { 1337 void GLES2DecoderWithShaderTestBase::SetUp() {
1342 GLES2DecoderTestBase::SetUp(); 1338 GLES2DecoderTestBase::SetUp();
1343 SetupDefaultProgram(); 1339 SetupDefaultProgram();
1344 } 1340 }
1345 1341
1346 } // namespace gles2 1342 } // namespace gles2
1347 } // namespace gpu 1343 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698