Implemented getActiveAttrib, getActiveUniform and readPixels. Removed...

webkit/api/src/GraphicsContext3D.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1281 matching lines @@
 {
     makeContextCurrent();
     if (glGenerateMipmapEXT) {
         glGenerateMipmapEXT(target);
     }
     // FIXME: provide alternative code path? This will be unpleasant
     // to implement if glGenerateMipmapEXT is not available -- it will
     // require a texture readback and re-upload.
 }
 
-bool GraphicsContext3D::getActiveAttrib(CanvasProgram*, unsigned long, ActiveInfo&)
+bool GraphicsContext3D::getActiveAttrib(CanvasProgram* program, unsigned long index, ActiveInfo& info)
 {
-    // FIXME: implement.
-    notImplemented();
-    return false;
+    if (!program)
+        return false;
+    GLint numActiveAttribs = -1;
+    glGetProgramiv(EXTRACT(program), GL_ACTIVE_ATTRIBUTES, &numActiveAttribs);
+    if (numActiveAttribs < 0)
+        return false;
+    if (index >= static_cast<GLuint>(numActiveAttribs))
+        return false;
+    GLint maxNameLength = -1;
+    glGetProgramiv(EXTRACT(program), GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &maxNameLength);
+    if (maxNameLength < 0)
+        return false;
+    GLchar* name = NULL;
+    if (!tryFastMalloc(maxNameLength * sizeof(GLchar)).getValue(name))
+        return false;
+    GLsizei length = 0;
+    GLint size = -1;
+    GLenum type = 0;
+    glGetActiveAttrib(EXTRACT(program), index, maxNameLength,
+                      &length, &size, &type, name);
+    if (size < 0) {
+        fastFree(name);
+        return false;
+    }
+    info.name = String(name, length);
+    info.type = type;
+    info.size = size;
+    fastFree(name);
+    return true;
 }
 
-bool GraphicsContext3D::getActiveUniform(CanvasProgram*, unsigned long, ActiveInfo&)
+bool GraphicsContext3D::getActiveUniform(CanvasProgram* program, unsigned long index, ActiveInfo& info)
 {
-    // FIXME: implement.
-    notImplemented();
-    return false;
+    if (!program)
+        return false;
+    GLint numActiveUniforms = -1;
+    glGetProgramiv(EXTRACT(program), GL_ACTIVE_UNIFORMS, &numActiveUniforms);
+    if (numActiveUniforms < 0)
+        return false;
+    if (index >= static_cast<GLuint>(numActiveUniforms))
+        return false;
+    GLint maxNameLength = -1;
+    glGetProgramiv(EXTRACT(program), GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxNameLength);
+    if (maxNameLength < 0)
+        return false;
+    GLchar* name = NULL;
+    if (!tryFastMalloc(maxNameLength * sizeof(GLchar)).getValue(name))
+        return false;
+    GLsizei length = 0;
+    GLint size = -1;
+    GLenum type = 0;
+    glGetActiveUniform(EXTRACT(program), index, maxNameLength,
+                       &length, &size, &type, name);
+    if (size < 0) {
+        fastFree(name);
+        return false;
+    }
+    info.name = String(name, length);
+    info.type = type;
+    info.size = size;
+    fastFree(name);
+    return true;
 }
 
 int GraphicsContext3D::getAttribLocation(CanvasProgram* program, const String& name)
 {
     if (!program)
         return -1;
 
     makeContextCurrent();
     return glGetAttribLocation(EXTRACT(program), name.utf8().data());
 }
@@ skipping 110 matching lines @@
     GLint logLength;
     glGetProgramiv(programID, GL_INFO_LOG_LENGTH, &logLength);
     if (logLength == 0)
         return String();
     GLchar* log = NULL;
     if (!tryFastMalloc(logLength * sizeof(GLchar)).getValue(log))
         return String();
     GLsizei returnedLogLength;
     glGetProgramInfoLog(programID, logLength, &returnedLogLength, log);
     ASSERT(logLength == returnedLogLength + 1);
