diff --git a/DrmHwcTwo.h b/DrmHwcTwo.h
index 111c664..807ad25 100644
--- a/DrmHwcTwo.h
+++ b/DrmHwcTwo.h
@@ -143,7 +143,8 @@
     hwc_color_t layer_color_;
     HWC2::Transform transform_ = HWC2::Transform::None;
     uint32_t z_order_ = 0;
-    android_dataspace_t dataspace_ = HAL_DATASPACE_UNKNOWN;
+    DrmHwcColorSpace color_space_ = DrmHwcColorSpace::kUndefined;
+    DrmHwcSampleRange sample_range_ = DrmHwcSampleRange::kUndefined;
   };
 
   class HwcDisplay {