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

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

Issue 1544283002: Clean up header files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « gpu/command_buffer/service/sync_point_manager.cc ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/tests/gl_chromium_framebuffer_mixed_samples_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_chromium_framebuffer_mixed_samples_unittest.cc b/gpu/command_buffer/tests/gl_chromium_framebuffer_mixed_samples_unittest.cc
index 2297aee15da8a57773b84529523627d293f1c453..aa9a2a4e46575c520d951bab79e76b0e04f86da9 100644
--- a/gpu/command_buffer/tests/gl_chromium_framebuffer_mixed_samples_unittest.cc
+++ b/gpu/command_buffer/tests/gl_chromium_framebuffer_mixed_samples_unittest.cc
@@ -5,6 +5,8 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <GLES2/gl2extchromium.h>
+#include <stdint.h>
+#include <string.h>
#include "base/command_line.h"
#include "gpu/command_buffer/service/gpu_switches.h"
@@ -173,7 +175,7 @@ TEST_F(CHROMIUMFramebufferMixedSamplesTest, CoverageModulation) {
}
static const float kBlue[] = {0.0f, 0.0f, 1.0f, 1.0f};
static const float kGreen[] = {0.0f, 1.0f, 0.0f, 1.0f};
- scoped_ptr<uint8[]> results[3];
+ scoped_ptr<uint8_t[]> results[3];
const GLint kResultSize = kWidth * kHeight * 4;
for (int pass = 0; pass < 3; ++pass) {
@@ -190,7 +192,7 @@ TEST_F(CHROMIUMFramebufferMixedSamplesTest, CoverageModulation) {
glCoverageModulationCHROMIUM(GL_NONE);
}
- results[pass].reset(new uint8[kResultSize]);
+ results[pass].reset(new uint8_t[kResultSize]);
memset(results[pass].get(), GLTestHelper::kCheckClearValue, kResultSize);
glReadPixels(0, 0, kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE,
results[pass].get());
@@ -213,7 +215,7 @@ TEST_F(CHROMIUMFramebufferMixedSamplesTest, MultisampleStencilEffective) {
static const float kBlue[] = {0.0f, 0.0f, 1.0f, 1.0f};
static const float kGreen[] = {0.0f, 1.0f, 0.0f, 1.0f};
- scoped_ptr<uint8[]> results[3];
+ scoped_ptr<uint8_t[]> results[3];
const GLint kResultSize = kWidth * kHeight * 4;
for (int pass = 0; pass < 3; ++pass) {
@@ -228,7 +230,7 @@ TEST_F(CHROMIUMFramebufferMixedSamplesTest, MultisampleStencilEffective) {
glUniform4fv(color_loc_, 1, kBlue);
glDrawArrays(GL_TRIANGLES, 3, 3);
- results[pass].reset(new uint8[kResultSize]);
+ results[pass].reset(new uint8_t[kResultSize]);
memset(results[pass].get(), GLTestHelper::kCheckClearValue, kResultSize);
glReadPixels(0, 0, kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE,
results[pass].get());
« no previous file with comments | « gpu/command_buffer/service/sync_point_manager.cc ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698