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

Side by Side Diff: gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc

Issue 11782020: Refactor so chromium only GL extensions require gl2extchromium.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 #ifndef GL_GLEXT_PROTOTYPES 5 #ifndef GL_GLEXT_PROTOTYPES
6 #define GL_GLEXT_PROTOTYPES 6 #define GL_GLEXT_PROTOTYPES
7 #endif 7 #endif
8 8
9 #include <GLES2/gl2.h> 9 #include <GLES2/gl2.h>
10 #include <GLES2/gl2ext.h> 10 #include <GLES2/gl2ext.h>
11 #include <GLES2/gl2extchromium.h>
11 12
12 #include "gpu/command_buffer/tests/gl_manager.h" 13 #include "gpu/command_buffer/tests/gl_manager.h"
13 #include "gpu/command_buffer/tests/gl_test_utils.h" 14 #include "gpu/command_buffer/tests/gl_test_utils.h"
14 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
16 17
17 namespace gpu { 18 namespace gpu {
18 19
19 // A collection of tests that exercise the GL_CHROMIUM_copy_texture extension. 20 // A collection of tests that exercise the GL_CHROMIUM_copy_texture extension.
20 class GLCopyTextureCHROMIUMTest : public testing::Test { 21 class GLCopyTextureCHROMIUMTest : public testing::Test {
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected)); 464 EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected));
464 465
465 EXPECT_TRUE(GL_NO_ERROR == glGetError()); 466 EXPECT_TRUE(GL_NO_ERROR == glGetError());
466 467
467 gl2.MakeCurrent(); 468 gl2.MakeCurrent();
468 gl2.Destroy(); 469 gl2.Destroy();
469 gl_.MakeCurrent(); 470 gl_.MakeCurrent();
470 } 471 }
471 472
472 } // namespace gpu 473 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698