diff options
| author | kloveless@chromium.org <kloveless@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 13:05:42 +0000 |
|---|---|---|
| committer | kloveless@chromium.org <kloveless@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 13:05:42 +0000 |
| commit | 69a517c9d7ea551cf3d430bc0541a41351d25b15 (patch) | |
| tree | f09351af20153658210ca3e4d7ec54a56b471679 /gpu/command_buffer/service | |
| parent | a31b5ca9f7ec561f4cba5d63168e3f0f92fd22dd (diff) | |
| download | chromium_src-69a517c9d7ea551cf3d430bc0541a41351d25b15.zip chromium_src-69a517c9d7ea551cf3d430bc0541a41351d25b15.tar.gz chromium_src-69a517c9d7ea551cf3d430bc0541a41351d25b15.tar.bz2 | |
Remove BindAttribLocationImmediate, BufferSubDataImmediate, CompressedTexSubImage2DImmediate and BindUniformLocationCHROMIUMImmediate.
These immediates are not used in the gles2_implementation, and thus have no use currently.
Review URL: https://codereview.chromium.org/27733002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service')
6 files changed, 76 insertions, 210 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 28b57a5..dd02c9c 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -4442,21 +4442,6 @@ error::Error GLES2DecoderImpl::HandleBindAttribLocation( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleBindAttribLocationImmediate( - uint32 immediate_data_size, const cmds::BindAttribLocationImmediate& c) { - GLuint program = static_cast<GLuint>(c.program); - GLuint index = static_cast<GLuint>(c.index); - uint32 name_size = c.data_size; - const char* name = GetImmediateDataAs<const char*>( - c, name_size, immediate_data_size); - if (name == NULL) { - return error::kOutOfBounds; - } - String name_str(name, name_size); - DoBindAttribLocation(program, index, name_str.c_str()); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleBindAttribLocationBucket( uint32 immediate_data_size, const cmds::BindAttribLocationBucket& c) { GLuint program = static_cast<GLuint>(c.program); @@ -4522,22 +4507,6 @@ error::Error GLES2DecoderImpl::HandleBindUniformLocationCHROMIUM( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleBindUniformLocationCHROMIUMImmediate( - uint32 immediate_data_size, - const cmds::BindUniformLocationCHROMIUMImmediate& c) { - GLuint program = static_cast<GLuint>(c.program); - GLint location = static_cast<GLint>(c.location); - uint32 name_size = c.data_size; - const char* name = GetImmediateDataAs<const char*>( - c, name_size, immediate_data_size); - if (name == NULL) { - return error::kOutOfBounds; - } - String name_str(name, name_size); - DoBindUniformLocationCHROMIUM(program, location, name_str.c_str()); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleBindUniformLocationCHROMIUMBucket( uint32 immediate_data_size, const cmds::BindUniformLocationCHROMIUMBucket& c) { diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h index 393c902..2d63bc2 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h @@ -216,29 +216,6 @@ error::Error GLES2DecoderImpl::HandleBufferSubData( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleBufferSubDataImmediate( - uint32 immediate_data_size, const gles2::cmds::BufferSubDataImmediate& c) { - GLenum target = static_cast<GLenum>(c.target); - GLintptr offset = static_cast<GLintptr>(c.offset); - GLsizeiptr size = static_cast<GLsizeiptr>(c.size); - uint32 data_size = size; - const void* data = GetImmediateDataAs<const void*>( - c, data_size, immediate_data_size); - if (!validators_->buffer_target.IsValid(target)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM("glBufferSubData", target, "target"); - return error::kNoError; - } - if (size < 0) { - LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glBufferSubData", "size < 0"); - return error::kNoError; - } - if (data == NULL) { - return error::kOutOfBounds; - } - DoBufferSubData(target, offset, size, data); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleCheckFramebufferStatus( uint32 immediate_data_size, const gles2::cmds::CheckFramebufferStatus& c) { GLenum target = static_cast<GLenum>(c.target); @@ -378,53 +355,6 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2D( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2DImmediate( - uint32 immediate_data_size, - const gles2::cmds::CompressedTexSubImage2DImmediate& c) { - GLenum target = static_cast<GLenum>(c.target); - GLint level = static_cast<GLint>(c.level); - GLint xoffset = static_cast<GLint>(c.xoffset); - GLint yoffset = static_cast<GLint>(c.yoffset); - GLsizei width = static_cast<GLsizei>(c.width); - GLsizei height = static_cast<GLsizei>(c.height); - GLenum format = static_cast<GLenum>(c.format); - GLsizei imageSize = static_cast<GLsizei>(c.imageSize); - uint32 data_size = imageSize; - const void* data = GetImmediateDataAs<const void*>( - c, data_size, immediate_data_size); - if (!validators_->texture_target.IsValid(target)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM("glCompressedTexSubImage2D", target, - "target"); - return error::kNoError; - } - if (width < 0) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glCompressedTexSubImage2D", "width < 0"); - return error::kNoError; - } - if (height < 0) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glCompressedTexSubImage2D", "height < 0"); - return error::kNoError; - } - if (!validators_->compressed_texture_format.IsValid(format)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM("glCompressedTexSubImage2D", format, - "format"); - return error::kNoError; - } - if (imageSize < 0) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glCompressedTexSubImage2D", "imageSize < 0"); - return error::kNoError; - } - if (data == NULL) { - return error::kOutOfBounds; - } - DoCompressedTexSubImage2D( - target, level, xoffset, yoffset, width, height, format, imageSize, data); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleCopyTexImage2D( uint32 immediate_data_size, const gles2::cmds::CopyTexImage2D& c) { if (ShouldDeferReads()) diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc index 0cdef3b..72c2fcd 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc @@ -2530,31 +2530,6 @@ TEST_F(GLES2DecoderTest, BindAttribLocationInvalidArgs) { EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); } -TEST_F(GLES2DecoderTest, BindAttribLocationImmediate) { - const GLint kLocation = 2; - const char* kName = "testing"; - const uint32 kNameSize = strlen(kName); - EXPECT_CALL( - *gl_, BindAttribLocation(kServiceProgramId, kLocation, StrEq(kName))) - .Times(1); - BindAttribLocationImmediate& cmd = - *GetImmediateAs<BindAttribLocationImmediate>(); - cmd.Init(client_program_id_, kLocation, kName, kNameSize); - EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize)); -} - -TEST_F(GLES2DecoderTest, BindAttribLocationImmediateInvalidArgs) { - const GLint kLocation = 2; - const char* kName = "testing"; - const uint32 kNameSize = strlen(kName); - EXPECT_CALL(*gl_, BindAttribLocation(_, _, _)).Times(0); - BindAttribLocationImmediate& cmd = - *GetImmediateAs<BindAttribLocationImmediate>(); - cmd.Init(kInvalidClientId, kLocation, kName, kNameSize); - EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize)); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - TEST_F(GLES2DecoderTest, BindAttribLocationBucket) { const uint32 kBucketId = 123; const GLint kLocation = 2; diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h index 4cfcb51..d89779b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h @@ -22,8 +22,6 @@ TEST_F(GLES2DecoderTest1, AttachShaderValidArgs) { } // TODO(gman): BindAttribLocation -// TODO(gman): BindAttribLocationImmediate - // TODO(gman): BindAttribLocationBucket TEST_F(GLES2DecoderTest1, BindBufferValidArgs) { @@ -267,8 +265,6 @@ TEST_F(GLES2DecoderTest1, BlendFuncSeparateValidArgs) { // TODO(gman): BufferSubData -// TODO(gman): BufferSubDataImmediate - TEST_F(GLES2DecoderTest1, CheckFramebufferStatusValidArgs) { EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER)); @@ -356,8 +352,6 @@ TEST_F(GLES2DecoderTest1, ColorMaskValidArgs) { // TODO(gman): CompressedTexImage2DBucket // TODO(gman): CompressedTexSubImage2D -// TODO(gman): CompressedTexSubImage2DImmediate - // TODO(gman): CompressedTexSubImage2DBucket // TODO(gman): CopyTexImage2D @@ -1936,5 +1930,76 @@ TEST_F(GLES2DecoderTest1, IsBufferInvalidArgsBadSharedMemoryId) { cmd.Init(client_buffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset); EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); } + +TEST_F(GLES2DecoderTest1, IsEnabledValidArgs) { + SpecializedSetup<cmds::IsEnabled, 0>(true); + cmds::IsEnabled cmd; + cmd.Init(GL_BLEND, shared_memory_id_, shared_memory_offset_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} + +TEST_F(GLES2DecoderTest1, IsEnabledInvalidArgs0_0) { + EXPECT_CALL(*gl_, IsEnabled(_)).Times(0); + SpecializedSetup<cmds::IsEnabled, 0>(false); + cmds::IsEnabled cmd; + cmd.Init(GL_CLIP_PLANE0, shared_memory_id_, shared_memory_offset_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); +} + +TEST_F(GLES2DecoderTest1, IsEnabledInvalidArgs0_1) { + EXPECT_CALL(*gl_, IsEnabled(_)).Times(0); + SpecializedSetup<cmds::IsEnabled, 0>(false); + cmds::IsEnabled cmd; + cmd.Init(GL_POINT_SPRITE, shared_memory_id_, shared_memory_offset_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); +} + +TEST_F(GLES2DecoderTest1, IsEnabledInvalidArgsBadSharedMemoryId) { + SpecializedSetup<cmds::IsEnabled, 0>(false); + cmds::IsEnabled cmd; + cmd.Init(GL_BLEND, kInvalidSharedMemoryId, shared_memory_offset_); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); + cmd.Init(GL_BLEND, shared_memory_id_, kInvalidSharedMemoryOffset); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); +} + +TEST_F(GLES2DecoderTest1, IsFramebufferValidArgs) { + SpecializedSetup<cmds::IsFramebuffer, 0>(true); + cmds::IsFramebuffer cmd; + cmd.Init(client_framebuffer_id_, shared_memory_id_, shared_memory_offset_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} + +TEST_F(GLES2DecoderTest1, IsFramebufferInvalidArgsBadSharedMemoryId) { + SpecializedSetup<cmds::IsFramebuffer, 0>(false); + cmds::IsFramebuffer cmd; + cmd.Init( + client_framebuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); + cmd.Init( + client_framebuffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); +} + +TEST_F(GLES2DecoderTest1, IsProgramValidArgs) { + SpecializedSetup<cmds::IsProgram, 0>(true); + cmds::IsProgram cmd; + cmd.Init(client_program_id_, shared_memory_id_, shared_memory_offset_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} + +TEST_F(GLES2DecoderTest1, IsProgramInvalidArgsBadSharedMemoryId) { + SpecializedSetup<cmds::IsProgram, 0>(false); + cmds::IsProgram cmd; + cmd.Init(client_program_id_, kInvalidSharedMemoryId, shared_memory_offset_); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); + cmd.Init(client_program_id_, shared_memory_id_, kInvalidSharedMemoryOffset); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); +} #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_ diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h index da7d7ae..3226921 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h @@ -11,77 +11,6 @@ #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_ -TEST_F(GLES2DecoderTest2, IsEnabledValidArgs) { - SpecializedSetup<cmds::IsEnabled, 0>(true); - cmds::IsEnabled cmd; - cmd.Init(GL_BLEND, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_F(GLES2DecoderTest2, IsEnabledInvalidArgs0_0) { - EXPECT_CALL(*gl_, IsEnabled(_)).Times(0); - SpecializedSetup<cmds::IsEnabled, 0>(false); - cmds::IsEnabled cmd; - cmd.Init(GL_CLIP_PLANE0, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); -} - -TEST_F(GLES2DecoderTest2, IsEnabledInvalidArgs0_1) { - EXPECT_CALL(*gl_, IsEnabled(_)).Times(0); - SpecializedSetup<cmds::IsEnabled, 0>(false); - cmds::IsEnabled cmd; - cmd.Init(GL_POINT_SPRITE, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); -} - -TEST_F(GLES2DecoderTest2, IsEnabledInvalidArgsBadSharedMemoryId) { - SpecializedSetup<cmds::IsEnabled, 0>(false); - cmds::IsEnabled cmd; - cmd.Init(GL_BLEND, kInvalidSharedMemoryId, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - cmd.Init(GL_BLEND, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_F(GLES2DecoderTest2, IsFramebufferValidArgs) { - SpecializedSetup<cmds::IsFramebuffer, 0>(true); - cmds::IsFramebuffer cmd; - cmd.Init(client_framebuffer_id_, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_F(GLES2DecoderTest2, IsFramebufferInvalidArgsBadSharedMemoryId) { - SpecializedSetup<cmds::IsFramebuffer, 0>(false); - cmds::IsFramebuffer cmd; - cmd.Init( - client_framebuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - cmd.Init( - client_framebuffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_F(GLES2DecoderTest2, IsProgramValidArgs) { - SpecializedSetup<cmds::IsProgram, 0>(true); - cmds::IsProgram cmd; - cmd.Init(client_program_id_, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_F(GLES2DecoderTest2, IsProgramInvalidArgsBadSharedMemoryId) { - SpecializedSetup<cmds::IsProgram, 0>(false); - cmds::IsProgram cmd; - cmd.Init(client_program_id_, kInvalidSharedMemoryId, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - cmd.Init(client_program_id_, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - TEST_F(GLES2DecoderTest2, IsRenderbufferValidArgs) { SpecializedSetup<cmds::IsRenderbuffer, 0>(true); cmds::IsRenderbuffer cmd; @@ -1685,5 +1614,10 @@ TEST_F(GLES2DecoderTest2, PopGroupMarkerEXTValidArgs) { // TODO(gman): IsVertexArrayOES // TODO(gman): BindVertexArrayOES // TODO(gman): SwapBuffers +// TODO(gman): GetMaxValueInBufferCHROMIUM +// TODO(gman): GenSharedIdsCHROMIUM + +// TODO(gman): DeleteSharedIdsCHROMIUM + #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_ diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h index ad59b5c..7a9d406 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h @@ -10,11 +10,6 @@ #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_3_AUTOGEN_H_ #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_3_AUTOGEN_H_ -// TODO(gman): GetMaxValueInBufferCHROMIUM -// TODO(gman): GenSharedIdsCHROMIUM - -// TODO(gman): DeleteSharedIdsCHROMIUM - // TODO(gman): RegisterSharedIdsCHROMIUM // TODO(gman): EnableFeatureCHROMIUM @@ -47,8 +42,6 @@ // TODO(gman): ConsumeTextureCHROMIUMImmediate // TODO(gman): BindUniformLocationCHROMIUM -// TODO(gman): BindUniformLocationCHROMIUMImmediate - // TODO(gman): BindUniformLocationCHROMIUMBucket // TODO(gman): BindTexImage2DCHROMIUM // TODO(gman): ReleaseTexImage2DCHROMIUM |