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

Side by Side Diff: gpu/command_buffer/client/gles2_implementation_unittest.cc

Issue 9456023: Fix gcc 4.6 warnings in gpu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // Tests for GLES2Implementation. 5 // Tests for GLES2Implementation.
6 6
7 #include "gpu/command_buffer/client/gles2_implementation.h" 7 #include "gpu/command_buffer/client/gles2_implementation.h"
8 8
9 #include <GLES2/gl2ext.h> 9 #include <GLES2/gl2ext.h>
10 #include "gpu/command_buffer/client/client_test_helper.h" 10 #include "gpu/command_buffer/client/client_test_helper.h"
(...skipping 2020 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 kSubImageWidth, 2, kFormat, kType, kPixelStoreUnpackAlignment, 2031 kSubImageWidth, 2, kFormat, kType, kPixelStoreUnpackAlignment,
2032 &sub_2_high_size)); 2032 &sub_2_high_size));
2033 2033
2034 ExpectedMemoryInfo mem1 = GetExpectedMemory(sub_2_high_size); 2034 ExpectedMemoryInfo mem1 = GetExpectedMemory(sub_2_high_size);
2035 ExpectedMemoryInfo mem2 = GetExpectedMemory(sub_2_high_size); 2035 ExpectedMemoryInfo mem2 = GetExpectedMemory(sub_2_high_size);
2036 2036
2037 Cmds expected; 2037 Cmds expected;
2038 expected.pixel_store_i1.Init(GL_UNPACK_ALIGNMENT, kPixelStoreUnpackAlignment); 2038 expected.pixel_store_i1.Init(GL_UNPACK_ALIGNMENT, kPixelStoreUnpackAlignment);
2039 expected.tex_image_2d.Init( 2039 expected.tex_image_2d.Init(
2040 kTarget, kLevel, kFormat, kTextureWidth, kTextureHeight, kBorder, kFormat, 2040 kTarget, kLevel, kFormat, kTextureWidth, kTextureHeight, kBorder, kFormat,
2041 kType, 0, NULL); 2041 kType, 0, 0);
2042 expected.tex_sub_image_2d1.Init(kTarget, kLevel, kSubImageXOffset, 2042 expected.tex_sub_image_2d1.Init(kTarget, kLevel, kSubImageXOffset,
2043 kSubImageYOffset + 2, kSubImageWidth, 2, kFormat, kType, 2043 kSubImageYOffset + 2, kSubImageWidth, 2, kFormat, kType,
2044 mem1.id, mem1.offset, false); 2044 mem1.id, mem1.offset, false);
2045 expected.set_token1.Init(GetNextToken()); 2045 expected.set_token1.Init(GetNextToken());
2046 expected.tex_sub_image_2d2.Init(kTarget, kLevel, kSubImageXOffset, 2046 expected.tex_sub_image_2d2.Init(kTarget, kLevel, kSubImageXOffset,
2047 kSubImageYOffset, kSubImageWidth , 2, kFormat, kType, 2047 kSubImageYOffset, kSubImageWidth , 2, kFormat, kType,
2048 mem2.id, mem2.offset, false); 2048 mem2.id, mem2.offset, false);
2049 expected.set_token2.Init(GetNextToken()); 2049 expected.set_token2.Init(GetNextToken());
2050 2050
2051 gl_->PixelStorei(GL_UNPACK_ALIGNMENT, kPixelStoreUnpackAlignment); 2051 gl_->PixelStorei(GL_UNPACK_ALIGNMENT, kPixelStoreUnpackAlignment);
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
2300 gl_->BufferData(GL_ARRAY_BUFFER, arraysize(buf), buf, GL_DYNAMIC_DRAW); 2300 gl_->BufferData(GL_ARRAY_BUFFER, arraysize(buf), buf, GL_DYNAMIC_DRAW);
2301 EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); 2301 EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
2302 } 2302 }
2303 2303
2304 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h" 2304 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
2305 2305
2306 } // namespace gles2 2306 } // namespace gles2
2307 } // namespace gpu 2307 } // namespace gpu
2308 2308
2309 2309
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698