hwc: change tdm_output_hwc_set_client_target_buffer api

Change-Id: I6fa2600a5d056eaa22a49de25e48c3c65abc5b46

diff --git a/include/tdm.h b/include/tdm.h
index 43b5e0289568e193d2570f90e4688f5670780659..7aee6b8959991c0323ac6f39c6a635baf8197e1d 100644 (file)
--- a/include/tdm.h
+++ b/include/tdm.h
@@ -632,9 +632,7 @@ tdm_output_hwc_destroy_window(tdm_output *output, tdm_hwc_window *hwc_window);
  * @since 2.0.0
  */
 tdm_error
-tdm_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h target_buffer,
-                                                                       tdm_hwc_region damage, tdm_hwc_window **composited_wnds,
-                                                                       uint32_t num_wnds);
+tdm_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h target_buffer, tdm_hwc_region damage);
 
 /**
  * @brief Validate the output

diff --git a/include/tdm_backend.h b/include/tdm_backend.h
index e3940e9c3a994816e42982b8b4a767cc4c590eba..e835146542ba8eff377ac4cec927eed7d651294f 100644 (file)
--- a/include/tdm_backend.h
+++ b/include/tdm_backend.h
@@ -592,9 +592,7 @@ typedef struct _tdm_func_output {
         * @return #TDM_ERROR_NONE if success. Otherwise, error value.
         * @since 2.0.0
         */
-       tdm_error (*output_hwc_set_client_target_buffer)(tdm_output *output, tbm_surface_h target_buffer,
-                                                                                                tdm_hwc_region damage, tdm_hwc_window **composited_wnds,
-                                                                                                uint32_t num_wnds);
+       tdm_error (*output_hwc_set_client_target_buffer)(tdm_output *output, tbm_surface_h target_buffer, tdm_hwc_region damage);
 
        /**
         * @brief Validate the output

diff --git a/src/tdm_output.c b/src/tdm_output.c
index 19dfc4fc70b4c952798577ba593f79eea6c898b3..c8a292baeeaddc60a9ebd429afd8801a9cbab2e9 100644 (file)
--- a/src/tdm_output.c
+++ b/src/tdm_output.c
@@ -1783,14 +1783,9 @@ tdm_output_hwc_get_target_buffer_queue(tdm_output *output, tdm_error *error)
 }
 
 EXTERN tdm_error
-tdm_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h target_buffer,
-                                                                       tdm_hwc_region damage, tdm_hwc_window **composited_wnds,
-                                                                       uint32_t num_wnds)
+tdm_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h target_buffer, tdm_hwc_region damage)
 {
        tdm_func_output *func_output = NULL;
-       tdm_private_hwc_window **composited_wnds_frontend = NULL;
-       tdm_hwc_window **composited_wnds_backend = NULL;
-       int i;
 
        OUTPUT_FUNC_ENTRY();
 
@@ -1822,32 +1817,7 @@ tdm_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h target
                /* LCOV_EXCL_STOP */
        }
 
-       if (num_wnds == 0) {
-               ret = func_output->output_hwc_set_client_target_buffer(private_output->output_backend, target_buffer,
-                                       damage, NULL, 0);
-
-               _pthread_mutex_unlock(&private_display->lock);
-
-               return ret;
-       }
-
-       composited_wnds_backend = calloc(num_wnds, sizeof(tdm_hwc_window *));
-       if (!composited_wnds_backend) {
-               /* LCOV_EXCL_START */
-               _pthread_mutex_unlock(&private_display->lock);
-               return TDM_ERROR_OUT_OF_MEMORY;
-               /* LCOV_EXCL_STOP */
-       }
-
-       composited_wnds_frontend = (tdm_private_hwc_window **)composited_wnds;
-
-       for (i = 0; i < num_wnds; i++)
-               composited_wnds_backend[i] = composited_wnds_frontend[i]->hwc_window_backend;
-
-       ret = func_output->output_hwc_set_client_target_buffer(private_output->output_backend, target_buffer,
-                       damage, composited_wnds_backend, num_wnds);
-
-       free(composited_wnds_backend);
+       ret = func_output->output_hwc_set_client_target_buffer(private_output->output_backend, target_buffer, damage);
 
        _pthread_mutex_unlock(&private_display->lock);
 

