Title: [164293] trunk/Source/WebCore
- Revision
- 164293
- Author
- changseok...@collabora.com
- Date
- 2014-02-18 09:00:02 -0800 (Tue, 18 Feb 2014)
Log Message
[GTK] Unreviewed fix. Correct wrong flags, ENABLE(GTK)->PLATFORM(GTK).
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::drawArraysInstanced):
(WebCore::Extensions3DOpenGL::drawElementsInstanced):
(WebCore::Extensions3DOpenGL::vertexAttribDivisor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164292 => 164293)
--- trunk/Source/WebCore/ChangeLog 2014-02-18 16:13:23 UTC (rev 164292)
+++ trunk/Source/WebCore/ChangeLog 2014-02-18 17:00:02 UTC (rev 164293)
@@ -1,3 +1,12 @@
+2014-02-18 ChangSeok Oh <changseok...@collabora.com>
+
+ [GTK] Unreviewed fix. Correct wrong flags, ENABLE(GTK)->PLATFORM(GTK).
+
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::drawArraysInstanced):
+ (WebCore::Extensions3DOpenGL::drawElementsInstanced):
+ (WebCore::Extensions3DOpenGL::vertexAttribDivisor):
+
2014-02-18 Mihnea Ovidenie <mih...@adobe.com>
[CSSRegions] Compute region ranges for inline replaced elements
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (164292 => 164293)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-18 16:13:23 UTC (rev 164292)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-18 17:00:02 UTC (rev 164293)
@@ -238,7 +238,7 @@
void Extensions3DOpenGL::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
{
-#if ENABLE(GTK)
+#if PLATFORM(GTK)
m_context->makeContextCurrent();
::glDrawArraysInstanced(mode, first, count, primcount);
#else
@@ -251,7 +251,7 @@
void Extensions3DOpenGL::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, GC3Dsizei primcount)
{
-#if ENABLE(GTK)
+#if PLATFORM(GTK)
m_context->makeContextCurrent();
::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
#else
@@ -265,7 +265,7 @@
void Extensions3DOpenGL::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
{
-#if ENABLE(GTK)
+#if PLATFORM(GTK)
m_context->makeContextCurrent();
::glVertexAttribDivisor(index, divisor);
#else
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
