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

Unified Diff: gpu/command_buffer/client/program_info_manager_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
« no previous file with comments | « gpu/command_buffer/client/program_info_manager.cc ('k') | gpu/command_buffer/client/query_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/program_info_manager_unittest.cc
diff --git a/gpu/command_buffer/client/program_info_manager_unittest.cc b/gpu/command_buffer/client/program_info_manager_unittest.cc
index c78fa089d864849dc628c8a3a399b43fff6e52a1..1911b1cfef65387ea016de31ca85167828f8ee73 100644
--- a/gpu/command_buffer/client/program_info_manager_unittest.cc
+++ b/gpu/command_buffer/client/program_info_manager_unittest.cc
@@ -2,14 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include "gpu/command_buffer/client/program_info_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
-uint32 ComputeOffset(const void* start, const void* position) {
- return static_cast<const uint8*>(position) -
- static_cast<const uint8*>(start);
+uint32_t ComputeOffset(const void* start, const void* position) {
+ return static_cast<const uint8_t*>(position) -
+ static_cast<const uint8_t*>(start);
}
const GLuint kClientProgramId = 321;
@@ -171,7 +174,7 @@ TEST_F(ProgramInfoManagerTest, UpdateES2) {
SetupProgramES2Data(&data);
const std::string kNames[] = { data.uniform_name0, data.uniform_name1 };
const int32_t* kLocs[] = { data.uniform_loc0, data.uniform_loc1 };
- std::vector<int8> result(sizeof(data));
+ std::vector<int8_t> result(sizeof(data));
memcpy(&result[0], &data, sizeof(data));
EXPECT_FALSE(program_->IsCached(ProgramInfoManager::kES2));
program_->UpdateES2(result);
@@ -217,7 +220,7 @@ TEST_F(ProgramInfoManagerTest, UpdateES3UniformBlocks) {
SetupUniformBlocksData(&data);
const std::string kName[] = { data.name0, data.name1 };
const uint32_t* kIndices[] = { data.indices0, data.indices1 };
- std::vector<int8> result(sizeof(data));
+ std::vector<int8_t> result(sizeof(data));
memcpy(&result[0], &data, sizeof(data));
EXPECT_FALSE(program_->IsCached(ProgramInfoManager::kES3UniformBlocks));
program_->UpdateES3UniformBlocks(result);
@@ -258,7 +261,7 @@ TEST_F(ProgramInfoManagerTest, UpdateES3TransformFeedbackVaryings) {
TransformFeedbackVaryingsData data;
SetupTransformFeedbackVaryingsData(&data);
const std::string kName[] = { data.name0, data.name1 };
- std::vector<int8> result(sizeof(data));
+ std::vector<int8_t> result(sizeof(data));
memcpy(&result[0], &data, sizeof(data));
EXPECT_FALSE(program_->IsCached(
ProgramInfoManager::kES3TransformFeedbackVaryings));
@@ -296,7 +299,7 @@ TEST_F(ProgramInfoManagerTest, UpdateES3TransformFeedbackVaryings) {
TEST_F(ProgramInfoManagerTest, GetUniformBlockIndexCached) {
UniformBlocksData data;
SetupUniformBlocksData(&data);
- std::vector<int8> result(sizeof(data));
+ std::vector<int8_t> result(sizeof(data));
memcpy(&result[0], &data, sizeof(data));
program_->UpdateES3UniformBlocks(result);
@@ -311,7 +314,7 @@ TEST_F(ProgramInfoManagerTest, GetUniformBlockIndexCached) {
TEST_F(ProgramInfoManagerTest, GetActiveUniformBlockNameCached) {
UniformBlocksData data;
SetupUniformBlocksData(&data);
- std::vector<int8> result(sizeof(data));
+ std::vector<int8_t> result(sizeof(data));
memcpy(&result[0], &data, sizeof(data));
program_->UpdateES3UniformBlocks(result);
@@ -349,7 +352,7 @@ TEST_F(ProgramInfoManagerTest, GetActiveUniformBlockNameCached) {
TEST_F(ProgramInfoManagerTest, GetActiveUniformBlockivCached) {
UniformBlocksData data;
SetupUniformBlocksData(&data);
- std::vector<int8> result(sizeof(data));
+ std::vector<int8_t> result(sizeof(data));
memcpy(&result[0], &data, sizeof(data));
program_->UpdateES3UniformBlocks(result);
const char* kName[] = { data.name0, data.name1 };
@@ -398,7 +401,7 @@ TEST_F(ProgramInfoManagerTest, GetActiveUniformBlockivCached) {
TEST_F(ProgramInfoManagerTest, GetTransformFeedbackVaryingCached) {
TransformFeedbackVaryingsData data;
SetupTransformFeedbackVaryingsData(&data);
- std::vector<int8> result(sizeof(data));
+ std::vector<int8_t> result(sizeof(data));
memcpy(&result[0], &data, sizeof(data));
program_->UpdateES3TransformFeedbackVaryings(result);
const char* kName[] = { data.name0, data.name1 };
@@ -422,7 +425,7 @@ TEST_F(ProgramInfoManagerTest, GetTransformFeedbackVaryingCached) {
TEST_F(ProgramInfoManagerTest, GetUniformIndices) {
ProgramES2Data data;
SetupProgramES2Data(&data);
- std::vector<int8> result(sizeof(data));
+ std::vector<int8_t> result(sizeof(data));
memcpy(&result[0], &data, sizeof(data));
program_->UpdateES2(result);
@@ -480,7 +483,7 @@ TEST_F(ProgramInfoManagerTest, GetActiveUniformsivCached) {
// ES3 only parameters.
UniformsES3Data data_es3;
SetupUniformsES3Data(&data_es3);
- std::vector<int8> result(sizeof(data_es3));
+ std::vector<int8_t> result(sizeof(data_es3));
memcpy(&result[0], &data_es3, sizeof(data_es3));
EXPECT_FALSE(program_->IsCached(ProgramInfoManager::kES3Uniformsiv));
program_->UpdateES3Uniformsiv(result);
« no previous file with comments | « gpu/command_buffer/client/program_info_manager.cc ('k') | gpu/command_buffer/client/query_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698