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

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

Issue 2523663002: Remove remaining base dependencies from base/numerics (Closed)
Patch Set: fix gcc compile Created 4 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
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils.h ('k') | ui/display/util/edid_parser_fuzzer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/tests/gl_test_utils.h" 5 #include "gpu/command_buffer/tests/gl_test_utils.h"
6 6
7 #include <GLES2/gl2extchromium.h> 7 #include <GLES2/gl2extchromium.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <stdio.h> 9 #include <stdio.h>
10 10
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 13
14 #include "base/logging.h"
14 #include "base/strings/stringize_macros.h" 15 #include "base/strings/stringize_macros.h"
15 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
16 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/gfx/geometry/size.h" 18 #include "ui/gfx/geometry/size.h"
18 19
19 // GCC requires these declarations, but MSVC requires they not be present. 20 // GCC requires these declarations, but MSVC requires they not be present.
20 #ifndef COMPILER_MSVC 21 #ifndef COMPILER_MSVC
21 const uint8_t GLTestHelper::kCheckClearValue; 22 const uint8_t GLTestHelper::kCheckClearValue;
22 #endif 23 #endif
23 24
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 ASSERT_NE(vertex_buffer, 0u); 352 ASSERT_NE(vertex_buffer, 0u);
352 glUniform1i(sampler_location, 0); 353 glUniform1i(sampler_location, 0);
353 354
354 glDrawArrays(GL_TRIANGLES, 0, 6); 355 glDrawArrays(GL_TRIANGLES, 0, 6);
355 356
356 glDeleteShader(vertex_shader); 357 glDeleteShader(vertex_shader);
357 glDeleteShader(fragment_shader); 358 glDeleteShader(fragment_shader);
358 glDeleteProgram(program); 359 glDeleteProgram(program);
359 glDeleteBuffers(1, &vertex_buffer); 360 glDeleteBuffers(1, &vertex_buffer);
360 } 361 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils.h ('k') | ui/display/util/edid_parser_fuzzer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698