Diff
Modified: trunk/Source/WebCore/ChangeLog (151965 => 151966)
--- trunk/Source/WebCore/ChangeLog 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/ChangeLog 2013-06-25 17:45:04 UTC (rev 151966)
@@ -1,3 +1,23 @@
+2013-06-25 Alex Christensen <[email protected]>
+
+ Added PLATFORM(WIN) to many places where it was missing for compiling WebGL for Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=117955
+
+ Reviewed by Brent Fulgham.
+
+ * platform/graphics/GraphicsContext3D.cpp:
+ * platform/graphics/OpenGLShims.cpp:
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp: Include new location of ShaderLang.h on Windows as of r151854.
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::createVertexArrayOES):
+ (WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
+ (WebCore::Extensions3DOpenGL::isVertexArrayOES):
+ (WebCore::Extensions3DOpenGL::bindVertexArrayOES):
+ * platform/graphics/opengl/Extensions3DOpenGL.h:
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp: Added PLATFORM(WIN) when necessary to each file.
+
2013-06-25 Bruno de Oliveira Abinader <[email protected]>
Fixes a typo in renderTextDecorationFlagsToCSSValue
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp (151965 => 151966)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp 2013-06-25 17:45:04 UTC (rev 151966)
@@ -1474,7 +1474,7 @@
}
}
-#if !PLATFORM(BLACKBERRY) && !PLATFORM(QT) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(MAC)
+#if !PLATFORM(BLACKBERRY) && !PLATFORM(QT) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(MAC) && !PLATFORM(WIN)
PlatformGraphicsContext3D GraphicsContext3D::platformGraphicsContext3D() const
{
return NullPlatformGraphicsContext3D;
Modified: trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp (151965 => 151966)
--- trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp 2013-06-25 17:45:04 UTC (rev 151966)
@@ -22,7 +22,7 @@
#define DISABLE_SHIMS
#include "OpenGLShims.h"
-#if !PLATFORM(QT)
+#if !PLATFORM(QT) && !PLATFORM(WIN)
#include <dlfcn.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (151965 => 151966)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2013-06-25 17:45:04 UTC (rev 151966)
@@ -36,12 +36,17 @@
#include "NotImplemented.h"
#include "PlatformContextCairo.h"
#include "RefPtrCairo.h"
-#include "ShaderLang.h"
#include <cairo.h>
#include <wtf/NotFound.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
+#if PLATFORM(WIN)
+#include "GLSLANG/ShaderLang.h"
+#else
+#include "ShaderLang.h"
+#endif
+
#if USE(OPENGL_ES_2)
#include "Extensions3DOpenGLES.h"
#else
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (151965 => 151966)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2013-06-25 17:45:04 UTC (rev 151966)
@@ -35,7 +35,7 @@
#if PLATFORM(MAC)
#include "ANGLE/ShaderLang.h"
#include <OpenGL/gl.h>
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT)
+#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
@@ -65,7 +65,7 @@
{
m_context->makeContextCurrent();
GLuint array = 0;
-#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL))
+#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)) || PLATFORM(WIN)
if (isVertexArrayObjectSupported())
glGenVertexArrays(1, &array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
@@ -80,7 +80,7 @@
return;
m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL))
+#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
if (isVertexArrayObjectSupported())
glDeleteVertexArrays(1, &array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
@@ -94,7 +94,7 @@
return GL_FALSE;
m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL))
+#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
if (isVertexArrayObjectSupported())
return glIsVertexArray(array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
@@ -106,7 +106,7 @@
void Extensions3DOpenGL::bindVertexArrayOES(Platform3DObject array)
{
m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL))
+#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
if (isVertexArrayObjectSupported())
glBindVertexArray(array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
@@ -205,7 +205,7 @@
return String(reinterpret_cast<const char*>(::glGetString(GL_EXTENSIONS)));
}
-#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL))
+#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
bool Extensions3DOpenGL::isVertexArrayObjectSupported()
{
static const bool supportsVertexArrayObject = supports("GL_OES_vertex_array_object");
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h (151965 => 151966)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2013-06-25 17:45:04 UTC (rev 151966)
@@ -60,7 +60,7 @@
virtual bool supportsExtension(const WTF::String&);
virtual String getExtensions();
-#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL))
+#if (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(WIN))
private:
bool isVertexArrayObjectSupported();
#endif
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (151965 => 151966)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2013-06-25 17:45:04 UTC (rev 151966)
@@ -42,7 +42,7 @@
#include <GLES2/gl2ext.h>
#elif PLATFORM(MAC)
#include <OpenGL/gl.h>
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT)
+#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (151965 => 151966)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2013-06-25 17:45:04 UTC (rev 151966)
@@ -42,7 +42,7 @@
#if PLATFORM(MAC)
#include <OpenGL/gl.h>
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT)
+#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (151965 => 151966)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2013-06-25 16:16:50 UTC (rev 151965)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2013-06-25 17:45:04 UTC (rev 151966)
@@ -59,7 +59,7 @@
#include "OpenGLESShims.h"
#elif PLATFORM(MAC)
#include <OpenGL/gl.h>
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT)
+#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(QT) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
