Bug 1351480 - Update calls to add_image to include the ImageData::External wrapper. r?JerryShih draft
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 03 Apr 2017 22:55:40 -0400
changeset 555327 c9c94d0f9e59dafa7a4c34f8713599382b4c20cc
parent 555326 bd368f6d9c5c4ec7b599da98bdfbbe2cf7552304
child 555328 bf20d473ae74fe55fd5bd04a7d4f0f5c5a1a06a8
push id52214
push userkgupta@mozilla.com
push dateTue, 04 Apr 2017 02:58:29 +0000
reviewersJerryShih
bugs1351480
milestone55.0a1
Bug 1351480 - Update calls to add_image to include the ImageData::External wrapper. r?JerryShih MozReview-Commit-ID: 7C1qXLtqCbG
gfx/webrender_bindings/src/bindings.rs
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -804,29 +804,35 @@ pub extern "C" fn wr_api_add_blob_image(
 #[no_mangle]
 pub extern "C" fn wr_api_add_external_image_handle(api: &mut RenderApi,
                                                    image_key: ImageKey,
                                                    descriptor: &WrImageDescriptor,
                                                    external_image_id: u64) {
     assert!(unsafe { is_in_compositor_thread() });
     api.add_image(image_key,
                   descriptor.to_descriptor(),
-                  ImageData::ExternalHandle(ExternalImageId(external_image_id)),
+                  ImageData::External(ExternalImageData {
+                      id: ExternalImageId(external_image_id),
+                      image_type: ExternalImageType::Texture2DHandle
+                  }),
                   None);
 }
 
 #[no_mangle]
 pub extern "C" fn wr_api_add_external_image_buffer(api: &mut RenderApi,
                                                    image_key: ImageKey,
                                                    descriptor: &WrImageDescriptor,
                                                    external_image_id: u64) {
     assert!(unsafe { is_in_compositor_thread() });
     api.add_image(image_key,
                   descriptor.to_descriptor(),
-                  ImageData::ExternalBuffer(ExternalImageId(external_image_id)),
+                  ImageData::External(ExternalImageData {
+                      id: ExternalImageId(external_image_id),
+                      image_type: ExternalImageType::ExternalBuffer
+                  }),
                   None);
 }
 
 #[no_mangle]
 pub extern "C" fn wr_api_update_image(api: &mut RenderApi,
                                       key: ImageKey,
                                       descriptor: &WrImageDescriptor,
                                       bytes: ByteSlice) {