| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_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 62da53e31c285bd7e0bf00b8c5ef6850cf23f8c9..a9c822fa4391a18e0d4701b75c4e4b868aba3973 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
|
| @@ -110,13 +110,13 @@ TEST_P(GLES2DecoderTest2, GetSamplerParameterfvValidArgs) {
|
| cmds::GetSamplerParameterfv cmd;
|
| cmd.Init(client_sampler_id_, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(
|
| decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_TEXTURE_MAG_FILTER),
|
| result->GetNumResults());
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -132,13 +132,13 @@ TEST_P(GLES2DecoderTest2, GetSamplerParameterivValidArgs) {
|
| cmds::GetSamplerParameteriv cmd;
|
| cmd.Init(client_sampler_id_, GL_TEXTURE_MAG_FILTER, shared_memory_id_,
|
| shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(
|
| decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_TEXTURE_MAG_FILTER),
|
| result->GetNumResults());
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -198,12 +198,12 @@ TEST_P(GLES2DecoderTest2, GetSyncivValidArgs) {
|
| cmds::GetSynciv cmd;
|
| cmd.Init(client_sync_id_, GL_SYNC_STATUS, shared_memory_id_,
|
| shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_SYNC_STATUS),
|
| result->GetNumResults());
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -437,13 +437,13 @@ TEST_P(GLES2DecoderTest2, GetVertexAttribIivValidArgs) {
|
| cmds::GetVertexAttribIiv cmd;
|
| cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
|
| shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
|
| GL_VERTEX_ATTRIB_ARRAY_NORMALIZED),
|
| result->GetNumResults());
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -455,13 +455,13 @@ TEST_P(GLES2DecoderTest2, GetVertexAttribIuivValidArgs) {
|
| cmds::GetVertexAttribIuiv cmd;
|
| cmd.Init(1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, shared_memory_id_,
|
| shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
|
| GL_VERTEX_ATTRIB_ARRAY_NORMALIZED),
|
| result->GetNumResults());
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -594,22 +594,22 @@ TEST_P(GLES2DecoderTest2, IsSamplerValidArgs) {
|
| SpecializedSetup<cmds::IsSampler, 0>(true);
|
| cmds::IsSampler cmd;
|
| cmd.Init(client_sampler_id_, shared_memory_id_, shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_P(GLES2DecoderTest2, IsSamplerInvalidArgsBadSharedMemoryId) {
|
| SpecializedSetup<cmds::IsSampler, 0>(false);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmds::IsSampler cmd;
|
| cmd.Init(client_sampler_id_, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(client_sampler_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| }
|
|
|
| TEST_P(GLES2DecoderTest2, IsShaderValidArgs) {
|
| @@ -633,22 +633,22 @@ TEST_P(GLES2DecoderTest2, IsSyncValidArgs) {
|
| SpecializedSetup<cmds::IsSync, 0>(true);
|
| cmds::IsSync cmd;
|
| cmd.Init(client_sync_id_, shared_memory_id_, shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_P(GLES2DecoderTest2, IsSyncInvalidArgsBadSharedMemoryId) {
|
| SpecializedSetup<cmds::IsSync, 0>(false);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmds::IsSync cmd;
|
| cmd.Init(client_sync_id_, kInvalidSharedMemoryId, shared_memory_offset_);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| cmd.Init(client_sync_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| }
|
|
|
| TEST_P(GLES2DecoderTest2, IsTextureValidArgs) {
|
| @@ -673,16 +673,16 @@ TEST_P(GLES2DecoderTest2, IsTransformFeedbackValidArgs) {
|
| cmds::IsTransformFeedback cmd;
|
| cmd.Init(client_transformfeedback_id_, shared_memory_id_,
|
| shared_memory_offset_);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| TEST_P(GLES2DecoderTest2, IsTransformFeedbackInvalidArgsBadSharedMemoryId) {
|
| SpecializedSetup<cmds::IsTransformFeedback, 0>(false);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmds::IsTransformFeedback cmd;
|
| cmd.Init(client_transformfeedback_id_, kInvalidSharedMemoryId,
|
| shared_memory_offset_);
|
| @@ -690,7 +690,7 @@ TEST_P(GLES2DecoderTest2, IsTransformFeedbackInvalidArgsBadSharedMemoryId) {
|
| cmd.Init(client_transformfeedback_id_, shared_memory_id_,
|
| kInvalidSharedMemoryOffset);
|
| EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| }
|
|
|
| TEST_P(GLES2DecoderTest2, LineWidthValidArgs) {
|
| @@ -741,10 +741,10 @@ TEST_P(GLES2DecoderTest2, ReadBufferValidArgs) {
|
| SpecializedSetup<cmds::ReadBuffer, 0>(true);
|
| cmds::ReadBuffer cmd;
|
| cmd.Init(GL_NONE);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -798,10 +798,10 @@ TEST_P(GLES2DecoderTest2, SamplerParameterfValidArgs) {
|
| SpecializedSetup<cmds::SamplerParameterf, 0>(true);
|
| cmds::SamplerParameterf cmd;
|
| cmd.Init(client_sampler_id_, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -815,10 +815,10 @@ TEST_P(GLES2DecoderTest2, SamplerParameterfvImmediateValidArgs) {
|
| cmd.Init(client_sampler_id_, GL_TEXTURE_MAG_FILTER, &temp[0]);
|
| EXPECT_CALL(*gl_, SamplerParameterf(kServiceSamplerId, GL_TEXTURE_MAG_FILTER,
|
| temp[0]));
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -828,10 +828,10 @@ TEST_P(GLES2DecoderTest2, SamplerParameteriValidArgs) {
|
| SpecializedSetup<cmds::SamplerParameteri, 0>(true);
|
| cmds::SamplerParameteri cmd;
|
| cmd.Init(client_sampler_id_, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -845,10 +845,10 @@ TEST_P(GLES2DecoderTest2, SamplerParameterivImmediateValidArgs) {
|
| cmd.Init(client_sampler_id_, GL_TEXTURE_MAG_FILTER, &temp[0]);
|
| EXPECT_CALL(*gl_, SamplerParameteri(kServiceSamplerId, GL_TEXTURE_MAG_FILTER,
|
| temp[0]));
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
|
|
| @@ -887,7 +887,7 @@ TEST_P(GLES2DecoderTest2, ShaderSourceBucketValidArgs) {
|
| SetBucketAsCStrings(kBucketId, 1, kSource, 1, kValidStrEnd);
|
| cmds::ShaderSourceBucket cmd;
|
| cmd.Init(client_shader_id_, kBucketId);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -896,7 +896,7 @@ TEST_P(GLES2DecoderTest2, ShaderSourceBucketInvalidArgs) {
|
| const char kSource0[] = "hello";
|
| const char* kSource[] = {kSource0};
|
| const char kValidStrEnd = 0;
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmds::ShaderSourceBucket cmd;
|
| // Test no bucket.
|
| cmd.Init(client_shader_id_, kBucketId);
|
| @@ -917,7 +917,7 @@ TEST_P(GLES2DecoderTest2, ShaderSourceBucketInvalidHeader) {
|
| const GLsizei kTests[] = {
|
| kCount + 1, 0, std::numeric_limits<GLsizei>::max(), -1,
|
| };
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| for (size_t ii = 0; ii < arraysize(kTests); ++ii) {
|
| SetBucketAsCStrings(kBucketId, 1, kSource, kTests[ii], kValidStrEnd);
|
| cmds::ShaderSourceBucket cmd;
|
| @@ -934,7 +934,7 @@ TEST_P(GLES2DecoderTest2, ShaderSourceBucketInvalidStringEnding) {
|
| SetBucketAsCStrings(kBucketId, 1, kSource, 1, kInvalidStrEnd);
|
| cmds::ShaderSourceBucket cmd;
|
| cmd.Init(client_shader_id_, kBucketId);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -1190,9 +1190,9 @@ TEST_P(GLES2DecoderTest2, TransformFeedbackVaryingsBucketValidArgs) {
|
| SetBucketAsCStrings(kBucketId, 1, kSource, 1, kValidStrEnd);
|
| cmds::TransformFeedbackVaryingsBucket cmd;
|
| cmd.Init(client_program_id_, kBucketId, GL_INTERLEAVED_ATTRIBS);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -1201,7 +1201,7 @@ TEST_P(GLES2DecoderTest2, TransformFeedbackVaryingsBucketInvalidArgs) {
|
| const char kSource0[] = "hello";
|
| const char* kSource[] = {kSource0};
|
| const char kValidStrEnd = 0;
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| cmds::TransformFeedbackVaryingsBucket cmd;
|
| // Test no bucket.
|
| cmd.Init(client_program_id_, kBucketId, GL_INTERLEAVED_ATTRIBS);
|
| @@ -1222,7 +1222,7 @@ TEST_P(GLES2DecoderTest2, TransformFeedbackVaryingsBucketInvalidHeader) {
|
| const GLsizei kTests[] = {
|
| kCount + 1, 0, std::numeric_limits<GLsizei>::max(), -1,
|
| };
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| for (size_t ii = 0; ii < arraysize(kTests); ++ii) {
|
| SetBucketAsCStrings(kBucketId, 1, kSource, kTests[ii], kValidStrEnd);
|
| cmds::TransformFeedbackVaryingsBucket cmd;
|
| @@ -1239,7 +1239,7 @@ TEST_P(GLES2DecoderTest2, TransformFeedbackVaryingsBucketInvalidStringEnding) {
|
| SetBucketAsCStrings(kBucketId, 1, kSource, 1, kInvalidStrEnd);
|
| cmds::TransformFeedbackVaryingsBucket cmd;
|
| cmd.Init(client_program_id_, kBucketId, GL_INTERLEAVED_ATTRIBS);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
|
| }
|
|
|
| @@ -1399,10 +1399,10 @@ TEST_P(GLES2DecoderTest2, UniformMatrix2x3fvImmediateValidArgs) {
|
| };
|
| EXPECT_CALL(*gl_, UniformMatrix2x3fv(1, 2, true, PointsToArray(temp, 6)));
|
| cmd.Init(1, 2, true, &temp[0]);
|
| - decoder_->set_unsafe_es3_apis_enabled(true);
|
| + decoder_->set_es3_apis_enabled(true);
|
| EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - decoder_->set_unsafe_es3_apis_enabled(false);
|
| + decoder_->set_es3_apis_enabled(false);
|
| EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, sizeof(temp)));
|
| }
|
| #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_
|
|
|