add tdm_caps_display

Change-Id: I2ed4f4eebf0ea8bd61abdb6766816f9f1513f075

diff --git a/include/tdm_backend.h b/include/tdm_backend.h
index 5b45a3a..f88fc93 100644 (file)
--- a/include/tdm_backend.h
+++ b/include/tdm_backend.h
@@ -46,6 +46,14 @@ extern "C" {
 
 typedef void tdm_backend_data;
 
+typedef struct _tdm_caps_display
+{
+    tdm_display_capability capabilities;
+
+    /* -1: not defined */
+    int max_layer_count;
+} tdm_caps_display;
+
 typedef struct _tdm_caps_output
 {
     tdm_output_conn_status status;
@@ -117,7 +125,7 @@ typedef struct _tdm_caps_capture
 
 typedef struct _tdm_func_display
 {
-    tdm_error    (*display_get_capabilitiy)(tdm_backend_data *bdata, tdm_display_capability *capabilities); /* init */
+    tdm_error    (*display_get_capabilitiy)(tdm_backend_data *bdata, tdm_caps_display *caps); /* init */
     tdm_error    (*display_get_pp_capability)(tdm_backend_data *bdata, tdm_caps_pp *caps); /* init */
     tdm_error    (*display_get_capture_capability)(tdm_backend_data *bdata, tdm_caps_capture *caps); /* init */
     tdm_output **(*display_get_outputs)(tdm_backend_data *bdata, int *count, tdm_error *error); /* init */

diff --git a/src/tdm.c b/src/tdm.c
index 70a3310..dbf21c6 100644 (file)
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -165,7 +165,7 @@ _tdm_display_destroy_private_display(tdm_private_display *private_display)
 
     _tdm_display_destroy_caps_pp(&private_display->caps_pp);
     _tdm_display_destroy_caps_capture(&private_display->caps_capture);
-    private_display->capabilities = 0;
+    private_display->caps_display.capabilities = 0;
 }
 
 static tdm_error
@@ -179,7 +179,7 @@ _tdm_display_update_caps_pp(tdm_private_display *private_display, tdm_caps_pp *c
     int i;
     tdm_error ret;
 
-    if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP))
+    if (!(private_display->caps_display.capabilities & TDM_DISPLAY_CAPABILITY_PP))
         return TDM_ERROR_NONE;
 
     if (!func_display->display_get_pp_capability)
@@ -218,7 +218,7 @@ _tdm_display_update_caps_capture(tdm_private_display *private_display, tdm_caps_
     int i;
     tdm_error ret;
 
-    if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE))
+    if (!(private_display->caps_display.capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE))
         return TDM_ERROR_NONE;
 
     if (!func_display->display_get_capture_capability)
@@ -536,14 +536,14 @@ _tdm_display_check_backend_functions(tdm_private_display *private_display)
     TDM_RETURN_VAL_IF_FAIL(func_display->layer_get_capability, TDM_ERROR_BAD_MODULE);
 
     ret = func_display->display_get_capabilitiy(private_display->bdata,
-                                                &private_display->capabilities);
+                                                &private_display->caps_display);
     if (ret != TDM_ERROR_NONE)
     {
         TDM_ERR("display_get_capabilitiy() failed");
         return TDM_ERROR_BAD_MODULE;
     }
 
-    if (private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP)
+    if (private_display->caps_display.capabilities & TDM_DISPLAY_CAPABILITY_PP)
     {
         tdm_func_pp *func_pp = &private_display->func_pp;
         TDM_RETURN_VAL_IF_FAIL(func_display->display_get_pp_capability, TDM_ERROR_BAD_MODULE);
@@ -553,7 +553,7 @@ _tdm_display_check_backend_functions(tdm_private_display *private_display)
         TDM_RETURN_VAL_IF_FAIL(func_pp->pp_set_done_handler, TDM_ERROR_BAD_MODULE);
     }
 
-    if (private_display->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE)
+    if (private_display->caps_display.capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE)
     {
         tdm_func_capture *func_capture = &private_display->func_capture;
         TDM_RETURN_VAL_IF_FAIL(func_display->display_get_capture_capability, TDM_ERROR_BAD_MODULE);

diff --git a/src/tdm_capture.c b/src/tdm_capture.c
index 0859f22..8e4a646 100644 (file)
--- a/src/tdm_capture.c
+++ b/src/tdm_capture.c
@@ -71,7 +71,7 @@ tdm_capture_create_output_internal(tdm_private_output *private_output, tdm_error
     func_display = &private_display->func_display;
     func_capture = &private_display->func_capture;
 
-    if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE))
+    if (!(private_display->caps_display.capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE))
     {
         TDM_ERR("no capture capability");
         if (error)
@@ -137,7 +137,7 @@ tdm_capture_create_layer_internal(tdm_private_layer *private_layer, tdm_error *e
     func_display = &private_display->func_display;
     func_capture = &private_display->func_capture;
 
-    if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE))
+    if (!(private_display->caps_display.capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE))
     {
         TDM_ERR("no capture capability");
         if (error)

diff --git a/src/tdm_display.c b/src/tdm_display.c
index 76aec3d..f7288dc 100644 (file)
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -100,7 +100,7 @@ tdm_display_get_capabilities(tdm_display *dpy, tdm_display_capability *capabilit
 
     pthread_mutex_lock(&private_display->lock);
 
-    *capabilities = private_display->capabilities;
+    *capabilities = private_display->caps_display.capabilities;
 
     pthread_mutex_unlock(&private_display->lock);
 

diff --git a/src/tdm_pp.c b/src/tdm_pp.c
index 669b271..aa9559e 100644 (file)
--- a/src/tdm_pp.c
+++ b/src/tdm_pp.c
@@ -70,7 +70,7 @@ tdm_pp_create_internal(tdm_private_display *private_display, tdm_error *error)
     func_display = &private_display->func_display;
     func_pp = &private_display->func_pp;
 
-    if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP))
+    if (!(private_display->caps_display.capabilities & TDM_DISPLAY_CAPABILITY_PP))
     {
         TDM_ERR("no pp capability");
         if (error)

diff --git a/src/tdm_private.h b/src/tdm_private.h
index bd67062..4b66770 100644 (file)
--- a/src/tdm_private.h
+++ b/src/tdm_private.h
@@ -160,7 +160,7 @@ struct _tdm_private_display
     tdm_func_capture func_capture;
 
     /* backend capability */
-    tdm_display_capability capabilities;
+    tdm_caps_display caps_display;
     tdm_caps_pp caps_pp;
     tdm_caps_capture caps_capture;