PlaneType to bitmask

diff --git a/kms++/inc/kms++/plane.h b/kms++/inc/kms++/plane.h
index d50e5395c6107ffa5005ae296cce365e7176e5c5..26f3951915f06ddda63a4b632d9627757da83b0e 100644 (file)
--- a/kms++/inc/kms++/plane.h
+++ b/kms++/inc/kms++/plane.h
@@ -7,9 +7,9 @@ namespace kms
 
 enum class PlaneType
 {
-       Overlay = 0,
-       Primary = 1,
-       Cursor = 2,
+       Overlay = 1 << 0,
+       Primary = 1 << 1,
+       Cursor = 1 << 2,
 };
 
 struct PlanePriv;

diff --git a/kms++/src/plane.cpp b/kms++/src/plane.cpp
index 10aaedaf66101a0659f53bc2f752783b62adfa7a..e19910bc2258422bc90700be2583da25c7e785c4 100644 (file)
--- a/kms++/src/plane.cpp
+++ b/kms++/src/plane.cpp
@@ -50,10 +50,20 @@ bool Plane::supports_format(PixelFormat fmt) const
 
 PlaneType Plane::plane_type() const
 {
-       if (card().has_has_universal_planes())
-               return (PlaneType)get_prop_value("type");
-       else
+       if (card().has_has_universal_planes()) {
+               switch (get_prop_value("type")) {
+               case DRM_PLANE_TYPE_OVERLAY:
+                       return PlaneType::Overlay;
+               case DRM_PLANE_TYPE_PRIMARY:
+                       return PlaneType::Primary;
+               case DRM_PLANE_TYPE_CURSOR:
+                       return PlaneType::Cursor;
+               default:
+                       throw invalid_argument("Bad plane type");
+               }
+       } else {
                return PlaneType::Overlay;
+       }
 }
 
 vector<PixelFormat> Plane::get_formats() const