Diff
Modified: trunk/Source/WebCore/ChangeLog (222257 => 222258)
--- trunk/Source/WebCore/ChangeLog 2017-09-20 06:40:29 UTC (rev 222257)
+++ trunk/Source/WebCore/ChangeLog 2017-09-20 12:36:22 UTC (rev 222258)
@@ -1,3 +1,32 @@
+2017-09-20 Ms2ger <[email protected]>
+
+ Add bindings for optional arguments to some WebGL2 methods.
+ https://bugs.webkit.org/show_bug.cgi?id=177067
+
+ Reviewed by Antti Koivisto.
+
+ Add bindings for optional arguments to some WebGL2 methods.
+
+ No new tests: not much point in adding tests now; these methods don't
+ do anything anyway.
+
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::uniform1uiv):
+ (WebCore::WebGL2RenderingContext::uniform2uiv):
+ (WebCore::WebGL2RenderingContext::uniform3uiv):
+ (WebCore::WebGL2RenderingContext::uniform4uiv):
+ (WebCore::WebGL2RenderingContext::uniformMatrix2x3fv):
+ (WebCore::WebGL2RenderingContext::uniformMatrix3x2fv):
+ (WebCore::WebGL2RenderingContext::uniformMatrix2x4fv):
+ (WebCore::WebGL2RenderingContext::uniformMatrix4x2fv):
+ (WebCore::WebGL2RenderingContext::uniformMatrix3x4fv):
+ (WebCore::WebGL2RenderingContext::uniformMatrix4x3fv):
+ (WebCore::WebGL2RenderingContext::clearBufferiv):
+ (WebCore::WebGL2RenderingContext::clearBufferuiv):
+ (WebCore::WebGL2RenderingContext::clearBufferfv):
+ * html/canvas/WebGL2RenderingContext.h:
+ * html/canvas/WebGL2RenderingContext.idl:
+
2017-09-19 Ryosuke Niwa <[email protected]>
On Mac, dataTransfer claims to contain URL list when dropping files
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (222257 => 222258)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2017-09-20 06:40:29 UTC (rev 222257)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2017-09-20 12:36:22 UTC (rev 222258)
@@ -524,43 +524,43 @@
{
}
-void WebGL2RenderingContext::uniform1uiv(WebGLUniformLocation*, Uint32List&&)
+void WebGL2RenderingContext::uniform1uiv(WebGLUniformLocation*, Uint32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniform2uiv(WebGLUniformLocation*, Uint32List&&)
+void WebGL2RenderingContext::uniform2uiv(WebGLUniformLocation*, Uint32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniform3uiv(WebGLUniformLocation*, Uint32List&&)
+void WebGL2RenderingContext::uniform3uiv(WebGLUniformLocation*, Uint32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniform4uiv(WebGLUniformLocation*, Uint32List&&)
+void WebGL2RenderingContext::uniform4uiv(WebGLUniformLocation*, Uint32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniformMatrix2x3fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&)
+void WebGL2RenderingContext::uniformMatrix2x3fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniformMatrix3x2fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&)
+void WebGL2RenderingContext::uniformMatrix3x2fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniformMatrix2x4fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&)
+void WebGL2RenderingContext::uniformMatrix2x4fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniformMatrix4x2fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&)
+void WebGL2RenderingContext::uniformMatrix4x2fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniformMatrix3x4fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&)
+void WebGL2RenderingContext::uniformMatrix3x4fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&, GC3Duint, GC3Duint)
{
}
-void WebGL2RenderingContext::uniformMatrix4x3fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&)
+void WebGL2RenderingContext::uniformMatrix4x3fv(WebGLUniformLocation*, GC3Dboolean, Float32List&&, GC3Duint, GC3Duint)
{
}
@@ -668,7 +668,7 @@
}
}
-void WebGL2RenderingContext::clearBufferiv(GC3Denum buffer, GC3Dint drawbuffer, Int32List&&)
+void WebGL2RenderingContext::clearBufferiv(GC3Denum buffer, GC3Dint drawbuffer, Int32List&&, GC3Duint)
{
switch (buffer) {
case GraphicsContext3D::COLOR:
@@ -693,7 +693,7 @@
}
}
-void WebGL2RenderingContext::clearBufferuiv(GC3Denum buffer, GC3Dint drawbuffer, Uint32List&&)
+void WebGL2RenderingContext::clearBufferuiv(GC3Denum buffer, GC3Dint drawbuffer, Uint32List&&, GC3Duint)
{
switch (buffer) {
case GraphicsContext3D::COLOR:
@@ -712,7 +712,7 @@
}
}
-void WebGL2RenderingContext::clearBufferfv(GC3Denum buffer, GC3Dint drawbuffer, Float32List&&)
+void WebGL2RenderingContext::clearBufferfv(GC3Denum buffer, GC3Dint drawbuffer, Float32List&&, GC3Duint)
{
switch (buffer) {
case GraphicsContext3D::COLOR:
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h (222257 => 222258)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2017-09-20 06:40:29 UTC (rev 222257)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2017-09-20 12:36:22 UTC (rev 222258)
@@ -85,16 +85,16 @@
void uniform2ui(WebGLUniformLocation*, GC3Duint v0, GC3Duint v1);
void uniform3ui(WebGLUniformLocation*, GC3Duint v0, GC3Duint v1, GC3Duint v2);
void uniform4ui(WebGLUniformLocation*, GC3Duint v0, GC3Duint v1, GC3Duint v2, GC3Duint v3);
- void uniform1uiv(WebGLUniformLocation*, Uint32List&&);
- void uniform2uiv(WebGLUniformLocation*, Uint32List&& value);
- void uniform3uiv(WebGLUniformLocation*, Uint32List&& value);
- void uniform4uiv(WebGLUniformLocation*, Uint32List&& value);
- void uniformMatrix2x3fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value);
- void uniformMatrix3x2fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value);
- void uniformMatrix2x4fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value);
- void uniformMatrix4x2fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value);
- void uniformMatrix3x4fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value);
- void uniformMatrix4x3fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value);
+ void uniform1uiv(WebGLUniformLocation*, Uint32List&& data, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniform2uiv(WebGLUniformLocation*, Uint32List&& data, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniform3uiv(WebGLUniformLocation*, Uint32List&& data, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniform4uiv(WebGLUniformLocation*, Uint32List&& data, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniformMatrix2x3fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniformMatrix3x2fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniformMatrix2x4fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniformMatrix4x2fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniformMatrix3x4fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value, GC3Duint srcOffset, GC3Duint srcLength);
+ void uniformMatrix4x3fv(WebGLUniformLocation*, GC3Dboolean transpose, Float32List&& value, GC3Duint srcOffset, GC3Duint srcLength);
void vertexAttribI4i(GC3Duint index, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w);
void vertexAttribI4iv(GC3Duint index, Int32List&& v);
void vertexAttribI4ui(GC3Duint index, GC3Duint x, GC3Duint y, GC3Duint z, GC3Duint w);
@@ -110,9 +110,9 @@
// Multiple render targets
void drawBuffers(const Vector<GC3Denum>& buffers);
- void clearBufferiv(GC3Denum buffer, GC3Dint drawbuffer, Int32List&& value);
- void clearBufferuiv(GC3Denum buffer, GC3Dint drawbuffer, Uint32List&& value);
- void clearBufferfv(GC3Denum buffer, GC3Dint drawbuffer, Float32List&& value);
+ void clearBufferiv(GC3Denum buffer, GC3Dint drawbuffer, Int32List&& values, GC3Duint srcOffset);
+ void clearBufferuiv(GC3Denum buffer, GC3Dint drawbuffer, Uint32List&& values, GC3Duint srcOffset);
+ void clearBufferfv(GC3Denum buffer, GC3Dint drawbuffer, Float32List&& values, GC3Duint srcOffset);
void clearBufferfi(GC3Denum buffer, GC3Dint drawbuffer, GC3Dfloat depth, GC3Dint stencil);
// Query objects
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl (222257 => 222258)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2017-09-20 06:40:29 UTC (rev 222257)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2017-09-20 12:36:22 UTC (rev 222258)
@@ -380,16 +380,16 @@
void uniform2ui(WebGLUniformLocation? location, GLuint v0, GLuint v1);
void uniform3ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2);
void uniform4ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
- void uniform1uiv(WebGLUniformLocation? location, Uint32List data);
- void uniform2uiv(WebGLUniformLocation? location, Uint32List data);
- void uniform3uiv(WebGLUniformLocation? location, Uint32List data);
- void uniform4uiv(WebGLUniformLocation? location, Uint32List data);
- void uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
- void uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
- void uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
- void uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
- void uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
- void uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
+ void uniform1uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniform2uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniform3uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniform4uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+ void uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data, optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
void vertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w);
void vertexAttribI4iv(GLuint index, Int32List values);
void vertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
@@ -404,9 +404,9 @@
/* Multiple Render Targets */
void drawBuffers(sequence<GLenum> buffers);
- void clearBufferiv(GLenum buffer, GLint drawbuffer, Int32List values);
- void clearBufferuiv(GLenum buffer, GLint drawbuffer, Uint32List values);
- void clearBufferfv(GLenum buffer, GLint drawbuffer, Float32List values);
+ void clearBufferiv(GLenum buffer, GLint drawbuffer, Int32List values, optional GLuint srcOffset = 0);
+ void clearBufferuiv(GLenum buffer, GLint drawbuffer, Uint32List values, optional GLuint srcOffset = 0);
+ void clearBufferfv(GLenum buffer, GLint drawbuffer, Float32List values, optional GLuint srcOffset = 0);
void clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
/* Query Objects */
