summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-23 23:04:40 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-23 23:04:40 +0000
commit9c0d07657c9c857b2121c23186ff95a3458d4add (patch)
tree6c745f2d42797da979173a6bd6d43096fe73c618
parent35470ccbbe7550488de8025cf012aa79442db9d8 (diff)
downloadchromium_src-9c0d07657c9c857b2121c23186ff95a3458d4add.zip
chromium_src-9c0d07657c9c857b2121c23186ff95a3458d4add.tar.gz
chromium_src-9c0d07657c9c857b2121c23186ff95a3458d4add.tar.bz2
Fix gcc 4.6 warnings in gpu.
The 10th param is an unsigned int. BUG=None Review URL: http://codereview.chromium.org/9456023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123361 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/command_buffer/client/gles2_implementation_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index b018a50..9bfc9ce 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -2038,7 +2038,7 @@ TEST_F(GLES2ImplementationTest, TexSubImage2DFlipY) {
expected.pixel_store_i1.Init(GL_UNPACK_ALIGNMENT, kPixelStoreUnpackAlignment);
expected.tex_image_2d.Init(
kTarget, kLevel, kFormat, kTextureWidth, kTextureHeight, kBorder, kFormat,
- kType, 0, NULL);
+ kType, 0, 0);
expected.tex_sub_image_2d1.Init(kTarget, kLevel, kSubImageXOffset,
kSubImageYOffset + 2, kSubImageWidth, 2, kFormat, kType,
mem1.id, mem1.offset, false);