Changeset 57174 in webkit

Timestamp:

Apr 6, 2010 3:55:10 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-06 Jarkko Sakkinen <​jarkko.j.sakkinen@gmail.com>

Reviewed by Laszlo Gombos.

[Qt] WebKit does not build on Windows with --3d-canvas
​https://bugs.webkit.org/show_bug.cgi?id=37026

• platform/graphics/GraphicsContext3D.h:
• platform/graphics/qt/GraphicsContext3DQt.cpp: (WebCore::GraphicsContext3D::getActiveAttrib): (WebCore::GraphicsContext3D::getActiveUniform):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext3D.h (modified) (1 diff)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (9 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-06  Jarkko Sakkinen  <jarkko.j.sakkinen@gmail.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] WebKit does not build on Windows with --3d-canvas
+        https://bugs.webkit.org/show_bug.cgi?id=37026
+
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::getActiveAttrib):
+        (WebCore::GraphicsContext3D::getActiveUniform):
+
 2010-04-06  Abhinav Mithal <abhinav.mithal@nokia.com>
 

trunk/WebCore/platform/graphics/GraphicsContext3D.h

@@ -34 +34 @@
 
 // FIXME: Find a better way to avoid the name confliction for NO_ERROR.
-#if ((PLATFORM(CHROMIUM) && OS(WINDOWS)) || PLATFORM(WIN))
+#if ((PLATFORM(CHROMIUM) && OS(WINDOWS)) || PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)))
 #undef NO_ERROR
 #endif

trunk/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -53 +53 @@
 #endif
 
+typedef ptrdiff_t GLsizeiptrType;
+typedef ptrdiff_t GLintptrType;
+
 typedef void (APIENTRY* glActiveTextureType) (GLenum);
 typedef void (APIENTRY* glAttachShaderType) (GLuint, GLuint);
@@ -63 +66 @@
 typedef void (APIENTRY* glBlendEquationSeparateType)(GLenum, GLenum);
 typedef void (APIENTRY* glBlendFuncSeparateType)(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (APIENTRY* glBufferDataType) (GLenum, GLsizeiptr, const GLvoid*, GLenum);
-typedef void (APIENTRY* glBufferSubDataType) (GLenum, GLintptr, GLsizeiptr, const GLvoid*);
+typedef void (APIENTRY* glBufferDataType) (GLenum, GLsizeiptrType, const GLvoid*, GLenum);
+typedef void (APIENTRY* glBufferSubDataType) (GLenum, GLintptrType, GLsizeiptrType, const GLvoid*);
 typedef GLenum (APIENTRY* glCheckFramebufferStatusType) (GLenum);
 typedef void (APIENTRY* glCompileShaderType) (GLuint);
@@ -149 +152 @@
 
     bool isContextValid() { return m_contextValid; }
+
+
 
     glActiveTextureType activeTexture;
@@ -814 +819 @@
     m_internal->getProgramiv(static_cast<GLuint>(program->object()), GraphicsContext3D::ACTIVE_ATTRIBUTE_MAX_LENGTH, &maxLength);
 
-    GLchar name[maxLength]; 
+    GLchar* name = (GLchar*) fastMalloc(maxLength);
     GLsizei nameLength;
     GLint size;
@@ -821 +826 @@
     m_internal->getActiveAttrib(static_cast<GLuint>(program->object()), index, maxLength, &nameLength, &size, &type, name);
 
-    if (!nameLength)
+    if (!nameLength) {
+        fastFree(name);
         return false;
+    }
 
     info.name = String(name, nameLength);
@@ -828 +835 @@
     info.size = size;
 
+    fastFree(name);
     return true;
 }
@@ -843 +851 @@
     m_internal->getProgramiv(static_cast<GLuint>(program->object()), GraphicsContext3D::ACTIVE_UNIFORM_MAX_LENGTH, &maxLength);
 
-    GLchar name[maxLength];
+    GLchar* name = (GLchar*) fastMalloc(maxLength);
     GLsizei nameLength;
     GLint size;
@@ -850 +858 @@
     m_internal->getActiveUniform(static_cast<GLuint>(program->object()), index, maxLength, &nameLength, &size, &type, name);
 
-    if (!nameLength)
+    if (!nameLength) {
+        fastFree(name);
         return false;
+    }
 
     info.name = String(name, nameLength);
@@ -857 +867 @@
     info.size = size;
 
+    fastFree(name);
     return true;
 }