| Index: gpu/blink/webgraphicscontext3d_impl.cc
|
| diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
|
| index 7a9a6205da4479b99d796cb5a66ff664f43ba5e2..eead912ca412db52be701aa397ddcec58c61d5bb 100644
|
| --- a/gpu/blink/webgraphicscontext3d_impl.cc
|
| +++ b/gpu/blink/webgraphicscontext3d_impl.cc
|
| @@ -73,127 +73,6 @@ WebGraphicsContext3DImpl::~WebGraphicsContext3DImpl() {
|
|
|
| }
|
|
|
| -bool WebGraphicsContext3DImpl::getActiveAttrib(
|
| - WebGLId program, WGC3Duint index, ActiveInfo& info) {
|
| - GLint max_name_length = -1;
|
| - gl_->GetProgramiv(
|
| - program, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &max_name_length);
|
| - // The caller already checked that there is some active attribute.
|
| - DCHECK_GT(max_name_length, 0);
|
| - scoped_ptr<GLchar[]> name(new GLchar[max_name_length]);
|
| - GLsizei length = 0;
|
| - GLint size = -1;
|
| - GLenum type = 0;
|
| - gl_->GetActiveAttrib(
|
| - program, index, max_name_length, &length, &size, &type, name.get());
|
| - if (size < 0) {
|
| - return false;
|
| - }
|
| - info.name = blink::WebString::fromUTF8(name.get(), length);
|
| - info.type = type;
|
| - info.size = size;
|
| - return true;
|
| -}
|
| -
|
| -bool WebGraphicsContext3DImpl::getActiveUniform(
|
| - WebGLId program, WGC3Duint index, ActiveInfo& info) {
|
| - GLint max_name_length = -1;
|
| - gl_->GetProgramiv(
|
| - program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &max_name_length);
|
| - // The caller already checked that there is some active uniform.
|
| - DCHECK_GT(max_name_length, 0);
|
| - scoped_ptr<GLchar[]> name(new GLchar[max_name_length]);
|
| - GLsizei length = 0;
|
| - GLint size = -1;
|
| - GLenum type = 0;
|
| - gl_->GetActiveUniform(
|
| - program, index, max_name_length, &length, &size, &type, name.get());
|
| - if (size < 0) {
|
| - return false;
|
| - }
|
| - info.name = blink::WebString::fromUTF8(name.get(), length);
|
| - info.type = type;
|
| - info.size = size;
|
| - return true;
|
| -}
|
| -
|
| -blink::WebString WebGraphicsContext3DImpl::getProgramInfoLog(
|
| - WebGLId program) {
|
| - GLint logLength = 0;
|
| - gl_->GetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
|
| - if (!logLength)
|
| - return blink::WebString();
|
| - scoped_ptr<GLchar[]> log(new GLchar[logLength]);
|
| - if (!log)
|
| - return blink::WebString();
|
| - GLsizei returnedLogLength = 0;
|
| - gl_->GetProgramInfoLog(
|
| - program, logLength, &returnedLogLength, log.get());
|
| - DCHECK_EQ(logLength, returnedLogLength + 1);
|
| - blink::WebString res =
|
| - blink::WebString::fromUTF8(log.get(), returnedLogLength);
|
| - return res;
|
| -}
|
| -
|
| -blink::WebString WebGraphicsContext3DImpl::getShaderInfoLog(
|
| - WebGLId shader) {
|
| - GLint logLength = 0;
|
| - gl_->GetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
|
| - if (!logLength)
|
| - return blink::WebString();
|
| - scoped_ptr<GLchar[]> log(new GLchar[logLength]);
|
| - if (!log)
|
| - return blink::WebString();
|
| - GLsizei returnedLogLength = 0;
|
| - gl_->GetShaderInfoLog(
|
| - shader, logLength, &returnedLogLength, log.get());
|
| - DCHECK_EQ(logLength, returnedLogLength + 1);
|
| - blink::WebString res =
|
| - blink::WebString::fromUTF8(log.get(), returnedLogLength);
|
| - return res;
|
| -}
|
| -
|
| -blink::WebString WebGraphicsContext3DImpl::getShaderSource(
|
| - WebGLId shader) {
|
| - GLint logLength = 0;
|
| - gl_->GetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &logLength);
|
| - if (!logLength)
|
| - return blink::WebString();
|
| - scoped_ptr<GLchar[]> log(new GLchar[logLength]);
|
| - if (!log)
|
| - return blink::WebString();
|
| - GLsizei returnedLogLength = 0;
|
| - gl_->GetShaderSource(
|
| - shader, logLength, &returnedLogLength, log.get());
|
| - if (!returnedLogLength)
|
| - return blink::WebString();
|
| - DCHECK_EQ(logLength, returnedLogLength + 1);
|
| - blink::WebString res =
|
| - blink::WebString::fromUTF8(log.get(), returnedLogLength);
|
| - return res;
|
| -}
|
| -
|
| -blink::WebString WebGraphicsContext3DImpl::
|
| - getTranslatedShaderSourceANGLE(WebGLId shader) {
|
| - GLint logLength = 0;
|
| - gl_->GetShaderiv(
|
| - shader, GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE, &logLength);
|
| - if (!logLength)
|
| - return blink::WebString();
|
| - scoped_ptr<GLchar[]> log(new GLchar[logLength]);
|
| - if (!log)
|
| - return blink::WebString();
|
| - GLsizei returnedLogLength = 0;
|
| - gl_->GetTranslatedShaderSourceANGLE(
|
| - shader, logLength, &returnedLogLength, log.get());
|
| - if (!returnedLogLength)
|
| - return blink::WebString();
|
| - DCHECK_EQ(logLength, returnedLogLength + 1);
|
| - blink::WebString res =
|
| - blink::WebString::fromUTF8(log.get(), returnedLogLength);
|
| - return res;
|
| -}
|
| -
|
| void WebGraphicsContext3DImpl::setErrorMessageCallback(
|
| WebGraphicsContext3D::WebGraphicsErrorMessageCallback* cb) {
|
| error_message_callback_ = cb;
|
|
|