Diff
Modified: trunk/Source/WebCore/ChangeLog (222973 => 222974)
--- trunk/Source/WebCore/ChangeLog 2017-10-06 10:16:51 UTC (rev 222973)
+++ trunk/Source/WebCore/ChangeLog 2017-10-06 10:22:37 UTC (rev 222974)
@@ -1,3 +1,20 @@
+2017-10-06 Ms2ger <ms2...@igalia.com>
+
+ Create bindings for WebGL2's versions of compressedTexImage2D.
+ https://bugs.webkit.org/show_bug.cgi?id=177481
+
+ Reviewed by Žan Doberšek.
+
+ No new tests: not much point in adding tests now; this method doesn't
+ do anything anyway.
+
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::compressedTexImage2D):
+ * html/canvas/WebGL2RenderingContext.h:
+ * html/canvas/WebGL2RenderingContext.idl:
+ * html/canvas/WebGLRenderingContext.idl:
+ * html/canvas/WebGLRenderingContextBase.idl:
+
2017-10-06 Enrique Ocaña González <eoca...@igalia.com>
[GStreamer][MSE] Likely race condition causes WTF::Deque to crash on debug
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (222973 => 222974)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2017-10-06 10:16:51 UTC (rev 222973)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2017-10-06 10:22:37 UTC (rev 222974)
@@ -495,6 +495,14 @@
{
}
+void WebGL2RenderingContext::compressedTexImage2D(GC3Denum, GC3Dint, GC3Denum, GC3Dsizei, GC3Dsizei, GC3Dint, GC3Dsizei, GC3Dint64)
+{
+}
+
+void WebGL2RenderingContext::compressedTexImage2D(GC3Denum, GC3Dint, GC3Denum, GC3Dsizei, GC3Dsizei, GC3Dint, ArrayBufferView&, GC3Duint, GC3Duint)
+{
+}
+
void WebGL2RenderingContext::compressedTexImage3D(GC3Denum, GC3Dint, GC3Denum, GC3Dsizei, GC3Dsizei, GC3Dsizei, GC3Dint, GC3Dsizei, GC3Dint64)
{
}
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h (222973 => 222974)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2017-10-06 10:16:51 UTC (rev 222973)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2017-10-06 10:22:37 UTC (rev 222974)
@@ -72,6 +72,9 @@
void texSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Denum format, GC3Denum type, TexImageSource&&);
void copyTexSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);
+
+ void compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Dsizei imageSize, GC3Dint64 offset);
+ void compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, ArrayBufferView& data, GC3Duint, GC3Duint);
void compressedTexImage3D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Dint border, GC3Dsizei imageSize, GC3Dint64 offset);
void compressedTexImage3D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Dint border, ArrayBufferView& srcData, GC3Duint srcOffset, GC3Duint srcLengthOverride);
void compressedTexSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Denum format, GC3Dsizei imageSize, RefPtr<ArrayBufferView>&& data);
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl (222973 => 222974)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2017-10-06 10:16:51 UTC (rev 222973)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2017-10-06 10:22:37 UTC (rev 222974)
@@ -370,6 +370,9 @@
void copyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+ void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, GLintptr offset);
+ void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, ArrayBufferView srcData, optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
+
void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLintptr offset);
void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, ArrayBufferView srcData, optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, ArrayBufferView? data);
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl (222973 => 222974)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl 2017-10-06 10:16:51 UTC (rev 222973)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl 2017-10-06 10:22:37 UTC (rev 222974)
@@ -23,6 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+typedef unsigned long GLenum;
+typedef long GLint;
+typedef long GLsizei;
+
[
Conditional=WEBGL,
JSCustomMarkFunction,
@@ -31,6 +35,9 @@
ExportMacro=WEBCORE_EXPORT,
CallTracingCallback=recordCanvasAction,
] interface WebGLRenderingContext {
+ // This method is placed outside of WebGLRenderingContextBase to avoid
+ // conficts with overloads in WebGL2RenderingContext.
+ void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, ArrayBufferView data);
};
WebGLRenderingContext implements WebGLRenderingContextBase;
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl (222973 => 222974)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2017-10-06 10:16:51 UTC (rev 222973)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2017-10-06 10:22:37 UTC (rev 222974)
@@ -507,8 +507,10 @@
void colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
void compileShader(WebGLShader? shader);
- void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
- GLsizei width, GLsizei height, GLint border, ArrayBufferView data);
+ // compressedTexImage2D is split between WebGLRenderingContext and
+ // WebGL2RenderingContext because the ArrayBufferView overloads are
+ // indistinguishable.
+
void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height, GLenum format, ArrayBufferView data);
