hwc: remove the tdm_hwc_window_set_zpos api

Change-Id: I0fcaccc7c2fd12badfc8b8bdc908de7a0c27a807

diff --git a/include/tdm.h b/include/tdm.h
index 7aee6b8959991c0323ac6f39c6a635baf8197e1d..d6bc82af630de871346b1fe848453cec14eeebd3 100644 (file)
--- a/include/tdm.h
+++ b/include/tdm.h
@@ -973,17 +973,6 @@ tdm_layer_get_buffer_flags(tdm_layer *layer, unsigned int *flags);
 tbm_surface_queue_h
 tdm_hwc_window_get_tbm_buffer_queue(tdm_hwc_window *hwc_window, tdm_error *error);
 
-/**
- * @brief Sets the desired Z order of the given window. A window with
- * a greater Z value occludes a window with a lesser Z value.
- * @param[in] hwc_window A window object
- * @param[in] z the new Z order
- * @return #TDM_ERROR_NONE if success. Otherwise, error value.
- * @since 2.0.0
- */
-tdm_error
-tdm_hwc_window_set_zpos(tdm_hwc_window *hwc_window, int32_t zpos);
-
 /**
  * @brief Sets the desired composition type of the given window.
  * @details During tdm_output_hwc_validate(), the device may request changes to

diff --git a/include/tdm_backend.h b/include/tdm_backend.h
index e835146542ba8eff377ac4cec927eed7d651294f..297c74a964184724d35bf667c4221288d9872418 100644 (file)
--- a/include/tdm_backend.h
+++ b/include/tdm_backend.h
@@ -834,15 +834,6 @@ typedef struct _tdm_func_window {
        tbm_surface_queue_h (*hwc_window_get_tbm_buffer_queue)(tdm_hwc_window *hwc_window,
                                                                                                                        tdm_error *error);
 
-       /**
-        * @brief Sets the desired Z order (height) of the given window. A window with
-        * a greater Z value occludes a window with a lesser Z value.
-        * @param[in] hwc_window A window object
-        * @param[in] z the new Z order
-        * @return #TDM_ERROR_NONE if success. Otherwise, error value.
-        */
-       tdm_error (*hwc_window_set_zpos)(tdm_hwc_window *hwc_window, int32_t zpos);
-
        /**
         * @brief Sets the desired composition type of the given window.
         * @details During output_hwc_validate(), the device may request changes to

diff --git a/src/tdm_hwc_window.c b/src/tdm_hwc_window.c
index 23c97758ec6ac9a7f35f599b1ded7eff3b2408c9..73f92c0815a0fd5d46cfbbbabf8f25137132b6d3 100644 (file)
--- a/src/tdm_hwc_window.c
+++ b/src/tdm_hwc_window.c
@@ -100,34 +100,6 @@ tdm_hwc_window_get_tbm_buffer_queue(tdm_hwc_window *hwc_window, tdm_error *error
        return queue;
 }
 
-EXTERN tdm_error
-tdm_hwc_window_set_zpos(tdm_hwc_window *hwc_window, int32_t zpos)
-{
-       tdm_func_hwc_window *func_hwc_window = NULL;
-
-       HWC_WINDOW_FUNC_ENTRY();
-
-       _pthread_mutex_lock(&private_display->lock);
-
-       func_hwc_window = &private_display->func_hwc_window;
-
-       if (!func_hwc_window->hwc_window_set_zpos) {
-               /* LCOV_EXCL_START */
-               _pthread_mutex_unlock(&private_display->lock);
-               TDM_ERR("not implemented!!");
-               return TDM_ERROR_NOT_IMPLEMENTED;
-               /* LCOV_EXCL_STOP */
-       }
-
-       ret = func_hwc_window->hwc_window_set_zpos(private_hwc_window->hwc_window_backend, zpos);
-       if (ret == TDM_ERROR_NONE)
-               private_hwc_window->zpos = zpos;
-
-       _pthread_mutex_unlock(&private_display->lock);
-
-       return ret;
-}
-
 EXTERN tdm_error
 tdm_hwc_window_set_composition_type(tdm_hwc_window *hwc_window,
                                                                        tdm_hwc_window_composition composition_type)
@@ -242,8 +214,7 @@ tdm_hwc_window_set_buffer(tdm_hwc_window *hwc_window, tbm_surface_h buffer)
                /* LCOV_EXCL_START */
                char str[TDM_PATH_LEN];
                static int i;
-               snprintf(str, TDM_PATH_LEN, "window_%d_%d_%03d",
-                                private_output->index, private_hwc_window->zpos, i++);
+               snprintf(str, TDM_PATH_LEN, "window_%d_%03d", private_output->index, i++);
                tdm_helper_dump_buffer_str(buffer, tdm_debug_dump_dir, str);
                /* LCOV_EXCL_STOP */
        }

diff --git a/utests/src/ut_tdm_hwc_window.cpp b/utests/src/ut_tdm_hwc_window.cpp
index 73de47d4899ae3343b317af74eef7250761ac753..b36b073c502156851bfe09af0b542f4731684064 100644 (file)
--- a/utests/src/ut_tdm_hwc_window.cpp
+++ b/utests/src/ut_tdm_hwc_window.cpp
@@ -447,21 +447,6 @@ TEST_F(TDMHwcWindow, GetBufferQueueSuccessful)
        }
 }
 
-/* tdm_error tdm_hwc_window_set_zpos(tdm_hwc_window *hwc_window, int32_t zpos); */
-TEST_F(TDMHwcWindow, SetZposFailNull)
-{
-       error = tdm_hwc_window_set_zpos(NULL, 1);
-       ASSERT_NE(TDM_ERROR_NONE, error);
-}
-
-TEST_F(TDMHwcWindow, SetZposSuccessful)
-{
-       for (int i = 0; i < hwc_count; i++) {
-               error = tdm_hwc_window_set_zpos(hwc_wins[i], i);
-               ASSERT_EQ(TDM_ERROR_NONE, error);
-       }
-}
-
 /* tdm_error tdm_hwc_window_set_composition_type(tdm_hwc_window *hwc_window,
                                                                        tdm_hwc_window_composition composition_type); */
 TEST_F(TDMHwcWindow, SetCompositionTypeFailNull)