Diff
Modified: trunk/Source/Platform/ChangeLog (125579 => 125580)
--- trunk/Source/Platform/ChangeLog 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/Platform/ChangeLog 2012-08-14 17:51:48 UTC (rev 125580)
@@ -1,3 +1,20 @@
+2012-08-14 Gregg Tavares <g...@google.com>
+
+ Plumb through EXT_debug_marker entry points
+ https://bugs.webkit.org/show_bug.cgi?id=93860
+
+ Reviewed by Kenneth Russell.
+
+ insertEventMarkerEXT, pushGroupMarkerEXT, popGroupMarkerEXT are
+ all entry points exposed by the OpenGL ES EXT_debug_marker
+ extension.
+
+ * chromium/public/WebGraphicsContext3D.h:
+ (WebGraphicsContext3D):
+ (WebKit::WebGraphicsContext3D::insertEventMarkerEXT):
+ (WebKit::WebGraphicsContext3D::pushGroupMarkerEXT):
+ (WebKit::WebGraphicsContext3D::popGroupMarkerEXT):
+
2012-08-13 James Robinson <jam...@chromium.org>
[chromium] Make WebAnimation a pure virtual interface to hide implementation and avoid unresolved symbols
Modified: trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h (125579 => 125580)
--- trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h 2012-08-14 17:51:48 UTC (rev 125580)
@@ -438,6 +438,11 @@
virtual void produceTextureCHROMIUM(WGC3Denum target, const WGC3Dbyte* mailbox) { }
virtual void consumeTextureCHROMIUM(WGC3Denum target, const WGC3Dbyte* mailbox) { }
+ // GL_EXT_debug_marker
+ virtual void insertEventMarkerEXT(const WGC3Dchar* marker) { }
+ virtual void pushGroupMarkerEXT(const WGC3Dchar* marker) { }
+ virtual void popGroupMarkerEXT(void) { }
+
GrGLInterface* createGrGLInterface();
protected:
Modified: trunk/Source/WebCore/ChangeLog (125579 => 125580)
--- trunk/Source/WebCore/ChangeLog 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/ChangeLog 2012-08-14 17:51:48 UTC (rev 125580)
@@ -1,3 +1,43 @@
+2012-08-14 Gregg Tavares <g...@google.com>
+
+ Plumb through EXT_debug_marker entry points
+ https://bugs.webkit.org/show_bug.cgi?id=93860
+
+ Reviewed by Kenneth Russell.
+
+ insertEventMarkerEXT, pushGroupMarkerEXT, popGroupMarkerEXT,
+ are all entry points exposed by the OpenGL ES
+ EXT_debug_marker extension
+
+ No new tests as no new functionality exposed to web.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore):
+ (WebCore::WebGLRenderingContext::create):
+ * platform/chromium/support/Extensions3DChromium.cpp:
+ (WebCore::Extensions3DChromium::insertEventMarkerEXT):
+ (WebCore):
+ (WebCore::Extensions3DChromium::pushGroupMarkerEXT):
+ (WebCore::Extensions3DChromium::popGroupMarkerEXT):
+ * platform/graphics/Extensions3D.h:
+ (Extensions3D):
+ * platform/graphics/chromium/Extensions3DChromium.h:
+ (Extensions3DChromium):
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::insertEventMarkerEXT):
+ (WebCore):
+ (WebCore::Extensions3DOpenGL::pushGroupMarkerEXT):
+ (WebCore::Extensions3DOpenGL::popGroupMarkerEXT):
+ * platform/graphics/opengl/Extensions3DOpenGL.h:
+ (Extensions3DOpenGL):
+ * platform/graphics/opengl/Extensions3DOpenGLES.cpp:
+ (WebCore::Extensions3DOpenGLES::insertEventMarkerEXT):
+ (WebCore):
+ (WebCore::Extensions3DOpenGLES::pushGroupMarkerEXT):
+ (WebCore::Extensions3DOpenGLES::popGroupMarkerEXT):
+ * platform/graphics/opengl/Extensions3DOpenGLES.h:
+ (Extensions3DOpenGLES):
+
2012-06-24 Robert Hogan <rob...@webkit.org>
CSS 2.1 failure: Word-spacing affects each space and non-breaking space
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (125579 => 125580)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2012-08-14 17:51:48 UTC (rev 125580)
@@ -419,6 +419,10 @@
return nullptr;
}
+ Extensions3D* extensions = context->getExtensions();
+ if (extensions->supports("GL_EXT_debug_marker"))
+ extensions->pushGroupMarkerEXT("WebGLRenderingContext");
+
return adoptPtr(new WebGLRenderingContext(canvas, context, attributes));
}
Modified: trunk/Source/WebCore/platform/chromium/support/Extensions3DChromium.cpp (125579 => 125580)
--- trunk/Source/WebCore/platform/chromium/support/Extensions3DChromium.cpp 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/platform/chromium/support/Extensions3DChromium.cpp 2012-08-14 17:51:48 UTC (rev 125580)
@@ -31,6 +31,7 @@
#include "GraphicsContext3DPrivate.h"
#include "NotImplemented.h"
#include <public/WebGraphicsContext3D.h>
+#include <wtf/text/CString.h>
namespace WebCore {
@@ -197,5 +198,19 @@
notImplemented();
}
+void Extensions3DChromium::insertEventMarkerEXT(const String& marker)
+{
+ m_private->webContext()->insertEventMarkerEXT(marker.utf8().data());
+}
+void Extensions3DChromium::pushGroupMarkerEXT(const String& marker)
+{
+ m_private->webContext()->pushGroupMarkerEXT(marker.utf8().data());
+}
+
+void Extensions3DChromium::popGroupMarkerEXT(void)
+{
+ m_private->webContext()->popGroupMarkerEXT();
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/Extensions3D.h (125579 => 125580)
--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2012-08-14 17:51:48 UTC (rev 125580)
@@ -66,6 +66,7 @@
// GL_OES_compressed_ETC1_RGB8_texture
// GL_IMG_texture_compression_pvrtc
// EXT_texture_filter_anisotropic
+ // GL_EXT_debug_marker
// GL_CHROMIUM_copy_texture
// GL_CHROMIUM_flipy
@@ -182,6 +183,11 @@
virtual void readnPixelsEXT(int x, int y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, GC3Dsizei bufSize, void *data) = 0;
virtual void getnUniformfvEXT(GC3Duint program, int location, GC3Dsizei bufSize, float *params) = 0;
virtual void getnUniformivEXT(GC3Duint program, int location, GC3Dsizei bufSize, int *params) = 0;
+
+ // GL_EXT_debug_marker
+ virtual void insertEventMarkerEXT(const String&) = 0;
+ virtual void pushGroupMarkerEXT(const String&) = 0;
+ virtual void popGroupMarkerEXT(void) = 0;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h (125579 => 125580)
--- trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h 2012-08-14 17:51:48 UTC (rev 125580)
@@ -49,6 +49,7 @@
// GL_CHROMIUM_iosurface (Mac OS X specific)
// GL_CHROMIUM_command_buffer_query
// GL_ANGLE_texture_usage
+ // GL_EXT_debug_marker
// GL_EXT_texture_storage
// GL_EXT_occlusion_query_boolean
@@ -131,6 +132,11 @@
virtual void getnUniformfvEXT(GC3Duint program, int location, GC3Dsizei bufSize, float *params);
virtual void getnUniformivEXT(GC3Duint program, int location, GC3Dsizei bufSize, int *params);
+ // GL_EXT_debug_marker
+ virtual void insertEventMarkerEXT(const String&);
+ virtual void pushGroupMarkerEXT(const String&);
+ virtual void popGroupMarkerEXT(void);
+
private:
// Instances of this class are strictly owned by the GraphicsContext3D implementation and do not
// need to be instantiated by any other code.
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (125579 => 125580)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2012-08-14 17:51:48 UTC (rev 125580)
@@ -114,6 +114,24 @@
return;
}
+void Extensions3DOpenGL::insertEventMarkerEXT(const String&)
+{
+ // FIXME: implement this function and add GL_EXT_debug_marker in supports().
+ return;
+}
+
+void Extensions3DOpenGL::pushGroupMarkerEXT(const String&)
+{
+ // FIXME: implement this function and add GL_EXT_debug_marker in supports().
+ return;
+}
+
+void Extensions3DOpenGL::popGroupMarkerEXT(void)
+{
+ // FIXME: implement this function and add GL_EXT_debug_marker in supports().
+ return;
+}
+
bool Extensions3DOpenGL::supportsExtension(const String& name)
{
// GL_ANGLE_framebuffer_blit and GL_ANGLE_framebuffer_multisample are "fake". They are implemented using other
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h (125579 => 125580)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2012-08-14 17:51:48 UTC (rev 125580)
@@ -47,6 +47,9 @@
virtual GC3Dboolean isVertexArrayOES(Platform3DObject);
virtual void bindVertexArrayOES(Platform3DObject);
virtual void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum);
+ virtual void insertEventMarkerEXT(const String&);
+ virtual void pushGroupMarkerEXT(const String&);
+ virtual void popGroupMarkerEXT(void);
protected:
// This class only needs to be instantiated by GraphicsContext3D implementations.
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp (125579 => 125580)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2012-08-14 17:51:48 UTC (rev 125580)
@@ -95,6 +95,21 @@
notImplemented();
}
+void Extensions3DOpenGLES::insertEventMarkerEXT(const String&)
+{
+ notImplemented();
+}
+
+void Extensions3DOpenGLES::pushGroupMarkerEXT(const String&)
+{
+ notImplemented();
+}
+
+void Extensions3DOpenGLES::popGroupMarkerEXT(void)
+{
+ notImplemented();
+}
+
Platform3DObject Extensions3DOpenGLES::createVertexArrayOES()
{
m_context->makeContextCurrent();
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (125579 => 125580)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2012-08-14 17:46:23 UTC (rev 125579)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2012-08-14 17:51:48 UTC (rev 125580)
@@ -76,6 +76,9 @@
virtual void blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter);
virtual void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height);
virtual void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum);
+ virtual void insertEventMarkerEXT(const String&);
+ virtual void pushGroupMarkerEXT(const String&);
+ virtual void popGroupMarkerEXT(void);
virtual Platform3DObject createVertexArrayOES();
virtual void deleteVertexArrayOES(Platform3DObject);
