Doug's extract_bytes() fix

webrender/src/internal_types.rs

@@ -197,19 +197,19 @@ pub struct PackedTexel {
 
 impl PackedTexel {
     pub fn high_bytes(color: &ColorF) -> PackedTexel {
-        Self::extract_bytes(color, COLOR_FLOAT_TO_FIXED)
+        Self::extract_bytes(color, 8)
     }
 
     pub fn low_bytes(color: &ColorF) -> PackedTexel {
-        Self::extract_bytes(color, COLOR_FLOAT_TO_FIXED_WIDE)
+        Self::extract_bytes(color, 0)
     }
 
-    fn extract_bytes(color: &ColorF, multiplier: f32) -> PackedTexel {
+    fn extract_bytes(color: &ColorF, shift_by: i32) -> PackedTexel {
         PackedTexel {
-            b: ((0.5 + color.b * multiplier).floor() as u32 & 0xff) as u8,
-            g: ((0.5 + color.g * multiplier).floor() as u32 & 0xff) as u8,
-            r: ((0.5 + color.r * multiplier).floor() as u32 & 0xff) as u8,
-            a: ((0.5 + color.a * multiplier).floor() as u32 & 0xff) as u8,
+            b: ((0.5 + color.b * COLOR_FLOAT_TO_FIXED_WIDE).floor() as u32 >> shift_by & 0xff) as u8,
+            g: ((0.5 + color.g * COLOR_FLOAT_TO_FIXED_WIDE).floor() as u32 >> shift_by & 0xff) as u8,
+            r: ((0.5 + color.r * COLOR_FLOAT_TO_FIXED_WIDE).floor() as u32 >> shift_by & 0xff) as u8,
+            a: ((0.5 + color.a * COLOR_FLOAT_TO_FIXED_WIDE).floor() as u32 >> shift_by & 0xff) as u8,
         }
     }
 }