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

Side by Side Diff: gpu/command_buffer/service/renderbuffer_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 unified diff | Download patch
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/service/renderbuffer_manager.h" 5 #include "gpu/command_buffer/service/renderbuffer_manager.h"
6 6
7 #include <stdint.h>
8
7 #include <set> 9 #include <set>
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
9 #include "gpu/command_buffer/service/feature_info.h" 11 #include "gpu/command_buffer/service/feature_info.h"
10 #include "gpu/command_buffer/service/gpu_service_test.h" 12 #include "gpu/command_buffer/service/gpu_service_test.h"
11 #include "gpu/command_buffer/service/mocks.h" 13 #include "gpu/command_buffer/service/mocks.h"
12 #include "gpu/command_buffer/service/test_helper.h" 14 #include "gpu/command_buffer/service/test_helper.h"
13 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/gl/gl_implementation.h" 16 #include "ui/gl/gl_implementation.h"
15 #include "ui/gl/gl_mock.h" 17 #include "ui/gl/gl_mock.h"
16 18
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 manager_->CreateRenderbuffer(kClient1Id, kService1Id); 186 manager_->CreateRenderbuffer(kClient1Id, kService1Id);
185 Renderbuffer* renderbuffer1 = 187 Renderbuffer* renderbuffer1 =
186 manager_->GetRenderbuffer(kClient1Id); 188 manager_->GetRenderbuffer(kClient1Id);
187 ASSERT_TRUE(renderbuffer1 != NULL); 189 ASSERT_TRUE(renderbuffer1 != NULL);
188 190
189 const GLsizei kSamples = 4; 191 const GLsizei kSamples = 4;
190 const GLenum kFormat = GL_RGBA4; 192 const GLenum kFormat = GL_RGBA4;
191 const GLsizei kWidth = 128; 193 const GLsizei kWidth = 128;
192 const GLsizei kHeight1 = 64; 194 const GLsizei kHeight1 = 64;
193 const GLsizei kHeight2 = 32; 195 const GLsizei kHeight2 = 32;
194 uint32 expected_size_1 = 0; 196 uint32_t expected_size_1 = 0;
195 uint32 expected_size_2 = 0; 197 uint32_t expected_size_2 = 0;
196 manager_->ComputeEstimatedRenderbufferSize( 198 manager_->ComputeEstimatedRenderbufferSize(
197 kWidth, kHeight1, kSamples, kFormat, &expected_size_1); 199 kWidth, kHeight1, kSamples, kFormat, &expected_size_1);
198 manager_->ComputeEstimatedRenderbufferSize( 200 manager_->ComputeEstimatedRenderbufferSize(
199 kWidth, kHeight2, kSamples, kFormat, &expected_size_2); 201 kWidth, kHeight2, kSamples, kFormat, &expected_size_2);
200 EXPECT_MEMORY_ALLOCATION_CHANGE(0, expected_size_1); 202 EXPECT_MEMORY_ALLOCATION_CHANGE(0, expected_size_1);
201 manager_->SetInfo(renderbuffer1, kSamples, kFormat, kWidth, kHeight1); 203 manager_->SetInfo(renderbuffer1, kSamples, kFormat, kWidth, kHeight1);
202 EXPECT_MEMORY_ALLOCATION_CHANGE(expected_size_1, 0); 204 EXPECT_MEMORY_ALLOCATION_CHANGE(expected_size_1, 0);
203 EXPECT_MEMORY_ALLOCATION_CHANGE(0, expected_size_2); 205 EXPECT_MEMORY_ALLOCATION_CHANGE(0, expected_size_2);
204 manager_->SetInfo(renderbuffer1, kSamples, kFormat, kWidth, kHeight2); 206 manager_->SetInfo(renderbuffer1, kSamples, kFormat, kWidth, kHeight2);
205 EXPECT_MEMORY_ALLOCATION_CHANGE(expected_size_2, 0); 207 EXPECT_MEMORY_ALLOCATION_CHANGE(expected_size_2, 0);
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 TEST_F(RenderbufferManagerFormatNonGLESTest, UseUnsizedDepthFormatOnNonGLES) { 331 TEST_F(RenderbufferManagerFormatNonGLESTest, UseUnsizedDepthFormatOnNonGLES) {
330 GLenum impl_format = 332 GLenum impl_format =
331 manager_->InternalRenderbufferFormatToImplFormat(GL_DEPTH_COMPONENT16); 333 manager_->InternalRenderbufferFormatToImplFormat(GL_DEPTH_COMPONENT16);
332 EXPECT_EQ(static_cast<GLenum>(GL_DEPTH_COMPONENT), impl_format); 334 EXPECT_EQ(static_cast<GLenum>(GL_DEPTH_COMPONENT), impl_format);
333 } 335 }
334 336
335 } // namespace gles2 337 } // namespace gles2
336 } // namespace gpu 338 } // namespace gpu
337 339
338 340
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/renderbuffer_manager.cc ('k') | gpu/command_buffer/service/sampler_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698