gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc - Issue 2444813002: Remove unsafe mode to enable es3 api by default for WebGL2 and ES3 context

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc

Issue 2444813002: Remove unsafe mode to enable es3 api by default for WebGL2 and ES3 context (Closed)

Patch Set: remove runtime flag unsafeES3APIs from blink webgl module Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc ('k') | gpu/command_buffer/service/gpu_preferences.h » ('j') | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc

index 1e03c3aa60a2257a40e9c51a413f93845a7922ff..304ea56c0c362ff06df1b1d3b3d305eb7dda52a6 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc

@@ -90,7 +90,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformBlocksCHROMIUMValidArgs) {

GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORM_BLOCKS, _))

.WillOnce(SetArgPointee<2>(0))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

CommonDecoder::Bucket* bucket = decoder_->GetBucket(kBucketId);

EXPECT_EQ(sizeof(UniformBlocksHeader), bucket->size());

@@ -98,7 +98,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformBlocksCHROMIUMValidArgs) {

bucket->GetDataAs<UniformBlocksHeader*>(0, sizeof(UniformBlocksHeader));

EXPECT_TRUE(header != NULL);

EXPECT_EQ(0u, header->num_uniform_blocks);

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -108,7 +108,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformBlocksCHROMIUMInvalidArgs) {

EXPECT_TRUE(bucket == NULL);

GetUniformBlocksCHROMIUM cmd;

cmd.Init(kInvalidClientId, kBucketId);

- 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());

bucket = decoder_->GetBucket(kBucketId);

@@ -131,7 +131,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformsES3CHROMIUMValidArgs) {

GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORMS, _))

.WillOnce(SetArgPointee<2>(0))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

CommonDecoder::Bucket* bucket = decoder_->GetBucket(kBucketId);

EXPECT_EQ(sizeof(UniformsES3Header), bucket->size());

@@ -139,7 +139,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformsES3CHROMIUMValidArgs) {

bucket->GetDataAs<UniformsES3Header*>(0, sizeof(UniformsES3Header));

EXPECT_TRUE(header != NULL);

EXPECT_EQ(0u, header->num_uniforms);

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -149,7 +149,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformsES3CHROMIUMInvalidArgs) {

EXPECT_TRUE(bucket == NULL);

GetUniformsES3CHROMIUM cmd;

cmd.Init(kInvalidClientId, kBucketId);

- 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());

bucket = decoder_->GetBucket(kBucketId);

@@ -180,7 +180,7 @@ TEST_P(GLES2DecoderWithShaderTest,

kServiceProgramId, GL_TRANSFORM_FEEDBACK_VARYINGS, _))

.WillOnce(SetArgPointee<2>(0))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

CommonDecoder::Bucket* bucket = decoder_->GetBucket(kBucketId);

EXPECT_EQ(sizeof(TransformFeedbackVaryingsHeader), bucket->size());

@@ -191,7 +191,7 @@ TEST_P(GLES2DecoderWithShaderTest,

EXPECT_EQ(static_cast<uint32_t>(GL_INTERLEAVED_ATTRIBS),

header->transform_feedback_buffer_mode);

EXPECT_EQ(0u, header->num_transform_feedback_varyings);

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -202,7 +202,7 @@ TEST_P(GLES2DecoderWithShaderTest,

EXPECT_TRUE(bucket == NULL);

GetTransformFeedbackVaryingsCHROMIUM cmd;

cmd.Init(kInvalidClientId, kBucketId);

- 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());

bucket = decoder_->GetBucket(kBucketId);

@@ -334,11 +334,11 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformuivSucceeds) {

kSharedMemoryOffset);

EXPECT_CALL(*gl_, GetUniformuiv(kServiceProgramId, kUniform2RealLocation, _))

.Times(1);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GLES2Util::GetElementCountForUniformType(kUniform2Type),

static_cast<uint32_t>(result->GetNumResults()));

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -354,7 +354,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformuivArrayElementSucceeds) {

EXPECT_CALL(*gl_,

GetUniformuiv(kServiceProgramId, kUniform2ElementRealLocation, _))

.Times(1);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(GLES2Util::GetElementCountForUniformType(kUniform2Type),

static_cast<uint32_t>(result->GetNumResults()));

@@ -371,7 +371,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformuivBadProgramFails) {

kSharedMemoryId,

kSharedMemoryOffset);

EXPECT_CALL(*gl_, GetUniformuiv(_, _, _)).Times(0);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0U, result->size);

EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

@@ -416,7 +416,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformuivBadLocationFails) {

kSharedMemoryId,

kSharedMemoryOffset);

EXPECT_CALL(*gl_, GetUniformuiv(_, _, _)).Times(0);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0U, result->size);

EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());

