gpu/command_buffer/service/gles2_cmd_decoder_autogen.h - 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_autogen.h

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.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('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_autogen.h

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

index 8bc9253ec08ce3633c41b41ff5c7446c9528c9b4..f9f83215cc2aa03ed2f4b9ff43688a7f05b7680a 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

@@ -50,7 +50,7 @@ error::Error GLES2DecoderImpl::HandleBindBuffer(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleBindBufferBase(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::BindBufferBase& c =

*static_cast<const volatile gles2::cmds::BindBufferBase*>(cmd_data);

@@ -68,7 +68,7 @@ error::Error GLES2DecoderImpl::HandleBindBufferBase(

error::Error GLES2DecoderImpl::HandleBindBufferRange(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::BindBufferRange& c =

*static_cast<const volatile gles2::cmds::BindBufferRange*>(cmd_data);

@@ -122,7 +122,7 @@ error::Error GLES2DecoderImpl::HandleBindRenderbuffer(

error::Error GLES2DecoderImpl::HandleBindSampler(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::BindSampler& c =

*static_cast<const volatile gles2::cmds::BindSampler*>(cmd_data);

@@ -150,7 +150,7 @@ error::Error GLES2DecoderImpl::HandleBindTexture(

error::Error GLES2DecoderImpl::HandleBindTransformFeedback(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::BindTransformFeedback& c =

*static_cast<const volatile gles2::cmds::BindTransformFeedback*>(

@@ -360,7 +360,7 @@ error::Error GLES2DecoderImpl::HandleClear(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleClearBufferfi(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::ClearBufferfi& c =

*static_cast<const volatile gles2::cmds::ClearBufferfi*>(cmd_data);

@@ -379,7 +379,7 @@ error::Error GLES2DecoderImpl::HandleClearBufferfi(

error::Error GLES2DecoderImpl::HandleClearBufferfvImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::ClearBufferfvImmediate& c =

*static_cast<const volatile gles2::cmds::ClearBufferfvImmediate*>(

@@ -409,7 +409,7 @@ error::Error GLES2DecoderImpl::HandleClearBufferfvImmediate(

error::Error GLES2DecoderImpl::HandleClearBufferivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::ClearBufferivImmediate& c =

*static_cast<const volatile gles2::cmds::ClearBufferivImmediate*>(

@@ -439,7 +439,7 @@ error::Error GLES2DecoderImpl::HandleClearBufferivImmediate(

error::Error GLES2DecoderImpl::HandleClearBufferuivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::ClearBufferuivImmediate& c =

*static_cast<const volatile gles2::cmds::ClearBufferuivImmediate*>(

@@ -735,7 +735,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2D(

error::Error GLES2DecoderImpl::HandleCompressedTexImage3DBucket(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::CompressedTexImage3DBucket& c =

*static_cast<const volatile gles2::cmds::CompressedTexImage3DBucket*>(

@@ -790,7 +790,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexImage3DBucket(

error::Error GLES2DecoderImpl::HandleCompressedTexImage3D(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::CompressedTexImage3D& c =

*static_cast<const volatile gles2::cmds::CompressedTexImage3D*>(cmd_data);

@@ -840,7 +840,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexImage3D(

error::Error GLES2DecoderImpl::HandleCompressedTexSubImage3DBucket(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::CompressedTexSubImage3DBucket& c =

*static_cast<const volatile gles2::cmds::CompressedTexSubImage3DBucket*>(

@@ -900,7 +900,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage3DBucket(

error::Error GLES2DecoderImpl::HandleCompressedTexSubImage3D(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::CompressedTexSubImage3D& c =

*static_cast<const volatile gles2::cmds::CompressedTexSubImage3D*>(

@@ -959,7 +959,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage3D(

error::Error GLES2DecoderImpl::HandleCopyBufferSubData(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::CopyBufferSubData& c =

*static_cast<const volatile gles2::cmds::CopyBufferSubData*>(cmd_data);

@@ -1060,7 +1060,7 @@ error::Error GLES2DecoderImpl::HandleCopyTexSubImage2D(

error::Error GLES2DecoderImpl::HandleCopyTexSubImage3D(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::CopyTexSubImage3D& c =

*static_cast<const volatile gles2::cmds::CopyTexSubImage3D*>(cmd_data);

@@ -1212,7 +1212,7 @@ error::Error GLES2DecoderImpl::HandleDeleteRenderbuffersImmediate(

error::Error GLES2DecoderImpl::HandleDeleteSamplersImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::DeleteSamplersImmediate& c =

*static_cast<const volatile gles2::cmds::DeleteSamplersImmediate*>(

@@ -1233,7 +1233,7 @@ error::Error GLES2DecoderImpl::HandleDeleteSamplersImmediate(

error::Error GLES2DecoderImpl::HandleDeleteSync(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::DeleteSync& c =

*static_cast<const volatile gles2::cmds::DeleteSync*>(cmd_data);

@@ -1265,7 +1265,7 @@ error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate(

error::Error GLES2DecoderImpl::HandleDeleteTransformFeedbacksImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::DeleteTransformFeedbacksImmediate& c =

*static_cast<

@@ -1385,7 +1385,7 @@ error::Error GLES2DecoderImpl::HandleEnableVertexAttribArray(

error::Error GLES2DecoderImpl::HandleFenceSync(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::FenceSync& c =

*static_cast<const volatile gles2::cmds::FenceSync*>(cmd_data);

@@ -1480,7 +1480,7 @@ error::Error GLES2DecoderImpl::HandleFramebufferTexture2D(

error::Error GLES2DecoderImpl::HandleFramebufferTextureLayer(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::FramebufferTextureLayer& c =

*static_cast<const volatile gles2::cmds::FramebufferTextureLayer*>(

@@ -1614,7 +1614,7 @@ error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate(

error::Error GLES2DecoderImpl::HandleGenSamplersImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GenSamplersImmediate& c =

*static_cast<const volatile gles2::cmds::GenSamplersImmediate*>(cmd_data);

@@ -1666,7 +1666,7 @@ error::Error GLES2DecoderImpl::HandleGenTexturesImmediate(

error::Error GLES2DecoderImpl::HandleGenTransformFeedbacksImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GenTransformFeedbacksImmediate& c =

*static_cast<const volatile gles2::cmds::GenTransformFeedbacksImmediate*>(

@@ -1729,7 +1729,7 @@ error::Error GLES2DecoderImpl::HandleGetBooleanv(

error::Error GLES2DecoderImpl::HandleGetBufferParameteri64v(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetBufferParameteri64v& c =

*static_cast<const volatile gles2::cmds::GetBufferParameteri64v*>(

@@ -1903,7 +1903,7 @@ error::Error GLES2DecoderImpl::HandleGetFramebufferAttachmentParameteriv(

error::Error GLES2DecoderImpl::HandleGetInteger64v(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetInteger64v& c =

*static_cast<const volatile gles2::cmds::GetInteger64v*>(cmd_data);

@@ -1940,7 +1940,7 @@ error::Error GLES2DecoderImpl::HandleGetInteger64v(

error::Error GLES2DecoderImpl::HandleGetIntegeri_v(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetIntegeri_v& c =

*static_cast<const volatile gles2::cmds::GetIntegeri_v*>(cmd_data);

@@ -1973,7 +1973,7 @@ error::Error GLES2DecoderImpl::HandleGetIntegeri_v(

error::Error GLES2DecoderImpl::HandleGetInteger64i_v(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetInteger64i_v& c =

*static_cast<const volatile gles2::cmds::GetInteger64i_v*>(cmd_data);

@@ -2121,7 +2121,7 @@ error::Error GLES2DecoderImpl::HandleGetRenderbufferParameteriv(

error::Error GLES2DecoderImpl::HandleGetSamplerParameterfv(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetSamplerParameterfv& c =

*static_cast<const volatile gles2::cmds::GetSamplerParameterfv*>(

@@ -2160,7 +2160,7 @@ error::Error GLES2DecoderImpl::HandleGetSamplerParameterfv(

error::Error GLES2DecoderImpl::HandleGetSamplerParameteriv(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetSamplerParameteriv& c =

*static_cast<const volatile gles2::cmds::GetSamplerParameteriv*>(

@@ -2234,7 +2234,7 @@ error::Error GLES2DecoderImpl::HandleGetShaderiv(

error::Error GLES2DecoderImpl::HandleGetSynciv(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetSynciv& c =

*static_cast<const volatile gles2::cmds::GetSynciv*>(cmd_data);

@@ -2429,7 +2429,7 @@ error::Error GLES2DecoderImpl::HandleGetVertexAttribiv(

error::Error GLES2DecoderImpl::HandleGetVertexAttribIiv(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetVertexAttribIiv& c =

*static_cast<const volatile gles2::cmds::GetVertexAttribIiv*>(cmd_data);

@@ -2467,7 +2467,7 @@ error::Error GLES2DecoderImpl::HandleGetVertexAttribIiv(

error::Error GLES2DecoderImpl::HandleGetVertexAttribIuiv(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::GetVertexAttribIuiv& c =

*static_cast<const volatile gles2::cmds::GetVertexAttribIuiv*>(cmd_data);

@@ -2542,7 +2542,7 @@ error::Error GLES2DecoderImpl::HandleHint(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleInvalidateFramebufferImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::InvalidateFramebufferImmediate& c =

*static_cast<const volatile gles2::cmds::InvalidateFramebufferImmediate*>(

@@ -2580,7 +2580,7 @@ error::Error GLES2DecoderImpl::HandleInvalidateFramebufferImmediate(

error::Error GLES2DecoderImpl::HandleInvalidateSubFramebufferImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::InvalidateSubFramebufferImmediate& c =

*static_cast<

@@ -2713,7 +2713,7 @@ error::Error GLES2DecoderImpl::HandleIsRenderbuffer(

error::Error GLES2DecoderImpl::HandleIsSampler(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::IsSampler& c =

*static_cast<const volatile gles2::cmds::IsSampler*>(cmd_data);

@@ -2745,7 +2745,7 @@ error::Error GLES2DecoderImpl::HandleIsShader(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleIsSync(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::IsSync& c =

*static_cast<const volatile gles2::cmds::IsSync*>(cmd_data);

@@ -2778,7 +2778,7 @@ error::Error GLES2DecoderImpl::HandleIsTexture(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleIsTransformFeedback(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::IsTransformFeedback& c =

*static_cast<const volatile gles2::cmds::IsTransformFeedback*>(cmd_data);

@@ -2822,7 +2822,7 @@ error::Error GLES2DecoderImpl::HandleLinkProgram(

error::Error GLES2DecoderImpl::HandlePauseTransformFeedback(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

DoPauseTransformFeedback();

return error::kNoError;

@@ -2846,7 +2846,7 @@ error::Error GLES2DecoderImpl::HandlePolygonOffset(

error::Error GLES2DecoderImpl::HandleReadBuffer(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::ReadBuffer& c =

*static_cast<const volatile gles2::cmds::ReadBuffer*>(cmd_data);

@@ -2899,7 +2899,7 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorage(

error::Error GLES2DecoderImpl::HandleResumeTransformFeedback(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

DoResumeTransformFeedback();

return error::kNoError;

@@ -2919,7 +2919,7 @@ error::Error GLES2DecoderImpl::HandleSampleCoverage(

error::Error GLES2DecoderImpl::HandleSamplerParameterf(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::SamplerParameterf& c =

*static_cast<const volatile gles2::cmds::SamplerParameterf*>(cmd_data);

@@ -2937,7 +2937,7 @@ error::Error GLES2DecoderImpl::HandleSamplerParameterf(

error::Error GLES2DecoderImpl::HandleSamplerParameterfvImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::SamplerParameterfvImmediate& c =

*static_cast<const volatile gles2::cmds::SamplerParameterfvImmediate*>(

@@ -2967,7 +2967,7 @@ error::Error GLES2DecoderImpl::HandleSamplerParameterfvImmediate(

error::Error GLES2DecoderImpl::HandleSamplerParameteri(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::SamplerParameteri& c =

*static_cast<const volatile gles2::cmds::SamplerParameteri*>(cmd_data);

@@ -2985,7 +2985,7 @@ error::Error GLES2DecoderImpl::HandleSamplerParameteri(

error::Error GLES2DecoderImpl::HandleSamplerParameterivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::SamplerParameterivImmediate& c =

*static_cast<const volatile gles2::cmds::SamplerParameterivImmediate*>(

@@ -3375,7 +3375,7 @@ error::Error GLES2DecoderImpl::HandleTexParameterivImmediate(

error::Error GLES2DecoderImpl::HandleTexStorage3D(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::TexStorage3D& c =

*static_cast<const volatile gles2::cmds::TexStorage3D*>(cmd_data);

@@ -3417,7 +3417,7 @@ error::Error GLES2DecoderImpl::HandleTexStorage3D(

error::Error GLES2DecoderImpl::HandleTransformFeedbackVaryingsBucket(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::TransformFeedbackVaryingsBucket& c = *static_cast<

const volatile gles2::cmds::TransformFeedbackVaryingsBucket*>(cmd_data);

@@ -3529,7 +3529,7 @@ error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(

error::Error GLES2DecoderImpl::HandleUniform1ui(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::Uniform1ui& c =

*static_cast<const volatile gles2::cmds::Uniform1ui*>(cmd_data);

@@ -3545,7 +3545,7 @@ error::Error GLES2DecoderImpl::HandleUniform1ui(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleUniform1uivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::Uniform1uivImmediate& c =

*static_cast<const volatile gles2::cmds::Uniform1uivImmediate*>(cmd_data);

@@ -3658,7 +3658,7 @@ error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(

error::Error GLES2DecoderImpl::HandleUniform2ui(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::Uniform2ui& c =

*static_cast<const volatile gles2::cmds::Uniform2ui*>(cmd_data);

@@ -3675,7 +3675,7 @@ error::Error GLES2DecoderImpl::HandleUniform2ui(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleUniform2uivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::Uniform2uivImmediate& c =

*static_cast<const volatile gles2::cmds::Uniform2uivImmediate*>(cmd_data);

@@ -3790,7 +3790,7 @@ error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(

error::Error GLES2DecoderImpl::HandleUniform3ui(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::Uniform3ui& c =

*static_cast<const volatile gles2::cmds::Uniform3ui*>(cmd_data);

@@ -3808,7 +3808,7 @@ error::Error GLES2DecoderImpl::HandleUniform3ui(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleUniform3uivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::Uniform3uivImmediate& c =

*static_cast<const volatile gles2::cmds::Uniform3uivImmediate*>(cmd_data);

@@ -3925,7 +3925,7 @@ error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(

error::Error GLES2DecoderImpl::HandleUniform4ui(uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::Uniform4ui& c =

*static_cast<const volatile gles2::cmds::Uniform4ui*>(cmd_data);

@@ -3944,7 +3944,7 @@ error::Error GLES2DecoderImpl::HandleUniform4ui(uint32_t immediate_data_size,

error::Error GLES2DecoderImpl::HandleUniform4uivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::Uniform4uivImmediate& c =

*static_cast<const volatile gles2::cmds::Uniform4uivImmediate*>(cmd_data);

@@ -4004,7 +4004,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(

error::Error GLES2DecoderImpl::HandleUniformMatrix2x3fvImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::UniformMatrix2x3fvImmediate& c =

*static_cast<const volatile gles2::cmds::UniformMatrix2x3fvImmediate*>(

@@ -4036,7 +4036,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2x3fvImmediate(

error::Error GLES2DecoderImpl::HandleUniformMatrix2x4fvImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::UniformMatrix2x4fvImmediate& c =

*static_cast<const volatile gles2::cmds::UniformMatrix2x4fvImmediate*>(

@@ -4098,7 +4098,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(

error::Error GLES2DecoderImpl::HandleUniformMatrix3x2fvImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::UniformMatrix3x2fvImmediate& c =

*static_cast<const volatile gles2::cmds::UniformMatrix3x2fvImmediate*>(

@@ -4130,7 +4130,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3x2fvImmediate(

error::Error GLES2DecoderImpl::HandleUniformMatrix3x4fvImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::UniformMatrix3x4fvImmediate& c =

*static_cast<const volatile gles2::cmds::UniformMatrix3x4fvImmediate*>(

@@ -4192,7 +4192,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate(

error::Error GLES2DecoderImpl::HandleUniformMatrix4x2fvImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::UniformMatrix4x2fvImmediate& c =

*static_cast<const volatile gles2::cmds::UniformMatrix4x2fvImmediate*>(

@@ -4224,7 +4224,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4x2fvImmediate(

error::Error GLES2DecoderImpl::HandleUniformMatrix4x3fvImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::UniformMatrix4x3fvImmediate& c =

*static_cast<const volatile gles2::cmds::UniformMatrix4x3fvImmediate*>(

@@ -4417,7 +4417,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib4fvImmediate(

error::Error GLES2DecoderImpl::HandleVertexAttribI4i(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::VertexAttribI4i& c =

*static_cast<const volatile gles2::cmds::VertexAttribI4i*>(cmd_data);

@@ -4433,7 +4433,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttribI4i(

error::Error GLES2DecoderImpl::HandleVertexAttribI4ivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::VertexAttribI4ivImmediate& c =

*static_cast<const volatile gles2::cmds::VertexAttribI4ivImmediate*>(

@@ -4458,7 +4458,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttribI4ivImmediate(

error::Error GLES2DecoderImpl::HandleVertexAttribI4ui(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::VertexAttribI4ui& c =

*static_cast<const volatile gles2::cmds::VertexAttribI4ui*>(cmd_data);

@@ -4474,7 +4474,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttribI4ui(

error::Error GLES2DecoderImpl::HandleVertexAttribI4uivImmediate(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::VertexAttribI4uivImmediate& c =

*static_cast<const volatile gles2::cmds::VertexAttribI4uivImmediate*>(

@@ -4777,7 +4777,7 @@ error::Error GLES2DecoderImpl::HandleDeleteQueriesEXTImmediate(

error::Error GLES2DecoderImpl::HandleBeginTransformFeedback(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::BeginTransformFeedback& c =

*static_cast<const volatile gles2::cmds::BeginTransformFeedback*>(

@@ -4795,7 +4795,7 @@ error::Error GLES2DecoderImpl::HandleBeginTransformFeedback(

error::Error GLES2DecoderImpl::HandleEndTransformFeedback(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

DoEndTransformFeedback();

return error::kNoError;

@@ -4958,7 +4958,7 @@ error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(

error::Error GLES2DecoderImpl::HandleFlushMappedBufferRange(

uint32_t immediate_data_size,

const volatile void* cmd_data) {

- if (!unsafe_es3_apis_enabled())

+ if (!es3_apis_enabled())

return error::kUnknownCommand;

const volatile gles2::cmds::FlushMappedBufferRange& c =

*static_cast<const volatile gles2::cmds::FlushMappedBufferRange*>(