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

Unified Diff: gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc b/gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc
index e465cb3e64bc78c6ce88d8441967eccfa8c5c7ac..067f0af9943b71c974831f624b90648b3dc5ce07 100644
--- a/gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc
+++ b/gpu/command_buffer/tests/gl_cube_map_texture_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <GLES2/gl2.h>
+#include <stdint.h>
#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
@@ -59,7 +60,7 @@ class GLCubeMapTextureTest : public testing::TestWithParam<GLenum> {
}
GLManager gl_;
- uint8 pixels_[256 * 4];
+ uint8_t pixels_[256 * 4];
const int width_ = 16;
GLuint texture_;
GLuint framebuffer_id_;
@@ -138,7 +139,7 @@ TEST_P(GLCubeMapTextureTest, ReadPixelsFromIncompleteCubeTexture) {
// by (POSITIVE_X, NEGATIVE_Z) order only once. If users call texImage2D again
// after defining all faces, glReadPixels fails.
GLsizei size = width_ * width_ * 4;
- scoped_ptr<uint8[]> pixels(new uint8[size]);
+ scoped_ptr<uint8_t[]> pixels(new uint8_t[size]);
glReadPixels(0, 0, width_, width_, GL_RGBA, GL_UNSIGNED_BYTE, pixels.get());
#else
// Without force_cube_complete workaround,
« no previous file with comments | « gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc ('k') | gpu/command_buffer/tests/gl_depth_texture_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698