Diff
Modified: trunk/Source/WebCore/ChangeLog (181572 => 181573)
--- trunk/Source/WebCore/ChangeLog 2015-03-16 19:08:40 UTC (rev 181572)
+++ trunk/Source/WebCore/ChangeLog 2015-03-16 19:30:20 UTC (rev 181573)
@@ -1,3 +1,39 @@
+2015-03-16 Roger Fong <roger_f...@apple.com>
+
+ [WebGL2] Multiple Render Targets.
+ https://bugs.webkit.org/show_bug.cgi?id=126994.
+ <rdar://problem/15815766>
+
+ Reviewed by Dean Jackson.
+
+ Tested by a modified version of the 1.0.3 conformance test:
+ conformance/extensions/webgl-draw-buffers.html
+ This test will be landed along with other modified extension conformance tests
+ once approval from Khronos is received.
+
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::drawBuffers): Mostly the same as WebGLDrawBuffers::drawBuffersWEBGL.
+ Returns different error messages, uses non EXT enums.
+ (WebCore::WebGL2RenderingContext::clearBufferiv): This actually does nothing for now but the validation has been implemented.
+ (WebCore::WebGL2RenderingContext::clearBufferuiv): Ditto.
+ (WebCore::WebGL2RenderingContext::clearBufferfv): Ditto.
+ (WebCore::WebGL2RenderingContext::clearBufferfi): Ditto.
+ (WebCore::WebGL2RenderingContext::validateFramebufferFuncParameters): Removes the extension object check.
+ (WebCore::WebGL2RenderingContext::getMaxDrawBuffers):
+ (WebCore::WebGL2RenderingContext::getMaxColorAttachments): Must return the same thing as getMaxDrawBuffers.
+ (WebCore::WebGL2RenderingContext::getParameter): Remove extension object checks.
+ * html/canvas/WebGL2RenderingContext.h:
+ * html/canvas/WebGLFramebuffer.cpp:
+ (WebCore::WebGLFramebuffer::drawBuffersIfNecessary):
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::validateFramebufferFuncParameters): Copied from WebGLRenderingContextBase.
+ (WebCore::WebGLRenderingContext::getMaxDrawBuffers): Ditto.
+ (WebCore::WebGLRenderingContext::getMaxColorAttachments): Ditto.
+ * html/canvas/WebGLRenderingContext.h:
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::validateFramebufferFuncParameters): Deleted.
+ * html/canvas/WebGLRenderingContextBase.h:
+
2015-03-16 Dean Jackson <d...@apple.com>
Parsing and Style Resolution of Container-based Animation Triggers
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (181572 => 181573)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2015-03-16 19:08:40 UTC (rev 181572)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2015-03-16 19:30:20 UTC (rev 181573)
@@ -485,36 +485,129 @@
void WebGL2RenderingContext::drawBuffers(Vector<GC3Denum> buffers)
{
- UNUSED_PARAM(buffers);
+ if (isContextLost())
+ return;
+ GC3Dsizei n = buffers.size();
+ const GC3Denum* bufs = buffers.data();
+ if (!m_framebufferBinding) {
+ if (n != 1) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffers", "more than one buffer");
+ return;
+ }
+ if (bufs[0] != GraphicsContext3D::BACK && bufs[0] != GraphicsContext3D::NONE) {
+ synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffers", "BACK or NONE");
+ return;
+ }
+ // Because the backbuffer is simulated on all current WebKit ports, we need to change BACK to COLOR_ATTACHMENT0.
+ GC3Denum value = (bufs[0] == GraphicsContext3D::BACK) ? GraphicsContext3D::COLOR_ATTACHMENT0 : GraphicsContext3D::NONE;
+ graphicsContext3D()->getExtensions()->drawBuffersEXT(1, &value);
+ setBackDrawBuffer(bufs[0]);
+ } else {
+ if (n > getMaxDrawBuffers()) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffers", "more than max draw buffers");
+ return;
+ }
+ for (GC3Dsizei i = 0; i < n; ++i) {
+ if (bufs[i] != GraphicsContext3D::NONE && bufs[i] != static_cast<GC3Denum>(GraphicsContext3D::COLOR_ATTACHMENT0 + i)) {
+ synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffers", "COLOR_ATTACHMENTi or NONE");
+ return;
+ }
+ }
+ m_framebufferBinding->drawBuffers(buffers);
+ }
}
void WebGL2RenderingContext::clearBufferiv(GC3Denum buffer, GC3Dint drawbuffer, Int32Array* value)
{
- UNUSED_PARAM(buffer);
- UNUSED_PARAM(drawbuffer);
UNUSED_PARAM(value);
+ switch (buffer) {
+ case GraphicsContext3D::COLOR:
+ if (drawbuffer < 0 || drawbuffer >= getMaxDrawBuffers()) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "clearBufferiv", "buffer index out of range");
+ return;
+ }
+ // TODO: Call clearBufferiv, requires gl3.h and ES3/gl.h
+ break;
+ case GraphicsContext3D::STENCIL:
+ if (drawbuffer) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "clearBufferiv", "buffer index must be 0");
+ return;
+ }
+ // TODO: Call clearBufferiv, requires gl3.h and ES3/gl.h
+ break;
+ case GraphicsContext3D::DEPTH:
+ case GraphicsContext3D::DEPTH_STENCIL:
+ default:
+ synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "clearBufferiv", "buffer argument must be COLOR or STENCIL");
+ break;
+ }
}
void WebGL2RenderingContext::clearBufferuiv(GC3Denum buffer, GC3Dint drawbuffer, Uint32Array* value)
{
- UNUSED_PARAM(buffer);
- UNUSED_PARAM(drawbuffer);
UNUSED_PARAM(value);
+ switch (buffer) {
+ case GraphicsContext3D::COLOR:
+ if (drawbuffer < 0 || drawbuffer >= getMaxDrawBuffers()) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "clearBufferuiv", "buffer index out of range");
+ return;
+ }
+ // TODO: Call clearBufferuiv, requires gl3.h and ES3/gl.h
+ break;
+ case GraphicsContext3D::DEPTH:
+ case GraphicsContext3D::STENCIL:
+ case GraphicsContext3D::DEPTH_STENCIL:
+ default:
+ synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "clearBufferuiv", "buffer argument must be COLOR");
+ break;
+ }
}
void WebGL2RenderingContext::clearBufferfv(GC3Denum buffer, GC3Dint drawbuffer, Float32Array* value)
{
- UNUSED_PARAM(buffer);
- UNUSED_PARAM(drawbuffer);
UNUSED_PARAM(value);
+ switch (buffer) {
+ case GraphicsContext3D::COLOR:
+ if (drawbuffer < 0 || drawbuffer >= getMaxDrawBuffers()) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "clearBufferfv", "buffer index out of range");
+ return;
+ }
+ // TODO: Call clearBufferfv, requires gl3.h and ES3/gl.h
+ break;
+ case GraphicsContext3D::DEPTH:
+ if (drawbuffer) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "clearBufferfv", "buffer index must be 0");
+ return;
+ }
+ // TODO: Call clearBufferfv, requires gl3.h and ES3/gl.h
+ break;
+ case GraphicsContext3D::STENCIL:
+ case GraphicsContext3D::DEPTH_STENCIL:
+ default:
+ synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "clearBufferfv", "buffer argument must be COLOR OR DEPTH");
+ break;
+ }
}
void WebGL2RenderingContext::clearBufferfi(GC3Denum buffer, GC3Dint drawbuffer, GC3Dfloat depth, GC3Dint stencil)
{
- UNUSED_PARAM(buffer);
- UNUSED_PARAM(drawbuffer);
UNUSED_PARAM(depth);
UNUSED_PARAM(stencil);
+ switch (buffer) {
+ case GraphicsContext3D::DEPTH_STENCIL:
+ if (drawbuffer) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "clearBufferfv", "buffer index must be 0");
+ return;
+ }
+ // TODO: Call clearBufferfi, requires gl3.h and ES3/gl.h
+ break;
+ case GraphicsContext3D::COLOR:
+ case GraphicsContext3D::DEPTH:
+ case GraphicsContext3D::STENCIL:
+ default:
+ synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "clearBufferfv", "buffer argument must be DEPTH_STENCIL");
+ break;
+ }
}
PassRefPtr<WebGLQuery> WebGL2RenderingContext::createQuery()
@@ -1021,6 +1114,43 @@
}
}
+bool WebGL2RenderingContext::validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment)
+{
+ if (target != GraphicsContext3D::FRAMEBUFFER) {
+ synthesizeGLError(GraphicsContext3D::INVALID_ENUM, functionName, "invalid target");
+ return false;
+ }
+ switch (attachment) {
+ case GraphicsContext3D::COLOR_ATTACHMENT0:
+ case GraphicsContext3D::DEPTH_ATTACHMENT:
+ case GraphicsContext3D::STENCIL_ATTACHMENT:
+ case GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT:
+ break;
+ default:
+ if (attachment > GraphicsContext3D::COLOR_ATTACHMENT0
+ && attachment < static_cast<GC3Denum>(GraphicsContext3D::COLOR_ATTACHMENT0 + getMaxColorAttachments()))
+ break;
+ synthesizeGLError(GraphicsContext3D::INVALID_ENUM, functionName, "invalid attachment");
+ return false;
+ }
+ return true;
+}
+
+GC3Dint WebGL2RenderingContext::getMaxDrawBuffers()
+{
+ if (!m_maxDrawBuffers)
+ m_context->getIntegerv(GraphicsContext3D::MAX_DRAW_BUFFERS, &m_maxDrawBuffers);
+ return m_maxDrawBuffers;
+}
+
+GC3Dint WebGL2RenderingContext::getMaxColorAttachments()
+{
+ // DrawBuffers requires MAX_COLOR_ATTACHMENTS == MAX_DRAW_BUFFERS
+ if (!m_maxColorAttachments)
+ m_context->getIntegerv(GraphicsContext3D::MAX_DRAW_BUFFERS, &m_maxColorAttachments);
+ return m_maxColorAttachments;
+}
+
void WebGL2RenderingContext::renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height)
{
if (isContextLostOrPending())
@@ -2203,8 +2333,6 @@
return WebGLGetInfo();
}
break;
- case GraphicsContext3D::COPY_READ_BUFFER:
- case GraphicsContext3D::COPY_WRITE_BUFFER:
case GraphicsContext3D::DRAW_BUFFER0:
case GraphicsContext3D::DRAW_BUFFER1:
case GraphicsContext3D::DRAW_BUFFER2:
@@ -2220,7 +2348,16 @@
case GraphicsContext3D::DRAW_BUFFER12:
case GraphicsContext3D::DRAW_BUFFER13:
case GraphicsContext3D::DRAW_BUFFER14:
- case GraphicsContext3D::DRAW_BUFFER15:
+ case GraphicsContext3D::DRAW_BUFFER15: {
+ GC3Dint value = GraphicsContext3D::NONE;
+ if (m_framebufferBinding)
+ value = m_framebufferBinding->getDrawBuffer(pname);
+ else // emulated backbuffer
+ value = m_backDrawBuffer;
+ return WebGLGetInfo(value);
+ }
+ case GraphicsContext3D::COPY_READ_BUFFER:
+ case GraphicsContext3D::COPY_WRITE_BUFFER:
case GraphicsContext3D::PIXEL_PACK_BUFFER_BINDING:
case GraphicsContext3D::PIXEL_UNPACK_BUFFER_BINDING:
case GraphicsContext3D::READ_BUFFER:
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h (181572 => 181573)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2015-03-16 19:08:40 UTC (rev 181572)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2015-03-16 19:30:20 UTC (rev 181573)
@@ -190,6 +190,8 @@
protected:
virtual void initializeVertexArrayObjects() override;
+ virtual GC3Dint getMaxDrawBuffers() override;
+ virtual GC3Dint getMaxColorAttachments() override;
virtual bool validateIndexArrayConservative(GC3Denum type, unsigned& numElementsRequired) override;
virtual bool validateDrawElements(const char* functionName, GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, unsigned& numElements, GC3Dsizei primitiveCount) override;
virtual bool validateBlendEquation(const char* functionName, GC3Denum mode) override;
@@ -206,6 +208,7 @@
ArrayBufferView* pixels,
NullDisposition) override;
virtual bool validateCapability(const char* functionName, GC3Denum cap) override;
+ virtual bool validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment) override;
private:
GC3Denum baseInternalFormatFromInternalFormat(GC3Denum internalformat);
Modified: trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp (181572 => 181573)
--- trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2015-03-16 19:08:40 UTC (rev 181572)
+++ trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2015-03-16 19:30:20 UTC (rev 181573)
@@ -607,7 +607,7 @@
void WebGLFramebuffer::drawBuffersIfNecessary(bool force)
{
- if (!context()->m_webglDrawBuffers)
+ if (!context()->m_webglDrawBuffers && !context()->isWebGL2())
return;
bool reset = force;
// This filtering works around graphics driver bugs on Mac OS X.
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (181572 => 181573)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-03-16 19:08:40 UTC (rev 181572)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-03-16 19:30:20 UTC (rev 181573)
@@ -361,6 +361,29 @@
}
}
+bool WebGLRenderingContext::validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment)
+{
+ if (target != GraphicsContext3D::FRAMEBUFFER) {
+ synthesizeGLError(GraphicsContext3D::INVALID_ENUM, functionName, "invalid target");
+ return false;
+ }
+ switch (attachment) {
+ case GraphicsContext3D::COLOR_ATTACHMENT0:
+ case GraphicsContext3D::DEPTH_ATTACHMENT:
+ case GraphicsContext3D::STENCIL_ATTACHMENT:
+ case GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT:
+ break;
+ default:
+ if (m_webglDrawBuffers
+ && attachment > GraphicsContext3D::COLOR_ATTACHMENT0
+ && attachment < static_cast<GC3Denum>(GraphicsContext3D::COLOR_ATTACHMENT0 + getMaxColorAttachments()))
+ break;
+ synthesizeGLError(GraphicsContext3D::INVALID_ENUM, functionName, "invalid attachment");
+ return false;
+ }
+ return true;
+}
+
void WebGLRenderingContext::renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height)
{
if (isContextLostOrPending())
@@ -1113,6 +1136,27 @@
}
}
+GC3Dint WebGLRenderingContext::getMaxDrawBuffers()
+{
+ if (!supportsDrawBuffers())
+ return 0;
+ if (!m_maxDrawBuffers)
+ m_context->getIntegerv(Extensions3D::MAX_DRAW_BUFFERS_EXT, &m_maxDrawBuffers);
+ if (!m_maxColorAttachments)
+ m_context->getIntegerv(Extensions3D::MAX_COLOR_ATTACHMENTS_EXT, &m_maxColorAttachments);
+ // WEBGL_draw_buffers requires MAX_COLOR_ATTACHMENTS >= MAX_DRAW_BUFFERS.
+ return std::min(m_maxDrawBuffers, m_maxColorAttachments);
+}
+
+GC3Dint WebGLRenderingContext::getMaxColorAttachments()
+{
+ if (!supportsDrawBuffers())
+ return 0;
+ if (!m_maxColorAttachments)
+ m_context->getIntegerv(Extensions3D::MAX_COLOR_ATTACHMENTS_EXT, &m_maxColorAttachments);
+ return m_maxColorAttachments;
+}
+
bool WebGLRenderingContext::validateIndexArrayConservative(GC3Denum type, unsigned& numElementsRequired)
{
// Performs conservative validation by caching a maximum index of
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h (181572 => 181573)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2015-03-16 19:08:40 UTC (rev 181572)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2015-03-16 19:30:20 UTC (rev 181573)
@@ -42,6 +42,7 @@
virtual WebGLGetInfo getFramebufferAttachmentParameter(GC3Denum target, GC3Denum attachment, GC3Denum pname, ExceptionCode&) override;
virtual void renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height) override;
+ virtual bool validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment) override;
virtual void hint(GC3Denum target, GC3Denum mode) override;
virtual void copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border) override;
virtual void texSubImage2DBase(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum internalformat, GC3Denum format, GC3Denum type, const void* pixels, ExceptionCode&) override;
@@ -61,6 +62,8 @@
#endif
protected:
+ virtual GC3Dint getMaxDrawBuffers() override;
+ virtual GC3Dint getMaxColorAttachments() override;
virtual void initializeVertexArrayObjects() override;
virtual bool validateIndexArrayConservative(GC3Denum type, unsigned& numElementsRequired) override;
virtual bool validateDrawElements(const char* functionName, GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, unsigned& numElements, GC3Dsizei primitiveCount) override;
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (181572 => 181573)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-03-16 19:08:40 UTC (rev 181572)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-03-16 19:30:20 UTC (rev 181573)
@@ -4346,29 +4346,6 @@
canvas()->document().addConsoleMessage(MessageSource::Rendering, MessageLevel::Warning, message);
}
-bool WebGLRenderingContextBase::validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment)
-{
- if (target != GraphicsContext3D::FRAMEBUFFER) {
- synthesizeGLError(GraphicsContext3D::INVALID_ENUM, functionName, "invalid target");
- return false;
- }
- switch (attachment) {
- case GraphicsContext3D::COLOR_ATTACHMENT0:
- case GraphicsContext3D::DEPTH_ATTACHMENT:
- case GraphicsContext3D::STENCIL_ATTACHMENT:
- case GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT:
- break;
- default:
- if (m_webglDrawBuffers
- && attachment > GraphicsContext3D::COLOR_ATTACHMENT0
- && attachment < static_cast<GC3Denum>(GraphicsContext3D::COLOR_ATTACHMENT0 + getMaxColorAttachments()))
- break;
- synthesizeGLError(GraphicsContext3D::INVALID_ENUM, functionName, "invalid attachment");
- return false;
- }
- return true;
-}
-
bool WebGLRenderingContextBase::validateBlendFuncFactors(const char* functionName, GC3Denum src, GC3Denum dst)
{
if (((src == GraphicsContext3D::CONSTANT_COLOR || src == GraphicsContext3D::ONE_MINUS_CONSTANT_COLOR)
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (181572 => 181573)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2015-03-16 19:08:40 UTC (rev 181572)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2015-03-16 19:30:20 UTC (rev 181573)
@@ -566,7 +566,7 @@
bool m_hasRequestedPolicyResolution;
bool isContextLostOrPending();
- // Enabled extension objects.
+ // Enabled extension objects. FIXME: Move these to WebGL1RenderingContext, not needed for WebGL2
std::unique_ptr<EXTFragDepth> m_extFragDepth;
std::unique_ptr<EXTBlendMinMax> m_extBlendMinMax;
std::unique_ptr<EXTsRGB> m_extsRGB;
@@ -743,7 +743,7 @@
// Helper function to validate input parameters for framebuffer functions.
// Generate GL error if parameters are illegal.
- bool validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment);
+ virtual bool validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment) = 0;
// Helper function to validate blend equation mode.
virtual bool validateBlendEquation(const char* functionName, GC3Denum) = 0;
@@ -824,10 +824,8 @@
// Clamp the width and height to GL_MAX_VIEWPORT_DIMS.
IntSize clampedCanvasSize();
- // First time called, if EXT_draw_buffers is supported, query the value; otherwise return 0.
- // Later, return the cached value.
- GC3Dint getMaxDrawBuffers();
- GC3Dint getMaxColorAttachments();
+ virtual GC3Dint getMaxDrawBuffers() = 0;
+ virtual GC3Dint getMaxColorAttachments() = 0;
void setBackDrawBuffer(GC3Denum);