@@ -430,7 +430,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformuivBadSharedMemoryFails) {

kSharedMemoryOffset);

EXPECT_CALL(*gl_, GetUniformuiv(_, _, _)).Times(0);

EXPECT_NE(error::kNoError, ExecuteCmd(cmd));

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

cmd.Init(client_program_id_,

kUniform2FakeLocation,

kSharedMemoryId,

@@ -811,7 +811,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformBlockNameSucceeds) {

.WillOnce(DoAll(SetArgPointee<3>(strlen(kName)),

SetArrayArgument<4>(kName, kName + strlen(kName) + 1)))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_NE(0, *result);

EXPECT_EQ(GL_NO_ERROR, GetGLError());

@@ -819,7 +819,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformBlockNameSucceeds) {

ASSERT_TRUE(bucket != NULL);

EXPECT_EQ(0,

memcmp(bucket->GetData(0, bucket->size()), kName, bucket->size()));

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -837,7 +837,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformBlockNameUnlinkedProgram) {

EXPECT_CALL(*gl_, GetProgramiv(kServiceProgramId, GL_LINK_STATUS, _))

.WillOnce(SetArgPointee<2>(GL_FALSE))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0, *result);

EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());

@@ -855,7 +855,7 @@ TEST_P(GLES2DecoderWithShaderTest,

kBucketId,

shared_memory_id_,

shared_memory_offset_);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_NE(error::kNoError, ExecuteCmd(cmd));

}

@@ -870,7 +870,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformBlockNameBadProgramFails) {

kBucketId,

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(0, *result);

EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

@@ -880,7 +880,7 @@ TEST_P(GLES2DecoderWithShaderTest,

GetActiveUniformBlockNameBadSharedMemoryFails) {

const uint32_t kBucketId = 123;

GetActiveUniformBlockName cmd;

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

cmd.Init(client_program_id_,

kBucketId,

@@ -937,12 +937,12 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformBlockivSucceeds) {

kServiceProgramId, 0, kPname[ii], _))

.WillOnce(SetArgPointee<3>(1976))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(1, result->GetNumResults());

EXPECT_EQ(GL_NO_ERROR, GetGLError());

EXPECT_EQ(1976, result->GetData()[0]);

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -976,7 +976,7 @@ TEST_P(GLES2DecoderWithShaderTest,

GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES, _))

.Times(1)

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0, result->GetNumResults());

EXPECT_EQ(GL_NO_ERROR, GetGLError());

@@ -995,7 +995,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformBlockivUnlinkedProgram) {

EXPECT_CALL(*gl_, GetProgramiv(kServiceProgramId, GL_LINK_STATUS, _))

.WillOnce(SetArgPointee<2>(GL_FALSE))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0, result->GetNumResults());

EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());

@@ -1012,7 +1012,7 @@ TEST_P(GLES2DecoderWithShaderTest,

GL_UNIFORM_BLOCK_BINDING,

shared_memory_id_,

shared_memory_offset_);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_CALL(*gl_, GetProgramiv(kServiceProgramId, GL_LINK_STATUS, _))

.WillOnce(SetArgPointee<2>(GL_TRUE))

.RetiresOnSaturation();

@@ -1032,7 +1032,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformBlockivBadProgramFails) {

GL_UNIFORM_BLOCK_BINDING,

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(0, result->GetNumResults());

EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

@@ -1041,7 +1041,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformBlockivBadProgramFails) {

TEST_P(GLES2DecoderWithShaderTest,

GetActiveUniformBlockivBadSharedMemoryFails) {

GetActiveUniformBlockiv cmd;

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_CALL(*gl_, GetProgramiv(kServiceProgramId, GL_LINK_STATUS, _))

.WillOnce(SetArgPointee<2>(GL_TRUE))

@@ -1191,7 +1191,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformIndicesSucceeds) {

.WillOnce(Return(GL_NO_ERROR))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

result->size = 0;

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(kCount, static_cast<size_t>(result->GetNumResults()));

@@ -1199,7 +1199,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformIndicesSucceeds) {

EXPECT_EQ(kIndices[ii], result->GetData()[ii]);

}

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));

}

