diff options
| author | zmo <zmo@chromium.org> | 2015-05-14 12:13:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-14 19:14:10 +0000 |
| commit | 5ee097e78c8c254607c02ee7614bba0abe41d956 (patch) | |
| tree | 2eb60bf5914c1eb0bda2191d523afbc75349fee3 /gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc | |
| parent | 55c68a9a9aecbdc22fd06a99aa93b98881405d88 (diff) | |
| download | chromium_src-5ee097e78c8c254607c02ee7614bba0abe41d956.zip chromium_src-5ee097e78c8c254607c02ee7614bba0abe41d956.tar.gz chromium_src-5ee097e78c8c254607c02ee7614bba0abe41d956.tar.bz2 | |
Add ES3 commands GetVertexAttribI{u}iv to GPU command buffer.
BUG=429053
TEST=gpu_unittests
R=piman@chromium.org
Review URL: https://codereview.chromium.org/1136713003
Cr-Commit-Position: refs/heads/master@{#329892}
Diffstat (limited to 'gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc index 5c242be..2b471b97 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc @@ -456,12 +456,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix2fvImmediate, 0>( }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_FLOAT_MAT3); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterf, 0>( bool /* valid */) { DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); @@ -511,6 +505,32 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::GetVertexAttribfv, 0>( } }; +template <> +void GLES2DecoderTestBase::SpecializedSetup<cmds::GetVertexAttribIiv, 0>( + bool valid) { + DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId); + DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0); + if (valid) { + EXPECT_CALL(*gl_, GetError()) + .WillOnce(Return(GL_NO_ERROR)) + .WillOnce(Return(GL_NO_ERROR)) + .RetiresOnSaturation(); + } +}; + +template <> +void GLES2DecoderTestBase::SpecializedSetup<cmds::GetVertexAttribIuiv, 0>( + bool valid) { + DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId); + DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0); + if (valid) { + EXPECT_CALL(*gl_, GetError()) + .WillOnce(Return(GL_NO_ERROR)) + .WillOnce(Return(GL_NO_ERROR)) + .RetiresOnSaturation(); + } +}; + #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h" |