| Index: gpu/command_buffer/client/gles2_implementation_impl_autogen.h
|
| diff --git a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
|
| index d7a45ce1d95cc0b9dc4d7f0bb493361af2966aa8..0572528b6e2f17c47b54fee2e217e25f3eeb6d94 100644
|
| --- a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
|
| +++ b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
|
| @@ -62,6 +62,14 @@ void GLES2Implementation::BindRenderbuffer(GLenum target, GLuint renderbuffer) {
|
| CheckGLError();
|
| }
|
|
|
| +void GLES2Implementation::BindSampler(GLuint unit, GLuint sampler) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindSampler(" << unit << ", "
|
| + << sampler << ")");
|
| + helper_->BindSampler(unit, sampler);
|
| + CheckGLError();
|
| +}
|
| +
|
| void GLES2Implementation::BindTexture(GLenum target, GLuint texture) {
|
| GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindTexture("
|
| @@ -397,6 +405,28 @@ void GLES2Implementation::DeleteRenderbuffers(GLsizei n,
|
| CheckGLError();
|
| }
|
|
|
| +void GLES2Implementation::DeleteSamplers(GLsizei n, const GLuint* samplers) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteSamplers(" << n << ", "
|
| + << static_cast<const void*>(samplers) << ")");
|
| + GPU_CLIENT_LOG_CODE_BLOCK({
|
| + for (GLsizei i = 0; i < n; ++i) {
|
| + GPU_CLIENT_LOG(" " << i << ": " << samplers[i]);
|
| + }
|
| + });
|
| + GPU_CLIENT_DCHECK_CODE_BLOCK({
|
| + for (GLsizei i = 0; i < n; ++i) {
|
| + DCHECK(samplers[i] != 0);
|
| + }
|
| + });
|
| + if (n < 0) {
|
| + SetGLError(GL_INVALID_VALUE, "glDeleteSamplers", "n < 0");
|
| + return;
|
| + }
|
| + DeleteSamplersHelper(n, samplers);
|
| + CheckGLError();
|
| +}
|
| +
|
| void GLES2Implementation::DeleteShader(GLuint shader) {
|
| GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteShader(" << shader << ")");
|
| @@ -588,6 +618,27 @@ void GLES2Implementation::GenRenderbuffers(GLsizei n, GLuint* renderbuffers) {
|
| CheckGLError();
|
| }
|
|
|
| +void GLES2Implementation::GenSamplers(GLsizei n, GLuint* samplers) {
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenSamplers(" << n << ", "
|
| + << static_cast<const void*>(samplers) << ")");
|
| + if (n < 0) {
|
| + SetGLError(GL_INVALID_VALUE, "glGenSamplers", "n < 0");
|
| + return;
|
| + }
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GetIdHandler(id_namespaces::kSamplers)->MakeIds(this, 0, n, samplers);
|
| + GenSamplersHelper(n, samplers);
|
| + helper_->GenSamplersImmediate(n, samplers);
|
| + if (share_group_->bind_generates_resource())
|
| + helper_->CommandBufferHelper::Flush();
|
| + GPU_CLIENT_LOG_CODE_BLOCK({
|
| + for (GLsizei i = 0; i < n; ++i) {
|
| + GPU_CLIENT_LOG(" " << i << ": " << samplers[i]);
|
| + }
|
| + });
|
| + CheckGLError();
|
| +}
|
| +
|
| void GLES2Implementation::GenTextures(GLsizei n, GLuint* textures) {
|
| GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenTextures(" << n << ", "
|
| << static_cast<const void*>(textures) << ")");
|
| @@ -874,6 +925,65 @@ void GLES2Implementation::GetRenderbufferParameteriv(GLenum target,
|
| });
|
| CheckGLError();
|
| }
|
| +void GLES2Implementation::GetSamplerParameterfv(GLuint sampler,
|
| + GLenum pname,
|
| + GLfloat* params) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetSamplerParameterfv("
|
| + << sampler << ", "
|
| + << GLES2Util::GetStringSamplerParameter(pname) << ", "
|
| + << static_cast<const void*>(params) << ")");
|
| + TRACE_EVENT0("gpu", "GLES2Implementation::GetSamplerParameterfv");
|
| + if (GetSamplerParameterfvHelper(sampler, pname, params)) {
|
| + return;
|
| + }
|
| + typedef cmds::GetSamplerParameterfv::Result Result;
|
| + Result* result = GetResultAs<Result*>();
|
| + if (!result) {
|
| + return;
|
| + }
|
| + result->SetNumResults(0);
|
| + helper_->GetSamplerParameterfv(sampler, pname, GetResultShmId(),
|
| + GetResultShmOffset());
|
| + WaitForCmd();
|
| + result->CopyResult(params);
|
| + GPU_CLIENT_LOG_CODE_BLOCK({
|
| + for (int32_t i = 0; i < result->GetNumResults(); ++i) {
|
| + GPU_CLIENT_LOG(" " << i << ": " << result->GetData()[i]);
|
| + }
|
| + });
|
| + CheckGLError();
|
| +}
|
| +void GLES2Implementation::GetSamplerParameteriv(GLuint sampler,
|
| + GLenum pname,
|
| + GLint* params) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetSamplerParameteriv("
|
| + << sampler << ", "
|
| + << GLES2Util::GetStringSamplerParameter(pname) << ", "
|
| + << static_cast<const void*>(params) << ")");
|
| + TRACE_EVENT0("gpu", "GLES2Implementation::GetSamplerParameteriv");
|
| + if (GetSamplerParameterivHelper(sampler, pname, params)) {
|
| + return;
|
| + }
|
| + typedef cmds::GetSamplerParameteriv::Result Result;
|
| + Result* result = GetResultAs<Result*>();
|
| + if (!result) {
|
| + return;
|
| + }
|
| + result->SetNumResults(0);
|
| + helper_->GetSamplerParameteriv(sampler, pname, GetResultShmId(),
|
| + GetResultShmOffset());
|
| + WaitForCmd();
|
| + result->CopyResult(params);
|
| + GPU_CLIENT_LOG_CODE_BLOCK({
|
| + for (int32_t i = 0; i < result->GetNumResults(); ++i) {
|
| + GPU_CLIENT_LOG(" " << i << ": " << result->GetData()[i]);
|
| + }
|
| + });
|
| + CheckGLError();
|
| +}
|
| void GLES2Implementation::GetShaderiv(GLuint shader,
|
| GLenum pname,
|
| GLint* params) {
|
| @@ -1154,6 +1264,24 @@ GLboolean GLES2Implementation::IsRenderbuffer(GLuint renderbuffer) {
|
| return result_value;
|
| }
|
|
|
| +GLboolean GLES2Implementation::IsSampler(GLuint sampler) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + TRACE_EVENT0("gpu", "GLES2Implementation::IsSampler");
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsSampler(" << sampler << ")");
|
| + typedef cmds::IsSampler::Result Result;
|
| + Result* result = GetResultAs<Result*>();
|
| + if (!result) {
|
| + return GL_FALSE;
|
| + }
|
| + *result = 0;
|
| + helper_->IsSampler(sampler, GetResultShmId(), GetResultShmOffset());
|
| + WaitForCmd();
|
| + GLboolean result_value = *result != 0;
|
| + GPU_CLIENT_LOG("returned " << result_value);
|
| + CheckGLError();
|
| + return result_value;
|
| +}
|
| +
|
| GLboolean GLES2Implementation::IsShader(GLuint shader) {
|
| GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| TRACE_EVENT0("gpu", "GLES2Implementation::IsShader");
|
| @@ -1250,6 +1378,52 @@ void GLES2Implementation::SampleCoverage(GLclampf value, GLboolean invert) {
|
| CheckGLError();
|
| }
|
|
|
| +void GLES2Implementation::SamplerParameterf(GLuint sampler,
|
| + GLenum pname,
|
| + GLfloat param) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSamplerParameterf(" << sampler
|
| + << ", " << GLES2Util::GetStringSamplerParameter(pname)
|
| + << ", " << param << ")");
|
| + helper_->SamplerParameterf(sampler, pname, param);
|
| + CheckGLError();
|
| +}
|
| +
|
| +void GLES2Implementation::SamplerParameterfv(GLuint sampler,
|
| + GLenum pname,
|
| + const GLfloat* params) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSamplerParameterfv(" << sampler
|
| + << ", " << GLES2Util::GetStringSamplerParameter(pname)
|
| + << ", " << static_cast<const void*>(params) << ")");
|
| + GPU_CLIENT_LOG("values: " << params[0]);
|
| + helper_->SamplerParameterfvImmediate(sampler, pname, params);
|
| + CheckGLError();
|
| +}
|
| +
|
| +void GLES2Implementation::SamplerParameteri(GLuint sampler,
|
| + GLenum pname,
|
| + GLint param) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSamplerParameteri(" << sampler
|
| + << ", " << GLES2Util::GetStringSamplerParameter(pname)
|
| + << ", " << param << ")");
|
| + helper_->SamplerParameteri(sampler, pname, param);
|
| + CheckGLError();
|
| +}
|
| +
|
| +void GLES2Implementation::SamplerParameteriv(GLuint sampler,
|
| + GLenum pname,
|
| + const GLint* params) {
|
| + GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| + GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSamplerParameteriv(" << sampler
|
| + << ", " << GLES2Util::GetStringSamplerParameter(pname)
|
| + << ", " << static_cast<const void*>(params) << ")");
|
| + GPU_CLIENT_LOG("values: " << params[0]);
|
| + helper_->SamplerParameterivImmediate(sampler, pname, params);
|
| + CheckGLError();
|
| +}
|
| +
|
| void GLES2Implementation::Scissor(GLint x,
|
| GLint y,
|
| GLsizei width,
|
|
|