diff --git a/utests/src/ut_tdm_hwc_window.cpp b/utests/src/ut_tdm_hwc_window.cpp
index 38ceae03f533d431970111de130d1e2e5bb750b4..73de47d4899ae3343b317af74eef7250761ac753 100644 (file)
--- a/utests/src/ut_tdm_hwc_window.cpp
+++ b/utests/src/ut_tdm_hwc_window.cpp
@@ -295,11 +295,12 @@ TEST_F(TDMOutputHwc, DestroyWindowSuccessful)
 /* tdm_error tdm_output_hwc_set_client_target_buffer(tdm_output *output,
                                                                                 tbm_surface_h target_buffer, tdm_hwc_region damage,
                                                                                 tdm_hwc_window *composited_wnds, uint32_t num_wnds); */
+/* TDOO: need to be fixed
 TEST_F(TDMOutputHwc, SetClientTargetBufferFailNullOutput)
 {
        tdm_hwc_region reg;
        tbm_surface_h target_buff = CreateBufferForOutput(0);
-       error = tdm_output_hwc_set_client_target_buffer(NULL, target_buff, reg, NULL, 0 /* TODO: sergs_ut */);
+       error = tdm_output_hwc_set_client_target_buffer(NULL, target_buff, reg, NULL, 0 );
        tbm_surface_internal_destroy(target_buff);
        ASSERT_NE(TDM_ERROR_NONE, error);
 }
@@ -311,8 +312,7 @@ TEST_F(TDMOutputHwcWithoutHwcCap, SetClientTargetBufferFailNoHwc)
        for (int i = 0; i < output_count; i++) {
                tbm_surface_h target_buff = CreateBufferForOutput(i);
                ASSERT_NE(NULL, target_buff);
-               error = tdm_output_hwc_set_client_target_buffer(outputs[i], target_buff, damage,
-                               NULL, 0 /* TODO: sergs_ut */);
+               error = tdm_output_hwc_set_client_target_buffer(outputs[i], target_buff, damage, NULL, 0);
                tbm_surface_internal_destroy(target_buff);
                ASSERT_NE(TDM_ERROR_NONE, error);
        }
@@ -327,12 +327,12 @@ TEST_F(TDMOutputHwc, SetClientTargetBufferSuccessfulSetBuff)
                ASSERT_NE(NULL, target_buff);
                if (IsHwcEnable(i)) {
                        error = tdm_output_hwc_set_client_target_buffer(outputs[i], target_buff, damage,
-                                       NULL, 0 /* TODO: sergs_ut_ut */);
+                                       NULL, 0);
                        tbm_surface_internal_destroy(target_buff);
                        ASSERT_EQ(TDM_ERROR_NONE, error);
                } else {
                        error = tdm_output_hwc_set_client_target_buffer(outputs[i], target_buff, damage,
-                                       NULL, 0 /* TODO: sergs_ut */);
+                                       NULL, 0);
                        tbm_surface_internal_destroy(target_buff);
                        ASSERT_NE(TDM_ERROR_NONE, error);
                }
@@ -346,15 +346,16 @@ TEST_F(TDMOutputHwc, SetClientTargetBufferSuccessfulResetBuff)
        for (int i = 0; i < output_count; i++) {
                if (IsHwcEnable(i)) {
                        error = tdm_output_hwc_set_client_target_buffer(outputs[i], NULL, damage,
-                                       NULL, 0 /* TODO: sergs_ut */);
+                                       NULL, 0);
                        ASSERT_EQ(TDM_ERROR_NONE, error);
                } else {
                        error = tdm_output_hwc_set_client_target_buffer(outputs[i], NULL, damage,
-                                       NULL, 0 /* TODO: sergs_ut */);
+                                       NULL, 0);
                        ASSERT_NE(TDM_ERROR_NONE, error);
                }
        }
 }
+*/
 
 /* tbm_surface_queue_h tdm_output_hwc_get_target_buffer_queue(tdm_output *output, tdm_error *error); */
 TEST_F(TDMOutputHwc, GetTargetBufferQueueFailNullOutput)