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 f81b56afab591ae9cb8a32e8e45f6c0d36bab92f..b7877ff3ff4efa7dd029195bc7674287f8e17d1e 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h |
@@ -80,6 +80,20 @@ error::Error GLES2DecoderImpl::HandleBindRenderbuffer( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleBindSampler(uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::BindSampler& c = |
+ *static_cast<const gles2::cmds::BindSampler*>(cmd_data); |
+ (void)c; |
+ GLuint unit = static_cast<GLuint>(c.unit); |
+ GLuint sampler = c.sampler; |
+ group_->GetSamplerServiceId(sampler, &sampler); |
+ glBindSampler(unit, sampler); |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleBindTexture(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::BindTexture& c = |
@@ -95,6 +109,21 @@ error::Error GLES2DecoderImpl::HandleBindTexture(uint32_t immediate_data_size, |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleBindTransformFeedback( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::BindTransformFeedback& c = |
+ *static_cast<const gles2::cmds::BindTransformFeedback*>(cmd_data); |
+ (void)c; |
+ GLenum target = static_cast<GLenum>(c.target); |
+ GLuint transformfeedback = c.transformfeedback; |
+ group_->GetTransformFeedbackServiceId(transformfeedback, &transformfeedback); |
+ glBindTransformFeedback(target, transformfeedback); |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleBlendColor(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::BlendColor& c = |
@@ -616,6 +645,34 @@ error::Error GLES2DecoderImpl::HandleDeleteRenderbuffersImmediate( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleDeleteSamplersImmediate( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::DeleteSamplersImmediate& c = |
+ *static_cast<const gles2::cmds::DeleteSamplersImmediate*>(cmd_data); |
+ (void)c; |
+ GLsizei n = static_cast<GLsizei>(c.n); |
+ uint32_t data_size; |
+ if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { |
+ return error::kOutOfBounds; |
+ } |
+ const GLuint* samplers = |
+ GetImmediateDataAs<const GLuint*>(c, data_size, immediate_data_size); |
+ if (samplers == NULL) { |
+ return error::kOutOfBounds; |
+ } |
+ for (GLsizei ii = 0; ii < n; ++ii) { |
+ GLuint service_id = 0; |
+ if (group_->GetSamplerServiceId(samplers[ii], &service_id)) { |
+ glDeleteSamplers(1, &service_id); |
+ group_->RemoveSamplerId(samplers[ii]); |
+ } |
+ } |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate( |
uint32_t immediate_data_size, |
const void* cmd_data) { |
@@ -636,6 +693,35 @@ error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleDeleteTransformFeedbacksImmediate( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::DeleteTransformFeedbacksImmediate& c = |
+ *static_cast<const gles2::cmds::DeleteTransformFeedbacksImmediate*>( |
+ cmd_data); |
+ (void)c; |
+ GLsizei n = static_cast<GLsizei>(c.n); |
+ uint32_t data_size; |
+ if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { |
+ return error::kOutOfBounds; |
+ } |
+ const GLuint* ids = |
+ GetImmediateDataAs<const GLuint*>(c, data_size, immediate_data_size); |
+ if (ids == NULL) { |
+ return error::kOutOfBounds; |
+ } |
+ for (GLsizei ii = 0; ii < n; ++ii) { |
+ GLuint service_id = 0; |
+ if (group_->GetTransformFeedbackServiceId(ids[ii], &service_id)) { |
+ glDeleteTransformFeedbacks(1, &service_id); |
+ group_->RemoveTransformFeedbackId(ids[ii]); |
+ } |
+ } |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleDepthFunc(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::DepthFunc& c = |
@@ -934,6 +1020,37 @@ error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleGenSamplersImmediate( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::GenSamplersImmediate& c = |
+ *static_cast<const gles2::cmds::GenSamplersImmediate*>(cmd_data); |
+ (void)c; |
+ GLsizei n = static_cast<GLsizei>(c.n); |
+ uint32_t data_size; |
+ if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { |
+ return error::kOutOfBounds; |
+ } |
+ GLuint* samplers = |
+ GetImmediateDataAs<GLuint*>(c, data_size, immediate_data_size); |
+ if (samplers == NULL) { |
+ return error::kOutOfBounds; |
+ } |
+ for (GLsizei ii = 0; ii < n; ++ii) { |
+ if (group_->GetSamplerServiceId(samplers[ii], NULL)) { |
+ return error::kInvalidArguments; |
+ } |
+ } |
+ scoped_ptr<GLuint[]> service_ids(new GLuint[n]); |
+ glGenSamplers(n, service_ids.get()); |
+ for (GLsizei ii = 0; ii < n; ++ii) { |
+ group_->AddSamplerId(samplers[ii], service_ids[ii]); |
+ } |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleGenTexturesImmediate( |
uint32_t immediate_data_size, |
const void* cmd_data) { |
@@ -956,6 +1073,37 @@ error::Error GLES2DecoderImpl::HandleGenTexturesImmediate( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleGenTransformFeedbacksImmediate( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::GenTransformFeedbacksImmediate& c = |
+ *static_cast<const gles2::cmds::GenTransformFeedbacksImmediate*>( |
+ cmd_data); |
+ (void)c; |
+ GLsizei n = static_cast<GLsizei>(c.n); |
+ uint32_t data_size; |
+ if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { |
+ return error::kOutOfBounds; |
+ } |
+ GLuint* ids = GetImmediateDataAs<GLuint*>(c, data_size, immediate_data_size); |
+ if (ids == NULL) { |
+ return error::kOutOfBounds; |
+ } |
+ for (GLsizei ii = 0; ii < n; ++ii) { |
+ if (group_->GetTransformFeedbackServiceId(ids[ii], NULL)) { |
+ return error::kInvalidArguments; |
+ } |
+ } |
+ scoped_ptr<GLuint[]> service_ids(new GLuint[n]); |
+ glGenTransformFeedbacks(n, service_ids.get()); |
+ for (GLsizei ii = 0; ii < n; ++ii) { |
+ group_->AddTransformFeedbackId(ids[ii], service_ids[ii]); |
+ } |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleGetBooleanv(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::GetBooleanv& c = |
@@ -1273,6 +1421,76 @@ error::Error GLES2DecoderImpl::HandleGetRenderbufferParameteriv( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleGetSamplerParameterfv( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::GetSamplerParameterfv& c = |
+ *static_cast<const gles2::cmds::GetSamplerParameterfv*>(cmd_data); |
+ (void)c; |
+ GLuint sampler = c.sampler; |
+ GLenum pname = static_cast<GLenum>(c.pname); |
+ typedef cmds::GetSamplerParameterfv::Result Result; |
+ GLsizei num_values = 0; |
+ GetNumValuesReturnedForGLGet(pname, &num_values); |
+ Result* result = GetSharedMemoryAs<Result*>( |
+ c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values)); |
+ GLfloat* params = result ? result->GetData() : NULL; |
+ if (params == NULL) { |
+ return error::kOutOfBounds; |
+ } |
+ LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER("GetSamplerParameterfv"); |
+ // Check that the client initialized the result. |
+ if (result->size != 0) { |
+ return error::kInvalidArguments; |
+ } |
+ group_->GetSamplerServiceId(sampler, &sampler); |
+ glGetSamplerParameterfv(sampler, pname, params); |
+ GLenum error = glGetError(); |
+ if (error == GL_NO_ERROR) { |
+ result->SetNumResults(num_values); |
+ } else { |
+ LOCAL_SET_GL_ERROR(error, "GetSamplerParameterfv", ""); |
+ } |
+ return error::kNoError; |
+} |
+ |
+error::Error GLES2DecoderImpl::HandleGetSamplerParameteriv( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::GetSamplerParameteriv& c = |
+ *static_cast<const gles2::cmds::GetSamplerParameteriv*>(cmd_data); |
+ (void)c; |
+ GLuint sampler = c.sampler; |
+ GLenum pname = static_cast<GLenum>(c.pname); |
+ typedef cmds::GetSamplerParameteriv::Result Result; |
+ GLsizei num_values = 0; |
+ GetNumValuesReturnedForGLGet(pname, &num_values); |
+ Result* result = GetSharedMemoryAs<Result*>( |
+ c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values)); |
+ GLint* params = result ? result->GetData() : NULL; |
+ if (params == NULL) { |
+ return error::kOutOfBounds; |
+ } |
+ LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER("GetSamplerParameteriv"); |
+ // Check that the client initialized the result. |
+ if (result->size != 0) { |
+ return error::kInvalidArguments; |
+ } |
+ group_->GetSamplerServiceId(sampler, &sampler); |
+ glGetSamplerParameteriv(sampler, pname, params); |
+ GLenum error = glGetError(); |
+ if (error == GL_NO_ERROR) { |
+ result->SetNumResults(num_values); |
+ } else { |
+ LOCAL_SET_GL_ERROR(error, "GetSamplerParameteriv", ""); |
+ } |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleGetShaderiv(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::GetShaderiv& c = |
@@ -1646,6 +1864,25 @@ error::Error GLES2DecoderImpl::HandleIsRenderbuffer( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleIsSampler(uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::IsSampler& c = |
+ *static_cast<const gles2::cmds::IsSampler*>(cmd_data); |
+ (void)c; |
+ GLuint sampler = c.sampler; |
+ typedef cmds::IsSampler::Result Result; |
+ Result* result_dst = GetSharedMemoryAs<Result*>( |
+ c.result_shm_id, c.result_shm_offset, sizeof(*result_dst)); |
+ if (!result_dst) { |
+ return error::kOutOfBounds; |
+ } |
+ group_->GetSamplerServiceId(sampler, &sampler); |
+ *result_dst = glIsSampler(sampler); |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleIsShader(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::IsShader& c = |
@@ -1678,6 +1915,26 @@ error::Error GLES2DecoderImpl::HandleIsTexture(uint32_t immediate_data_size, |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleIsTransformFeedback( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::IsTransformFeedback& c = |
+ *static_cast<const gles2::cmds::IsTransformFeedback*>(cmd_data); |
+ (void)c; |
+ GLuint transformfeedback = c.transformfeedback; |
+ typedef cmds::IsTransformFeedback::Result Result; |
+ Result* result_dst = GetSharedMemoryAs<Result*>( |
+ c.result_shm_id, c.result_shm_offset, sizeof(*result_dst)); |
+ if (!result_dst) { |
+ return error::kOutOfBounds; |
+ } |
+ group_->GetTransformFeedbackServiceId(transformfeedback, &transformfeedback); |
+ *result_dst = glIsTransformFeedback(transformfeedback); |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleLineWidth(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::LineWidth& c = |
@@ -1705,6 +1962,18 @@ error::Error GLES2DecoderImpl::HandleLinkProgram(uint32_t immediate_data_size, |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandlePauseTransformFeedback( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::PauseTransformFeedback& c = |
+ *static_cast<const gles2::cmds::PauseTransformFeedback*>(cmd_data); |
+ (void)c; |
+ glPauseTransformFeedback(); |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandlePolygonOffset(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::PolygonOffset& c = |
@@ -1774,6 +2043,18 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorage( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleResumeTransformFeedback( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::ResumeTransformFeedback& c = |
+ *static_cast<const gles2::cmds::ResumeTransformFeedback*>(cmd_data); |
+ (void)c; |
+ glResumeTransformFeedback(); |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleSampleCoverage( |
uint32_t immediate_data_size, |
const void* cmd_data) { |
@@ -1786,6 +2067,91 @@ error::Error GLES2DecoderImpl::HandleSampleCoverage( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleSamplerParameterf( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::SamplerParameterf& c = |
+ *static_cast<const gles2::cmds::SamplerParameterf*>(cmd_data); |
+ (void)c; |
+ GLuint sampler = c.sampler; |
+ GLenum pname = static_cast<GLenum>(c.pname); |
+ GLfloat param = static_cast<GLfloat>(c.param); |
+ group_->GetSamplerServiceId(sampler, &sampler); |
+ glSamplerParameterf(sampler, pname, param); |
+ return error::kNoError; |
+} |
+ |
+error::Error GLES2DecoderImpl::HandleSamplerParameterfvImmediate( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::SamplerParameterfvImmediate& c = |
+ *static_cast<const gles2::cmds::SamplerParameterfvImmediate*>(cmd_data); |
+ (void)c; |
+ GLuint sampler = c.sampler; |
+ GLenum pname = static_cast<GLenum>(c.pname); |
+ uint32_t data_size; |
+ if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) { |
+ return error::kOutOfBounds; |
+ } |
+ if (data_size > immediate_data_size) { |
+ return error::kOutOfBounds; |
+ } |
+ const GLfloat* params = |
+ GetImmediateDataAs<const GLfloat*>(c, data_size, immediate_data_size); |
+ if (params == NULL) { |
+ return error::kOutOfBounds; |
+ } |
+ group_->GetSamplerServiceId(sampler, &sampler); |
+ DoSamplerParameterfv(sampler, pname, params); |
+ return error::kNoError; |
+} |
+ |
+error::Error GLES2DecoderImpl::HandleSamplerParameteri( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::SamplerParameteri& c = |
+ *static_cast<const gles2::cmds::SamplerParameteri*>(cmd_data); |
+ (void)c; |
+ GLuint sampler = c.sampler; |
+ GLenum pname = static_cast<GLenum>(c.pname); |
+ GLint param = static_cast<GLint>(c.param); |
+ group_->GetSamplerServiceId(sampler, &sampler); |
+ glSamplerParameteri(sampler, pname, param); |
+ return error::kNoError; |
+} |
+ |
+error::Error GLES2DecoderImpl::HandleSamplerParameterivImmediate( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::SamplerParameterivImmediate& c = |
+ *static_cast<const gles2::cmds::SamplerParameterivImmediate*>(cmd_data); |
+ (void)c; |
+ GLuint sampler = c.sampler; |
+ GLenum pname = static_cast<GLenum>(c.pname); |
+ uint32_t data_size; |
+ if (!ComputeDataSize(1, sizeof(GLint), 1, &data_size)) { |
+ return error::kOutOfBounds; |
+ } |
+ if (data_size > immediate_data_size) { |
+ return error::kOutOfBounds; |
+ } |
+ const GLint* params = |
+ GetImmediateDataAs<const GLint*>(c, data_size, immediate_data_size); |
+ if (params == NULL) { |
+ return error::kOutOfBounds; |
+ } |
+ DoSamplerParameteriv(sampler, pname, params); |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleScissor(uint32_t immediate_data_size, |
const void* cmd_data) { |
const gles2::cmds::Scissor& c = |
@@ -3416,6 +3782,31 @@ error::Error GLES2DecoderImpl::HandleDeleteQueriesEXTImmediate( |
return error::kNoError; |
} |
+error::Error GLES2DecoderImpl::HandleBeginTransformFeedback( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::BeginTransformFeedback& c = |
+ *static_cast<const gles2::cmds::BeginTransformFeedback*>(cmd_data); |
+ (void)c; |
+ GLenum primitivemode = static_cast<GLenum>(c.primitivemode); |
+ glBeginTransformFeedback(primitivemode); |
+ return error::kNoError; |
+} |
+ |
+error::Error GLES2DecoderImpl::HandleEndTransformFeedback( |
+ uint32_t immediate_data_size, |
+ const void* cmd_data) { |
+ if (!unsafe_es3_apis_enabled()) |
+ return error::kUnknownCommand; |
+ const gles2::cmds::EndTransformFeedback& c = |
+ *static_cast<const gles2::cmds::EndTransformFeedback*>(cmd_data); |
+ (void)c; |
+ glEndTransformFeedback(); |
+ return error::kNoError; |
+} |
+ |
error::Error GLES2DecoderImpl::HandleInsertEventMarkerEXT( |
uint32_t immediate_data_size, |
const void* cmd_data) { |