| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <GLES2/gl2.h> | 5 #include <GLES2/gl2.h> |
| 6 #include <GLES2/gl2ext.h> | 6 #include <GLES2/gl2ext.h> |
| 7 #include <GLES2/gl2extchromium.h> | 7 #include <GLES2/gl2extchromium.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| 11 #include "base/bind.h" |
| 11 #include "gpu/command_buffer/common/sync_token.h" | 12 #include "gpu/command_buffer/common/sync_token.h" |
| 12 #include "gpu/command_buffer/service/sync_point_manager.h" | 13 #include "gpu/command_buffer/service/sync_point_manager.h" |
| 13 #include "gpu/command_buffer/tests/gl_manager.h" | 14 #include "gpu/command_buffer/tests/gl_manager.h" |
| 14 #include "gpu/command_buffer/tests/gl_test_utils.h" | 15 #include "gpu/command_buffer/tests/gl_test_utils.h" |
| 15 #include "testing/gmock/include/gmock/gmock.h" | 16 #include "testing/gmock/include/gmock/gmock.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 17 | 18 |
| 18 #define SHADER(Src) #Src | 19 #define SHADER(Src) #Src |
| 19 | 20 |
| 20 namespace gpu { | 21 namespace gpu { |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 gl1_.MakeCurrent(); | 93 gl1_.MakeCurrent(); |
| 93 EXPECT_EQ(0, callback_called); | 94 EXPECT_EQ(0, callback_called); |
| 94 | 95 |
| 95 gl1_.SetCommandsPaused(false); | 96 gl1_.SetCommandsPaused(false); |
| 96 glFinish(); | 97 glFinish(); |
| 97 | 98 |
| 98 EXPECT_EQ(1, callback_called); | 99 EXPECT_EQ(1, callback_called); |
| 99 } | 100 } |
| 100 | 101 |
| 101 } // namespace gpu | 102 } // namespace gpu |
| OLD | NEW |