Bug 1494042. Re-generate FFI header
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Wed, 26 Sep 2018 00:38:05 -0400
changeset 496733 f782eaa9521cc2e9a59e53a95d911ff44a509382
parent 496732 c897c7bab868939033aca2e473c12f46ef3f0de1
child 496734 ea3768a7ecb170cbb584fce574ffdd63bdcd3540
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1494042
milestone64.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 1494042. Re-generate FFI header
gfx/webrender_bindings/webrender_ffi_generated.h
--- a/gfx/webrender_bindings/webrender_ffi_generated.h
+++ b/gfx/webrender_bindings/webrender_ffi_generated.h
@@ -41,16 +41,17 @@ enum class BoxShadowClipMode : uint32_t 
   Inset = 1,
 
   Sentinel /* this must be last for serialization purposes. */
 };
 
 enum class Checkpoint : uint32_t {
   SceneBuilt,
   FrameBuilt,
+  FrameRendered,
   // NotificationRequests get notified with this if they get dropped without having been
   // notified. This provides the guarantee that if a request is created it will get notified.
   TransactionDropped,
 
   Sentinel /* this must be last for serialization purposes. */
 };
 
 enum class ClipMode {
@@ -99,16 +100,18 @@ enum class FontRenderMode : uint32_t {
 };
 
 // Specifies the format of a series of pixels, in driver terms.
 enum class ImageFormat : uint32_t {
   // One-channel, byte storage. The "red" doesn't map to the color
   // red per se, and is just the way that OpenGL has historically referred
   // to single-channel buffers.
   R8 = 1,
+  // One-channel, short storage
+  R16 = 2,
   // Four channels, byte storage.
   BGRA8 = 3,
   // Four channels, float storage.
   RGBAF32 = 4,
   // Two-channels, byte storage. Similar to `R8`, this just means
   // "two channels" rather than "red and green".
   RG8 = 5,
   // Four channels, signed integer storage.
@@ -496,27 +499,35 @@ struct MemoryReport {
   uintptr_t clip_stores;
   uintptr_t gpu_cache_metadata;
   uintptr_t gpu_cache_cpu_mirror;
   uintptr_t render_tasks;
   uintptr_t hit_testers;
   uintptr_t fonts;
   uintptr_t images;
   uintptr_t rasterized_blobs;
+  uintptr_t gpu_cache_textures;
+  uintptr_t vertex_data_textures;
+  uintptr_t render_target_textures;
+  uintptr_t texture_cache_textures;
 
   bool operator==(const MemoryReport& aOther) const {
     return primitive_stores == aOther.primitive_stores &&
            clip_stores == aOther.clip_stores &&
            gpu_cache_metadata == aOther.gpu_cache_metadata &&
            gpu_cache_cpu_mirror == aOther.gpu_cache_cpu_mirror &&
            render_tasks == aOther.render_tasks &&
            hit_testers == aOther.hit_testers &&
            fonts == aOther.fonts &&
            images == aOther.images &&
-           rasterized_blobs == aOther.rasterized_blobs;
+           rasterized_blobs == aOther.rasterized_blobs &&
+           gpu_cache_textures == aOther.gpu_cache_textures &&
+           vertex_data_textures == aOther.vertex_data_textures &&
+           render_target_textures == aOther.render_target_textures &&
+           texture_cache_textures == aOther.texture_cache_textures;
   }
 };
 
 template<typename T, typename U>
 struct TypedSize2D {
   T width;
   T height;
 
@@ -540,23 +551,26 @@ struct BuiltDisplayListDescriptor {
   // The second IPC time stamp: after serialization
   uint64_t builder_finish_time;
   // The third IPC time stamp: just before sending
   uint64_t send_start_time;
   // The amount of clipping nodes created while building this display list.
   uintptr_t total_clip_nodes;
   // The amount of spatial nodes created while building this display list.
   uintptr_t total_spatial_nodes;
+  // An estimate of the number of primitives that will be created by this display list.
+  uintptr_t prim_count_estimate;
 
   bool operator==(const BuiltDisplayListDescriptor& aOther) const {
     return builder_start_time == aOther.builder_start_time &&
            builder_finish_time == aOther.builder_finish_time &&
            send_start_time == aOther.send_start_time &&
            total_clip_nodes == aOther.total_clip_nodes &&
-           total_spatial_nodes == aOther.total_spatial_nodes;
+           total_spatial_nodes == aOther.total_spatial_nodes &&
+           prim_count_estimate == aOther.prim_count_estimate;
   }
 };
 
 struct WrVecU8 {
   uint8_t *data;
   uintptr_t length;
   uintptr_t capacity;