@@ -1213,7 +1213,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformIndicesBadProgramFails) {

SetBucketAsCStrings(kBucketId, kCount, kNames, kCount, kValidStrEnd);

GetUniformIndices::Result* result =

static_cast<GetUniformIndices::Result*>(shared_memory_address_);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

GetUniformIndices cmd;

// None-existant program

cmd.Init(kInvalidClientId,

@@ -1264,7 +1264,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformIndicesBadParamsFails) {

.WillOnce(Return(GL_NO_ERROR))

.WillOnce(Return(GL_INVALID_VALUE))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

result->size = 0;

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0, result->GetNumResults());

@@ -1281,7 +1281,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformIndicesResultNotInitFails) {

SetBucketAsCStrings(kBucketId, kCount, kNames, kCount, kValidStrEnd);

GetUniformIndices::Result* result =

static_cast<GetUniformIndices::Result*>(shared_memory_address_);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

GetUniformIndices cmd;

result->size = 1976; // Any value other than 0.

cmd.Init(kInvalidClientId,

@@ -1301,7 +1301,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformIndicesBadSharedMemoryFails) {

SetBucketAsCStrings(kBucketId, kCount, kNames, kCount, kValidStrEnd);

GetUniformIndices::Result* result =

static_cast<GetUniformIndices::Result*>(shared_memory_address_);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

GetUniformIndices cmd;

cmd.Init(client_program_id_,

kBucketId,

@@ -1343,7 +1343,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformsivSucceeds) {

.WillOnce(Return(GL_NO_ERROR))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

result->size = 0;

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(kCount, static_cast<size_t>(result->GetNumResults()));

@@ -1351,7 +1351,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformsivSucceeds) {

EXPECT_EQ(kResults[ii], result->GetData()[ii]);

}

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));

}

@@ -1362,7 +1362,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformsivBadProgramFails) {

SetBucketData(kBucketId, kIndices, sizeof(GLuint) * kCount);

GetActiveUniformsiv::Result* result =

static_cast<GetActiveUniformsiv::Result*>(shared_memory_address_);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

GetActiveUniformsiv cmd;

// None-existant program

cmd.Init(kInvalidClientId,

@@ -1415,7 +1415,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformsivBadParamsFails) {

.WillOnce(Return(GL_NO_ERROR))

.WillOnce(Return(GL_INVALID_VALUE))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

result->size = 0;

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0, result->GetNumResults());

@@ -1429,7 +1429,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformsivBadPnameFails) {

SetBucketData(kBucketId, kIndices, sizeof(GLuint) * kCount);

GetActiveUniformsiv::Result* result =

static_cast<GetActiveUniformsiv::Result*>(shared_memory_address_);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

GetActiveUniformsiv cmd;

// GL_UNIFORM_BLOCK_NAME_LENGTH should not be supported.

cmd.Init(client_program_id_,

@@ -1466,7 +1466,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformsivResultNotInitFails) {

GL_UNIFORM_TYPE,

kSharedMemoryId,

kSharedMemoryOffset);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

result->size = 1976; // Any value other than 0.

EXPECT_NE(error::kNoError, ExecuteCmd(cmd));

}

@@ -1479,7 +1479,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetActiveUniformsivBadSharedMemoryFails) {

GetActiveUniformsiv::Result* result =

static_cast<GetActiveUniformsiv::Result*>(shared_memory_address_);

GetActiveUniformsiv cmd;

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

result->size = 0;

cmd.Init(client_program_id_,

kBucketId,

@@ -1576,7 +1576,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetTransformFeedbackVaryingSucceeds) {

kBucketId,

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_NE(0, result->success);

EXPECT_EQ(kSize, static_cast<GLsizei>(result->size));

@@ -1586,7 +1586,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetTransformFeedbackVaryingSucceeds) {

ASSERT_TRUE(bucket != NULL);

EXPECT_EQ(

0, memcmp(bucket->GetData(0, bucket->size()), kName, bucket->size()));

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -1602,7 +1602,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetTransformFeedbackVaryingNotInitFails) {

kBucketId,

shared_memory_id_,

shared_memory_offset_);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_NE(error::kNoError, ExecuteCmd(cmd));

}

@@ -1618,7 +1618,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetTransformFeedbackVaryingBadProgramFails) {

kBucketId,

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(0, result->success);

EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

@@ -1653,7 +1653,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetTransformFeedbackVaryingBadParamsFails) {

kServiceProgramId, kIndex, _, _, _, _, _))

.Times(1)

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(0, result->success);

EXPECT_EQ(GL_INVALID_VALUE, GetGLError());

@@ -1667,7 +1667,7 @@ TEST_P(GLES2DecoderWithShaderTest,

typedef GetTransformFeedbackVarying::Result Result;

Result* result = static_cast<Result*>(shared_memory_address_);

result->success = 0;

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

cmd.Init(client_program_id_,

kIndex,

kBucketId,

@@ -1790,10 +1790,10 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform1uiValidArgs) {

EXPECT_CALL(*gl_, Uniform1uiv(kUniform4RealLocation, 1, _));

Uniform1ui cmd;

cmd.Init(kUniform4FakeLocation, 2);

- 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));

}

@@ -1873,10 +1873,10 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform1uivImmediateValidArgs) {

EXPECT_CALL(*gl_,

Uniform1uiv(kUniform4RealLocation, 1, PointsToArray(temp, 1)));

cmd.Init(kUniform4FakeLocation, 1, &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)));

}