-    String res = String::fromUTF8(log, returnedLogLength);
+    String res = String(log, returnedLogLength);
     fastFree(log);
     return res;
 }
 
 int GraphicsContext3D::getRenderbufferParameteri(unsigned long target,
                                                  unsigned long pname)
 {
     makeContextCurrent();
     GLint param;
     glGetRenderbufferParameteriv(target, pname, &param);
@@ skipping 32 matching lines @@
     GLint logLength;
     glGetShaderiv(shaderID, GL_INFO_LOG_LENGTH, &logLength);
     if (logLength == 0)
         return String();
     GLchar* log = NULL;
     if (!tryFastMalloc(logLength * sizeof(GLchar)).getValue(log))
         return String();
     GLsizei returnedLogLength;
     glGetShaderInfoLog(shaderID, logLength, &returnedLogLength, log);
     ASSERT(logLength == returnedLogLength + 1);
-    String res = String::fromUTF8(log, returnedLogLength);
+    String res = String(log, returnedLogLength);
     fastFree(log);
     return res;
 }
 
 String GraphicsContext3D::getShaderSource(CanvasShader* shader)
 {
     makeContextCurrent();
     GLuint shaderID = EXTRACT(shader);
     GLint logLength;
     glGetShaderiv(shaderID, GL_SHADER_SOURCE_LENGTH, &logLength);
     if (logLength == 0)
         return String();
     GLchar* log = NULL;
     if (!tryFastMalloc(logLength * sizeof(GLchar)).getValue(log))
         return String();
     GLsizei returnedLogLength;
     glGetShaderSource(shaderID, logLength, &returnedLogLength, log);
     ASSERT(logLength == returnedLogLength + 1);
-    String res = String::fromUTF8(log, returnedLogLength);
+    String res = String(log, returnedLogLength);
     fastFree(log);
     return res;
 }
 
 String GraphicsContext3D::getString(unsigned long name)
 {
     makeContextCurrent();
-    return String::fromUTF8(reinterpret_cast<const char*>(glGetString(name)));
+    return String(reinterpret_cast<const char*>(glGetString(name)));
 }
 
 float GraphicsContext3D::getTexParameterf(unsigned long target, unsigned long pname)
 {
     makeContextCurrent();
     if (!m_internal->validateTextureTarget(target)) {
         // FIXME: throw exception.
         return 0;
     }
 
@@ skipping 171 matching lines @@
         // exception.
         return;
     }
 
     makeContextCurrent();
     glPixelStorei(pname, param);
 }
 
 GL_SAME_METHOD_2(PolygonOffset, polygonOffset, double, double)
 
+PassRefPtr<CanvasArray> GraphicsContext3D::readPixels(long x, long y,
+                                                      unsigned long width, unsigned long height,
+                                                      unsigned long format, unsigned long type) {
+    // FIXME: support more pixel formats and types.
+    if (!((format == GL_RGBA) && (type == GL_UNSIGNED_BYTE))) {
+        return 0;
+    }
+
+    // FIXME: take into account pack alignment.
+    RefPtr<CanvasUnsignedByteArray> array = CanvasUnsignedByteArray::create(width * height * 4);
+    glReadPixels(x, y, width, height, format, type, array->baseAddress());
+    return array;
+}
+
 void GraphicsContext3D::releaseShaderCompiler()
 {
 }
 
 GL_SAME_METHOD_4(RenderbufferStorage, renderbufferStorage, unsigned long, unsigned long, unsigned long, unsigned long)
 
 GL_SAME_METHOD_2(SampleCoverage, sampleCoverage, double, bool)
 
 GL_SAME_METHOD_4(Scissor, scissor, long, long, unsigned long, unsigned long)
 
@@ skipping 455 matching lines @@
 
 void GraphicsContext3D::viewport(long x, long y, unsigned long width, unsigned long height)
 {
     makeContextCurrent();
     m_internal->viewportImpl(x, y, width, height);
 }
 
 }
 
 #endif // ENABLE(3D_CANVAS)