| 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 c66a7697b112dffe5186e1476c8969da15cc8a57..a1947f4bc3c535c08b64694850718969337cb9f7 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
|
| @@ -703,9 +703,13 @@ error::Error GLES2DecoderImpl::HandleCreateProgram(uint32_t immediate_data_size,
|
| *static_cast<const gles2::cmds::CreateProgram*>(cmd_data);
|
| (void)c;
|
| uint32_t client_id = c.client_id;
|
| - if (!CreateProgramHelper(client_id)) {
|
| + if (GetProgram(client_id)) {
|
| return error::kInvalidArguments;
|
| }
|
| + GLuint service_id = glCreateProgram();
|
| + if (service_id) {
|
| + CreateProgram(client_id, service_id);
|
| + }
|
| return error::kNoError;
|
| }
|
|
|
| @@ -720,9 +724,13 @@ error::Error GLES2DecoderImpl::HandleCreateShader(uint32_t immediate_data_size,
|
| return error::kNoError;
|
| }
|
| uint32_t client_id = c.client_id;
|
| - if (!CreateShaderHelper(type, client_id)) {
|
| + if (GetShader(client_id)) {
|
| return error::kInvalidArguments;
|
| }
|
| + GLuint service_id = glCreateShader(type);
|
| + if (service_id) {
|
| + CreateShader(client_id, service_id, type);
|
| + }
|
| return error::kNoError;
|
| }
|
|
|
| @@ -831,6 +839,24 @@ error::Error GLES2DecoderImpl::HandleDeleteSamplersImmediate(
|
| return error::kNoError;
|
| }
|
|
|
| +error::Error GLES2DecoderImpl::HandleDeleteSync(uint32_t immediate_data_size,
|
| + const void* cmd_data) {
|
| + if (!unsafe_es3_apis_enabled())
|
| + return error::kUnknownCommand;
|
| + const gles2::cmds::DeleteSync& c =
|
| + *static_cast<const gles2::cmds::DeleteSync*>(cmd_data);
|
| + (void)c;
|
| + GLuint sync = c.sync;
|
| + GLsync service_id = 0;
|
| + if (group_->GetSyncServiceId(sync, &service_id)) {
|
| + glDeleteSync(service_id);
|
| + group_->RemoveSyncId(sync);
|
| + } else {
|
| + LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glDeleteSync", "unknown sync");
|
| + }
|
| + return error::kNoError;
|
| +}
|
| +
|
| error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate(
|
| uint32_t immediate_data_size,
|
| const void* cmd_data) {
|
| @@ -982,6 +1008,27 @@ error::Error GLES2DecoderImpl::HandleEnableVertexAttribArray(
|
| return error::kNoError;
|
| }
|
|
|
| +error::Error GLES2DecoderImpl::HandleFenceSync(uint32_t immediate_data_size,
|
| + const void* cmd_data) {
|
| + if (!unsafe_es3_apis_enabled())
|
| + return error::kUnknownCommand;
|
| + const gles2::cmds::FenceSync& c =
|
| + *static_cast<const gles2::cmds::FenceSync*>(cmd_data);
|
| + (void)c;
|
| + GLenum condition = static_cast<GLenum>(c.condition);
|
| + GLbitfield flags = static_cast<GLbitfield>(c.flags);
|
| + uint32_t client_id = c.client_id;
|
| + GLsync service_id = 0;
|
| + if (group_->GetSyncServiceId(client_id, &service_id)) {
|
| + return error::kInvalidArguments;
|
| + }
|
| + service_id = glFenceSync(condition, flags);
|
| + if (service_id) {
|
| + group_->AddSyncId(client_id, service_id);
|
| + }
|
| + return error::kNoError;
|
| +}
|
| +
|
| error::Error GLES2DecoderImpl::HandleFinish(uint32_t immediate_data_size,
|
| const void* cmd_data) {
|
| const gles2::cmds::Finish& c =
|
| @@ -2044,7 +2091,8 @@ error::Error GLES2DecoderImpl::HandleIsSampler(uint32_t immediate_data_size,
|
| if (!result_dst) {
|
| return error::kOutOfBounds;
|
| }
|
| - *result_dst = group_->GetSamplerServiceId(sampler, &sampler);
|
| + GLuint service_sampler = 0;
|
| + *result_dst = group_->GetSamplerServiceId(sampler, &service_sampler);
|
| return error::kNoError;
|
| }
|
|
|
| @@ -2064,6 +2112,25 @@ error::Error GLES2DecoderImpl::HandleIsShader(uint32_t immediate_data_size,
|
| return error::kNoError;
|
| }
|
|
|
| +error::Error GLES2DecoderImpl::HandleIsSync(uint32_t immediate_data_size,
|
| + const void* cmd_data) {
|
| + if (!unsafe_es3_apis_enabled())
|
| + return error::kUnknownCommand;
|
| + const gles2::cmds::IsSync& c =
|
| + *static_cast<const gles2::cmds::IsSync*>(cmd_data);
|
| + (void)c;
|
| + GLuint sync = c.sync;
|
| + typedef cmds::IsSync::Result Result;
|
| + Result* result_dst = GetSharedMemoryAs<Result*>(
|
| + c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
|
| + if (!result_dst) {
|
| + return error::kOutOfBounds;
|
| + }
|
| + GLsync service_sync = 0;
|
| + *result_dst = group_->GetSyncServiceId(sync, &service_sync);
|
| + return error::kNoError;
|
| +}
|
| +
|
| error::Error GLES2DecoderImpl::HandleIsTexture(uint32_t immediate_data_size,
|
| const void* cmd_data) {
|
| const gles2::cmds::IsTexture& c =
|
| @@ -2095,8 +2162,9 @@ error::Error GLES2DecoderImpl::HandleIsTransformFeedback(
|
| if (!result_dst) {
|
| return error::kOutOfBounds;
|
| }
|
| - *result_dst = group_->GetTransformFeedbackServiceId(transformfeedback,
|
| - &transformfeedback);
|
| + GLuint service_transformfeedback = 0;
|
| + *result_dst = group_->GetTransformFeedbackServiceId(
|
| + transformfeedback, &service_transformfeedback);
|
| return error::kNoError;
|
| }
|
|
|
|
|