Diff
Modified: trunk/LayoutTests/ChangeLog (221964 => 221965)
--- trunk/LayoutTests/ChangeLog 2017-09-13 08:03:01 UTC (rev 221964)
+++ trunk/LayoutTests/ChangeLog 2017-09-13 08:04:42 UTC (rev 221965)
@@ -1,3 +1,15 @@
+2017-09-13 Ms2ger <[email protected]>
+
+ Update the type of the texture argument to framebufferTextureLayer().
+ https://bugs.webkit.org/show_bug.cgi?id=176785
+
+ Reviewed by Yusuke Suzuki.
+
+ This matches the specification as well as Gecko and Chromium.
+
+ * fast/canvas/webgl/webgl2/bindings-expected.txt:
+ * fast/canvas/webgl/webgl2/bindings.html:
+
2017-09-13 Zan Dobersek <[email protected]>
[EME] Implement CDMInstanceClearKey::updateLicense()
Modified: trunk/LayoutTests/fast/canvas/webgl/webgl2/bindings-expected.txt (221964 => 221965)
--- trunk/LayoutTests/fast/canvas/webgl/webgl2/bindings-expected.txt 2017-09-13 08:03:01 UTC (rev 221964)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl2/bindings-expected.txt 2017-09-13 08:04:42 UTC (rev 221965)
@@ -9,4 +9,5 @@
PASS uniformMatrix4x2fv with null data
PASS uniformMatrix3x4fv with null data
PASS uniformMatrix4x3fv with null data
+PASS framebufferTextureLayer with integer texture
Modified: trunk/LayoutTests/fast/canvas/webgl/webgl2/bindings.html (221964 => 221965)
--- trunk/LayoutTests/fast/canvas/webgl/webgl2/bindings.html 2017-09-13 08:03:01 UTC (rev 221964)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl2/bindings.html 2017-09-13 08:04:42 UTC (rev 221965)
@@ -20,6 +20,7 @@
for (let dim of ["2x3", "3x2", "2x4", "4x2", "3x4", "4x3"]) {
error_methods.push([`uniformMatrix${dim}fv`, [null, false, null], `uniformMatrix${dim}fv with null data`]);
}
+ error_methods.push(["framebufferTextureLayer", [0, 0, 0, 0, 0], "framebufferTextureLayer with integer texture"]);
});
for (var [method, args, name] of error_methods) {
Modified: trunk/Source/WebCore/ChangeLog (221964 => 221965)
--- trunk/Source/WebCore/ChangeLog 2017-09-13 08:03:01 UTC (rev 221964)
+++ trunk/Source/WebCore/ChangeLog 2017-09-13 08:04:42 UTC (rev 221965)
@@ -1,3 +1,22 @@
+2017-09-13 Ms2ger <[email protected]>
+
+ Update the type of the texture argument to framebufferTextureLayer().
+ https://bugs.webkit.org/show_bug.cgi?id=176785
+
+ Reviewed by Yusuke Suzuki.
+
+ This matches the specification as well as Gecko and Chromium.
+
+ Also move getInternalformatParameter() to the position it has in the
+ specification, for easier comparison.
+
+ Test: fast/canvas/webgl/webgl2/bindings.html
+
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::framebufferTextureLayer):
+ * html/canvas/WebGL2RenderingContext.h:
+ * html/canvas/WebGL2RenderingContext.idl:
+
2017-09-13 Zan Dobersek <[email protected]>
[EME] Implement CDMInstanceClearKey::updateLicense()
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (221964 => 221965)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2017-09-13 08:03:01 UTC (rev 221964)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2017-09-13 08:04:42 UTC (rev 221965)
@@ -287,7 +287,7 @@
{
}
-void WebGL2RenderingContext::framebufferTextureLayer(GC3Denum, GC3Denum, GC3Duint, GC3Dint, GC3Dint)
+void WebGL2RenderingContext::framebufferTextureLayer(GC3Denum, GC3Denum, WebGLTexture*, GC3Dint, GC3Dint)
{
}
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h (221964 => 221965)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2017-09-13 08:03:01 UTC (rev 221964)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2017-09-13 08:04:42 UTC (rev 221965)
@@ -53,7 +53,7 @@
// Framebuffer objects
WebGLAny getFramebufferAttachmentParameter(GC3Denum target, GC3Denum attachment, GC3Denum pname) final;
void blitFramebuffer(GC3Dint srcX0, GC3Dint srcY0, GC3Dint srcX1, GC3Dint srcY1, GC3Dint dstX0, GC3Dint dstY0, GC3Dint dstX1, GC3Dint dstY1, GC3Dbitfield mask, GC3Denum filter);
- void framebufferTextureLayer(GC3Denum target, GC3Denum attachment, GC3Duint texture, GC3Dint level, GC3Dint layer);
+ void framebufferTextureLayer(GC3Denum target, GC3Denum attachment, WebGLTexture*, GC3Dint level, GC3Dint layer);
WebGLAny getInternalformatParameter(GC3Denum target, GC3Denum internalformat, GC3Denum pname);
void invalidateFramebuffer(GC3Denum target, const Vector<GC3Denum>& attachments);
void invalidateSubFramebuffer(GC3Denum target, const Vector<GC3Denum>& attachments, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl (221964 => 221965)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2017-09-13 08:03:01 UTC (rev 221964)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2017-09-13 08:04:42 UTC (rev 221965)
@@ -348,13 +348,13 @@
/* Framebuffer objects */
void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
- void framebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
- [OverrideIDLType=IDLWebGLAny] any getInternalformatParameter(GLenum target, GLenum internalformat, GLenum pname);
+ void framebufferTextureLayer(GLenum target, GLenum attachment, WebGLTexture? texture, GLint level, GLint layer);
void invalidateFramebuffer(GLenum target, sequence<GLenum> attachments);
void invalidateSubFramebuffer(GLenum target, sequence<GLenum> attachments, GLint x, GLint y, GLsizei width, GLsizei height);
void readBuffer(GLenum src);
/* Renderbuffer objects */
+ [OverrideIDLType=IDLWebGLAny] any getInternalformatParameter(GLenum target, GLenum internalformat, GLenum pname);
void renderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
/* Texture objects */
