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

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

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 years, 2 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
OLDNEW
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 #include <GLES3/gl3.h> 8 #include <GLES3/gl3.h>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/strings/string_split.h" 11 #include "base/strings/string_split.h"
12 #include "base/strings/string_util.h"
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 #include "ui/gl/gl_switches.h" 17 #include "ui/gl/gl_switches.h"
17 18
18 #define SHADER_VERSION_300(Src) "#version 300 es\n" #Src 19 #define SHADER_VERSION_300(Src) "#version 300 es\n" #Src
19 20
20 namespace gpu { 21 namespace gpu {
21 22
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 extensions.end()); 105 extensions.end());
105 std::set<std::string> extensions_from_stringi; 106 std::set<std::string> extensions_from_stringi;
106 for (int i = 0; i < num_extensions; ++i) { 107 for (int i = 0; i < num_extensions; ++i) {
107 extensions_from_stringi.insert( 108 extensions_from_stringi.insert(
108 reinterpret_cast<const char*>(glGetStringi(GL_EXTENSIONS, i))); 109 reinterpret_cast<const char*>(glGetStringi(GL_EXTENSIONS, i)));
109 } 110 }
110 EXPECT_EQ(extensions_from_string, extensions_from_stringi); 111 EXPECT_EQ(extensions_from_string, extensions_from_stringi);
111 } 112 }
112 113
113 } // namespace gpu 114 } // namespace gpu
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | gpu/command_buffer/tests/gl_fence_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698