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

Side by Side Diff: gpu/command_buffer/tests/gl_query_unittests.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 #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 8
8 #include "base/threading/platform_thread.h" 9 #include "base/threading/platform_thread.h"
9 #include "gpu/command_buffer/tests/gl_manager.h" 10 #include "gpu/command_buffer/tests/gl_manager.h"
10 #include "gpu/command_buffer/tests/gl_test_utils.h" 11 #include "gpu/command_buffer/tests/gl_test_utils.h"
11 #include "testing/gmock/include/gmock/gmock.h" 12 #include "testing/gmock/include/gmock/gmock.h"
12 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
13 14
14 namespace gpu { 15 namespace gpu {
15 16
16 class QueryTest : public testing::Test { 17 class QueryTest : public testing::Test {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &available); 94 glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
94 EXPECT_TRUE(available); 95 EXPECT_TRUE(available);
95 glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_EXT, &query_result); 96 glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_EXT, &query_result);
96 97
97 EXPECT_LE(query_result, kTimePrecisionMicroseconds); 98 EXPECT_LE(query_result, kTimePrecisionMicroseconds);
98 } 99 }
99 100
100 } // namespace gpu 101 } // namespace gpu
101 102
102 103
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698