Fixed glGetActiveAttrib and glGetUniformLocation to not eagerly check...

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 1292 matching lines @@
     }
     // 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* program, unsigned long index, ActiveInfo& info)
 {
     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* program, unsigned long index, ActiveInfo& info)
 {
     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;
@@ skipping 892 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)