commit b8396161893350c5dc347c0cf7a32e9dbd407467
author Marissa Wall <marissaw@google.com> Thu Mar 02 22:10:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 02 22:10:28 2017 +0000
tree aa5fb6d932424a6e30ae4d00fdbd9e26951cdb9d
parent 14134818bd56da0bf23a449e1d095c6cba15d84e
parent f93cdd37b81b240144b49171ee6cd27d56e01b24

hwc2: virtual displays
am: f93cdd37b8

Change-Id: I645638bc9945c9c3fc17587022e3e02bae82966b

hwc2/hwc2.cpp

diff --git a/hwc2/hwc2.cpp b/hwc2/hwc2.cpp
index 1aadf19..838cf78 100644
--- a/hwc2/hwc2.cpp
+++ b/hwc2/hwc2.cpp
@@ -41,18 +41,19 @@
 };
 
 
-hwc2_error_t create_virtual_display(hwc2_device_t* /*device*/,
-        uint32_t /*width*/, uint32_t /*height*/,
-        android_pixel_format_t* /*format*/,
-        hwc2_display_t* /*out_display*/)
+hwc2_error_t create_virtual_display(hwc2_device_t *device, uint32_t width,
+        uint32_t height, android_pixel_format_t *format,
+        hwc2_display_t *out_display)
 {
-    return HWC2_ERROR_NONE;
+    hwc2_dev *dev = reinterpret_cast<hwc2_context *>(device)->hwc2_dev;
+    return dev->create_virtual_display(width, height, format, out_display);
 }
 
-hwc2_error_t destroy_virtual_display(hwc2_device_t* /*device*/,
-        hwc2_display_t /*display*/)
+hwc2_error_t destroy_virtual_display(hwc2_device_t *device,
+        hwc2_display_t display)
 {
-    return HWC2_ERROR_NONE;
+    hwc2_dev *dev = reinterpret_cast<hwc2_context *>(device)->hwc2_dev;
+    return dev->destroy_virtual_display(display);
 }
 
 void dump(hwc2_device_t* /*device*/, uint32_t* /*out_size*/,
@@ -61,9 +62,10 @@
     return;
 }
 
-uint32_t get_max_virtual_display_count(hwc2_device_t* /*device*/)
+uint32_t get_max_virtual_display_count(hwc2_device_t *device)
 {
-    return HWC2_ERROR_NONE;
+    hwc2_dev *dev = reinterpret_cast<hwc2_context *>(device)->hwc2_dev;
+    return dev->get_max_virtual_display_count();
 }
 
 hwc2_error_t register_callback(hwc2_device_t *device,
@@ -229,11 +231,11 @@
     return dev->set_color_transform(display, matrix, hint);
 }
 
-hwc2_error_t set_output_buffer(hwc2_device_t* /*device*/,
-        hwc2_display_t /*display*/, buffer_handle_t /*buffer*/,
-        int32_t /*release_fence*/)
+hwc2_error_t set_output_buffer(hwc2_device_t *device, hwc2_display_t display,
+        buffer_handle_t buffer, int32_t release_fence)
 {
-    return HWC2_ERROR_NONE;
+    hwc2_dev *dev = reinterpret_cast<hwc2_context *>(device)->hwc2_dev;
+    return dev->set_output_buffer(display, buffer, release_fence);
 }
 
 hwc2_error_t set_power_mode(hwc2_device_t *device, hwc2_display_t display,

hwc2/hwc2.h

diff --git a/hwc2/hwc2.h b/hwc2/hwc2.h
index 158df38..af5902a 100644
--- a/hwc2/hwc2.h
+++ b/hwc2/hwc2.h
@@ -590,6 +590,15 @@
     hwc2_error_t get_display_type(hwc2_display_t dpy_id,
                     hwc2_display_type_t *out_type) const;
 
+    /* Virtual display functions */
+    uint32_t     get_max_virtual_display_count() const;
+    hwc2_error_t create_virtual_display(uint32_t width, uint32_t height,
+                    android_pixel_format_t *format,
+                    hwc2_display_t *out_display);
+    hwc2_error_t destroy_virtual_display(hwc2_display_t dpy_id);
+    hwc2_error_t set_output_buffer(hwc2_display_t dpy_id,
+                    buffer_handle_t buffer, int32_t release_fence);
+
     /* Power modes */
     hwc2_error_t set_power_mode(hwc2_display_t dpy_id, hwc2_power_mode_t mode);
     hwc2_error_t get_doze_support(hwc2_display_t dpy_id, int32_t *out_support)

hwc2/hwc2_dev.cpp

diff --git a/hwc2/hwc2_dev.cpp b/hwc2/hwc2_dev.cpp
index c568d3e..60af4cf 100644
--- a/hwc2/hwc2_dev.cpp
+++ b/hwc2/hwc2_dev.cpp
@@ -86,6 +86,35 @@
     return HWC2_ERROR_NONE;
 }
 
+uint32_t hwc2_dev::get_max_virtual_display_count() const
+{
+    return 0;
+}
+
+hwc2_error_t hwc2_dev::create_virtual_display(uint32_t /*width*/,
+        uint32_t /*height*/, android_pixel_format_t* /*format*/,
+        hwc2_display_t* /*out_display*/)
+{
+    return HWC2_ERROR_NO_RESOURCES;
+}
+
+hwc2_error_t hwc2_dev::destroy_virtual_display(hwc2_display_t dpy_id)
+{
+    if (displays.find(dpy_id) != displays.end())
+        return HWC2_ERROR_BAD_PARAMETER;
+    else
+        return HWC2_ERROR_BAD_DISPLAY;
+}
+
+hwc2_error_t hwc2_dev::set_output_buffer(hwc2_display_t dpy_id,
+        buffer_handle_t /*buffer*/, int32_t /*release_fence*/)
+{
+    if (displays.find(dpy_id) != displays.end())
+        return HWC2_ERROR_UNSUPPORTED;
+    else
+        return HWC2_ERROR_BAD_DISPLAY;
+}
+
 hwc2_error_t hwc2_dev::set_power_mode(hwc2_display_t dpy_id,
         hwc2_power_mode_t mode)
 {