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

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

Issue 732423002: Update from chromium https://crrev.com/304586 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
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.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "gpu/command_buffer/common/gles2_cmd_format.h" 9 #include "gpu/command_buffer/common/gles2_cmd_format.h"
10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 .WillOnce(Return(GL_TRUE)) 659 .WillOnce(Return(GL_TRUE))
660 .RetiresOnSaturation(); 660 .RetiresOnSaturation();
661 #endif 661 #endif
662 EXPECT_CALL(*gl_, ClientWaitSync(kGlSync, _, _)) 662 EXPECT_CALL(*gl_, ClientWaitSync(kGlSync, _, _))
663 .WillOnce(Return(GL_ALREADY_SIGNALED)) 663 .WillOnce(Return(GL_ALREADY_SIGNALED))
664 .RetiresOnSaturation(); 664 .RetiresOnSaturation();
665 process_success = query_manager->ProcessPendingQueries(false); 665 process_success = query_manager->ProcessPendingQueries(false);
666 666
667 EXPECT_TRUE(process_success); 667 EXPECT_TRUE(process_success);
668 EXPECT_FALSE(query->pending()); 668 EXPECT_FALSE(query->pending());
669 QuerySync* sync = static_cast<QuerySync*>(shared_memory_address_);
670 EXPECT_EQ(static_cast<GLenum>(0), static_cast<GLenum>(sync->result));
671 669
672 #if DCHECK_IS_ON 670 #if DCHECK_IS_ON
673 EXPECT_CALL(*gl_, IsSync(kGlSync)) 671 EXPECT_CALL(*gl_, IsSync(kGlSync))
674 .WillOnce(Return(GL_TRUE)) 672 .WillOnce(Return(GL_TRUE))
675 .RetiresOnSaturation(); 673 .RetiresOnSaturation();
676 #endif 674 #endif
677 EXPECT_CALL(*gl_, DeleteSync(kGlSync)).Times(1).RetiresOnSaturation(); 675 EXPECT_CALL(*gl_, DeleteSync(kGlSync)).Times(1).RetiresOnSaturation();
678 ResetDecoder(); 676 ResetDecoder();
679 } 677 }
680 678
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderManualInitTest, ::testing::Bool()); 1158 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderManualInitTest, ::testing::Bool());
1161 1159
1162 INSTANTIATE_TEST_CASE_P(Service, 1160 INSTANTIATE_TEST_CASE_P(Service,
1163 GLES2DecoderRGBBackbufferTest, 1161 GLES2DecoderRGBBackbufferTest,
1164 ::testing::Bool()); 1162 ::testing::Bool());
1165 1163
1166 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderDoCommandsTest, ::testing::Bool()); 1164 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderDoCommandsTest, ::testing::Bool());
1167 1165
1168 } // namespace gles2 1166 } // namespace gles2
1169 } // namespace gpu 1167 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/query_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698