summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-26 09:30:50 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-26 17:32:10 +0000
commit51ba3e6902ecd7284d3be51db648127d1be2187f (patch)
tree368c5fca978f6e804d5774b22a9bd2c07eff1fc8 /gpu
parent0d65fb8a06f3ab6e5c309e378e12640a2906af66 (diff)
downloadchromium_src-51ba3e6902ecd7284d3be51db648127d1be2187f.zip
chromium_src-51ba3e6902ecd7284d3be51db648127d1be2187f.tar.gz
chromium_src-51ba3e6902ecd7284d3be51db648127d1be2187f.tar.bz2
Clean up header files.
BUG=138542 TBR=ben@chromium.org NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1544283002 Cr-Commit-Position: refs/heads/master@{#366903}
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/client/query_tracker.h1
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc1
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc1
-rw-r--r--gpu/command_buffer/service/sync_point_manager.cc1
-rw-r--r--gpu/command_buffer/tests/gl_chromium_framebuffer_mixed_samples_unittest.cc10
5 files changed, 10 insertions, 4 deletions
diff --git a/gpu/command_buffer/client/query_tracker.h b/gpu/command_buffer/client/query_tracker.h
index 35d4a47..c4505f1 100644
--- a/gpu/command_buffer/client/query_tracker.h
+++ b/gpu/command_buffer/client/query_tracker.h
@@ -6,6 +6,7 @@
#define GPU_COMMAND_BUFFER_CLIENT_QUERY_TRACKER_H_
#include <GLES2/gl2.h>
+#include <limits.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 7c47ee80..3e60321 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -4,6 +4,7 @@
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
+#include <limits.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
index 5d14251..9fc0a96 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
@@ -4,6 +4,7 @@
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
+#include <limits.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/gpu/command_buffer/service/sync_point_manager.cc b/gpu/command_buffer/service/sync_point_manager.cc
index 435d0b2..97ba993 100644
--- a/gpu/command_buffer/service/sync_point_manager.cc
+++ b/gpu/command_buffer/service/sync_point_manager.cc
@@ -4,6 +4,7 @@
#include "gpu/command_buffer/service/sync_point_manager.h"
+#include <limits.h>
#include <stddef.h>
#include <stdint.h>
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 2297aee..aa9a2a4 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());