Bug 1205521 - Part1: (v3) Add texture/mask attribute fields in LayerScopePacket.proto. r=dglastonbury
☠☠ backed out by 7a5670ba45ae ☠ ☠
authorJeremy Chen <jeremychen@mozilla.com>
Sun, 18 Oct 2015 20:31:00 +0200
changeset 303659 4ae51f0916616b62c3fd42dbe5d0254f7ba35b25
parent 303658 11e681d48acde9fb42dd1d564a8136539d7cd4e8
child 303660 1ff444636fbdfeba0e51a6f26e977fcdbc9bc1ca
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdglastonbury
bugs1205521
milestone44.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 1205521 - Part1: (v3) Add texture/mask attribute fields in LayerScopePacket.proto. r=dglastonbury
gfx/layers/protobuf/LayerScopePacket.proto
--- a/gfx/layers/protobuf/LayerScopePacket.proto
+++ b/gfx/layers/protobuf/LayerScopePacket.proto
@@ -15,33 +15,61 @@ message FramePacket {
 message ColorPacket {
   required uint64 layerref = 1;
   optional uint32 width = 2;
   optional uint32 height = 3;
   optional uint32 color = 4;
 }
 
 message TexturePacket {
+  enum Filter {
+    GOOD = 0;
+    LINEAR = 1;
+    POINT = 2;
+  }
+  message Rect {
+    optional float x = 1;
+    optional float y = 2;
+    optional float w = 3;
+    optional float h = 4;
+  }
+  message Size {
+    optional int32 w = 1;
+    optional int32 h = 2;
+  }
+  message Matrix {
+    optional bool is2D = 1;
+    optional bool isId = 2;
+    repeated float m = 3;
+  }
+  message EffectMask {
+    optional bool mIs3D = 1;
+    optional Size mSize = 2;
+    optional Matrix mMaskTransform = 3;
+  }
+
   // Basic info
   required uint64 layerref = 1;
   optional uint32 width = 2;
   optional uint32 height = 3;
   optional uint32 stride = 4;
   optional uint32 name = 5;
   optional uint32 target = 6;
   optional uint32 dataformat = 7;
   optional uint64 glcontext = 8;
   optional bytes data = 9;
 
-  // Texture effect attributes (10 to 19)
-  // TODO: reserved for primary textured effect attributes, see Bug 1205521
+  // TextureEffect attributes
+  optional Rect mTextureCoords = 10;
+  optional bool mPremultiplied = 11;
+  optional Filter mFilter = 12;
 
-  // Mask effect attributes (20 to 29)
+  // Mask attributes
   optional bool isMask = 20;
-  // TODO: reserved for secondary mask effect attributes, see Bug 1205521
+  optional EffectMask mask = 21;
 }
 
 message LayersPacket {
   message Layer {
     enum LayerType {
       UnknownLayer = 0;
       LayerManager = 1;
       ContainerLayer = 2;