Bug 1351480 - Update calls to add_image to include the ImageData::External wrapper. r=Jerry
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 04 Apr 2017 22:46:31 -0400
changeset 351323 a0452e40488fd5f9ebf676c6b8c12797bbc4454f
parent 351322 156ad88d9cdeb03785675eadf842796c665bc9eb
child 351324 bc30dfd39568126d2675fb416f2fb26041f8a944
push id31606
push userkwierso@gmail.com
push dateWed, 05 Apr 2017 19:53:43 +0000
treeherdermozilla-central@730db8b60c1e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersJerry
bugs1351480
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1351480 - Update calls to add_image to include the ImageData::External wrapper. r=Jerry 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) {