Sync changes from mozilla-central gfx/wr

swgl/src/gl.cc

@@ -4190,7 +4190,7 @@ void UnlockResource(LockedTexture* resource) {
 void Composite(LockedTexture* lockedDst, LockedTexture* lockedSrc, GLint srcX,
                GLint srcY, GLsizei srcWidth, GLsizei srcHeight, GLint dstX,
                GLint dstY, GLsizei dstWidth, GLsizei dstHeight,
-               GLboolean opaque, GLboolean flip) {
+               GLboolean opaque, GLboolean flip, GLenum filter) {
   if (!lockedDst || !lockedSrc) {
     return;
   }
@@ -4224,7 +4224,6 @@ void Composite(LockedTexture* lockedDst, LockedTexture* lockedSrc, GLint srcX,
 
   IntRect srcReq = {srcX, srcY, srcX + srcWidth, srcY + srcHeight};
   IntRect dstReq = {dstX, dstY, dstX + dstWidth, dstY + dstHeight};
-  GLenum filter = GL_LINEAR;  // TODO
 
   if (opaque) {
     if (!srcReq.same_size(dstReq) && filter == GL_LINEAR) {

swgl/src/swgl_fns.rs

@@ -299,6 +299,7 @@ extern "C" {
         dst_height: GLsizei,
         opaque: GLboolean,
         flip: GLboolean,
+        filter: GLenum,
     );
     fn CreateContext() -> *mut c_void;
     fn ReferenceContext(ctx: *mut c_void);
@@ -2301,6 +2302,7 @@ impl LockedResource {
         dst_height: GLsizei,
         opaque: bool,
         flip: bool,
+        filter: GLenum,
     ) {
         unsafe {
             Composite(
@@ -2316,6 +2318,7 @@ impl LockedResource {
                 dst_height,
                 opaque as GLboolean,
                 flip as GLboolean,
+                filter,
             );
         }
     }