@@ -1888,7 +1888,7 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform1uivImmediateInvalidType) {

};

// uniform1 is SAMPLER type.

cmd.Init(kUniform1FakeLocation, 1, &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_INVALID_OPERATION, GetGLError());

}

@@ -1898,7 +1898,7 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform1uivZeroCount) {

Uniform1uivImmediate& cmd = *GetImmediateAs<Uniform1uivImmediate>();

GLuint temp = 0;

cmd.Init(kUniform4FakeLocation, 0, &temp);

- 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());

}

@@ -1907,10 +1907,10 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform2uiValidArgs) {

EXPECT_CALL(*gl_, Uniform2uiv(kUniform5RealLocation, 1, _));

Uniform2ui cmd;

cmd.Init(kUniform5FakeLocation, 2, 3);

- 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));

}

@@ -1923,10 +1923,10 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform2uivImmediateValidArgs) {

EXPECT_CALL(*gl_,

Uniform2uiv(kUniform5RealLocation, 1, PointsToArray(temp, 2)));

cmd.Init(kUniform5FakeLocation, 1, &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)));

}

@@ -1934,10 +1934,10 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform3uiValidArgs) {

EXPECT_CALL(*gl_, Uniform3uiv(kUniform6RealLocation, 1, _));

Uniform3ui cmd;

cmd.Init(kUniform6FakeLocation, 2, 3, 4);

- 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));

}

@@ -1950,10 +1950,10 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform3uivImmediateValidArgs) {

EXPECT_CALL(*gl_,

Uniform3uiv(kUniform6RealLocation, 1, PointsToArray(temp, 3)));

cmd.Init(kUniform6FakeLocation, 1, &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)));

}

@@ -1961,10 +1961,10 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform4uiValidArgs) {

EXPECT_CALL(*gl_, Uniform4uiv(kUniform7RealLocation, 1, _));

Uniform4ui cmd;

cmd.Init(kUniform7FakeLocation, 2, 3, 4, 5);

- 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));

}

@@ -1977,10 +1977,10 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform4uivImmediateValidArgs) {

EXPECT_CALL(*gl_,

Uniform4uiv(kUniform7RealLocation, 1, PointsToArray(temp, 4)));

cmd.Init(kUniform7FakeLocation, 1, &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)));

}

@@ -2073,10 +2073,10 @@ TEST_P(GLES3DecoderWithESSL3ShaderTest, GetFragDataLocation) {

*result = -1;

GetFragDataLocation cmd;

cmd.Init(client_program_id_, kBucketId, kSharedMemoryId, kSharedMemoryOffset);

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(static_cast<GLint>(kOutputVariable1ColorName), *result);

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -2086,7 +2086,7 @@ TEST_P(GLES3DecoderWithESSL3ShaderTest, GetFragDataLocationInvalidArgs) {

Result* result = GetSharedMemoryAs<Result*>();

*result = -1;

GetFragDataLocation cmd;

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

// Check no bucket

cmd.Init(client_program_id_, kBucketId, kSharedMemoryId, kSharedMemoryOffset);

EXPECT_NE(error::kNoError, ExecuteCmd(cmd));

@@ -2125,10 +2125,10 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformBlockIndex) {

EXPECT_CALL(*gl_, GetUniformBlockIndex(kServiceProgramId, StrEq(kName)))

.WillOnce(Return(kIndex))

.RetiresOnSaturation();

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

EXPECT_EQ(kIndex, *result);

- decoder_->set_unsafe_es3_apis_enabled(false);

+ decoder_->set_es3_apis_enabled(false);

EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));

}

@@ -2138,7 +2138,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformBlockIndexInvalidArgs) {

Result* result = GetSharedMemoryAs<Result*>();

*result = GL_INVALID_INDEX;

GetUniformBlockIndex cmd;

- decoder_->set_unsafe_es3_apis_enabled(true);

+ decoder_->set_es3_apis_enabled(true);

// Check no bucket

cmd.Init(client_program_id_, kBucketId, kSharedMemoryId, kSharedMemoryOffset);

EXPECT_NE(error::kNoError, ExecuteCmd(cmd));

@@ -2214,7 +2214,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetUniformLocationInvalidArgs) {

TEST_P(GLES3DecoderWithESSL3ShaderTest, Basic) {

// Make sure the setup is correct for ES3.

- EXPECT_TRUE(decoder_->unsafe_es3_apis_enabled());

+ EXPECT_TRUE(decoder_->es3_apis_enabled());

EXPECT_TRUE(feature_info()->validators()->texture_bind_target.IsValid(

GL_TEXTURE_3D));

}