diff options
author | jeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 01:26:57 +0000 |
---|---|---|
committer | jeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 01:26:57 +0000 |
commit | 96d500559b422bd0446cb4e4cfff294f7cdbe1bc (patch) | |
tree | 8bd1b7e6ea20fa4bf4e5f65c31e9f4bd48cda3e4 /gpu | |
parent | 2c4d795d0277dd1e224ff2c8a5ce59ef3665fd9e (diff) | |
download | chromium_src-96d500559b422bd0446cb4e4cfff294f7cdbe1bc.zip chromium_src-96d500559b422bd0446cb4e4cfff294f7cdbe1bc.tar.gz chromium_src-96d500559b422bd0446cb4e4cfff294f7cdbe1bc.tar.bz2 |
Fix small incompatibility issues with Visual Studio 2010.
BUG=25628
TEST=Compile all.sln cleanly
Review URL: http://codereview.chromium.org/6512012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc index dbded16..4b738a5 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc @@ -237,8 +237,7 @@ TEST_F(GLES2DecoderWithShaderTest, DrawArraysInvalidCountFails) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); // Try with stride > 8 (vec2 + vec2 byte) - GLfloat f; - DoVertexAttribPointer(1, 2, GL_FLOAT, sizeof(f) * 2 + sizeof(f), 0); + DoVertexAttribPointer(1, 2, GL_FLOAT, sizeof(GLfloat) * 3, 0); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); EXPECT_EQ(GL_NO_ERROR, GetGLError()); |