hwc: change the name from the zpos to the lzpos

Change-Id: I0daf7ce1ca02dd7edd232b30d2f25b7fe17abe87

diff --git a/src/tdm_sprd.h b/src/tdm_sprd.h
index 4af66a8..0e318c4 100644 (file)
--- a/src/tdm_sprd.h
+++ b/src/tdm_sprd.h
@@ -272,7 +272,7 @@ struct _tdm_sprd_hwc_window_data {
        tdm_hwc_window_composition client_type;    /* composition type set by client(compositor) */
 
        tdm_hwc_window_composition validated_type; /* composition type after validation */
-       int zpos;                                  /* layer's zpos to be assigned after validation */
+       int lzpos;                                  /* layer's zpos to be assigned after validation */
 
        int constraints;
        tbm_surface_queue_h tqueue;

diff --git a/src/tdm_sprd_hwc.c b/src/tdm_sprd_hwc.c
index a164515..68e32e8 100644 (file)
--- a/src/tdm_sprd_hwc.c
+++ b/src/tdm_sprd_hwc.c
@@ -46,7 +46,7 @@ _print_validate_result(tdm_sprd_hwc_data *hwc_data, tdm_hwc_window **composited_
                                TDM_DBG(" window(%p) %s -> %s : lzpos(%d) on TARGET WINDOW", hwc_window_data,
                                                _comp_to_str(hwc_window_data->client_type),
                                                _comp_to_str(hwc_window_data->validated_type),
-                                           hwc_data->target_hwc_window->zpos);
+                                           hwc_data->target_hwc_window->lzpos);
                                break;
                        case TDM_HWC_WIN_COMPOSITION_DEVICE:
                        case TDM_HWC_WIN_COMPOSITION_VIDEO:
@@ -55,7 +55,7 @@ _print_validate_result(tdm_sprd_hwc_data *hwc_data, tdm_hwc_window **composited_
                                TDM_DBG(" window(%p) %s -> %s : lzpos(%d)", hwc_window_data,
                                                _comp_to_str(hwc_window_data->client_type),
                                                _comp_to_str(hwc_window_data->validated_type),
-                                           hwc_window_data->zpos);
+                                           hwc_window_data->lzpos);
                                break;
                        default:
                                break;
@@ -172,7 +172,7 @@ _sprd_hwc_prepare_commit(tdm_sprd_hwc_data *hwc_data)
        if (hwc_data->need_target_window) {
                layer_data = tdm_sprd_output_get_layer(hwc_data->output_data, ZPOS_OSD);
                _sprd_hwc_layer_attach_window(layer_data, hwc_data->target_hwc_window);
-               use_layers_zpos[hwc_data->target_hwc_window->zpos] = 1;
+               use_layers_zpos[hwc_data->target_hwc_window->lzpos] = 1;
        }
 
        /* set hwc windows */
@@ -183,9 +183,9 @@ _sprd_hwc_prepare_commit(tdm_sprd_hwc_data *hwc_data)
                if (hwc_window_data == hwc_data->target_hwc_window)
                        continue;
 
-               layer_data = tdm_sprd_output_get_layer(hwc_data->output_data, hwc_window_data->zpos);
+               layer_data = tdm_sprd_output_get_layer(hwc_data->output_data, hwc_window_data->lzpos);
                _sprd_hwc_layer_attach_window(layer_data, hwc_window_data);
-               use_layers_zpos[hwc_window_data->zpos] = 1;
+               use_layers_zpos[hwc_window_data->lzpos] = 1;
        }
 
        /* unset the unused layers */
@@ -210,8 +210,8 @@ _sprd_hwc_apply_policy(tdm_sprd_hwc_data *hwc_data , tdm_hwc_window **composited
        int video_count = 0;
        int cursor_count = 0;
        int next_idx = 0;
-       int ui_zpos = ZPOS_OSD;  // this is 1
-       int video_zpos = ZPOS_IMG; // this is 0
+       int ui_lzpos = ZPOS_OSD;  // this is 1
+       int video_lzpos = ZPOS_IMG; // this is 0
        int i = 0;
 
        composited_list = (tdm_sprd_hwc_window_data **)composited_wnds;
@@ -259,7 +259,7 @@ _sprd_hwc_apply_policy(tdm_sprd_hwc_data *hwc_data , tdm_hwc_window **composited
                        /* for video */
                        if (composited_list[next_idx]->client_type == TDM_COMPOSITION_VIDEO) {
                                composited_list[next_idx]->validated_type = TDM_COMPOSITION_VIDEO;
-                               composited_list[next_idx]->zpos = video_zpos;
+                               composited_list[next_idx]->lzpos = video_lzpos;
                                next_idx++;
                                continue;
                        }
@@ -268,14 +268,14 @@ _sprd_hwc_apply_policy(tdm_sprd_hwc_data *hwc_data , tdm_hwc_window **composited
                        composited_list[next_idx]->constraints = TDM_CONSTRAINT_BUFFER_QUEUE;
                        if (!_sprd_hwc_window_can_set_on_hw_layer(composited_list[next_idx])) {
                                composited_list[next_idx]->validated_type = TDM_COMPOSITION_CLIENT;
-                               composited_list[next_idx]->zpos = -1;
+                               composited_list[next_idx]->lzpos = -1;
                                next_idx++;
                                break;
                        }
 
                        /* set the OSD */
                        composited_list[next_idx]->validated_type = TDM_COMPOSITION_DEVICE;
-                       composited_list[next_idx]->zpos = ui_zpos--;
+                       composited_list[next_idx]->lzpos = ui_lzpos--;
                        next_idx++;
 
                        device_count--;
@@ -288,13 +288,13 @@ set_clients_below:
                /* for video */
                if (composited_list[next_idx]->client_type == TDM_COMPOSITION_VIDEO) {
                        composited_list[next_idx]->validated_type = TDM_COMPOSITION_VIDEO;
-                       composited_list[next_idx]->zpos = video_zpos;
+                       composited_list[next_idx]->lzpos = video_lzpos;
                        next_idx++;
                        continue;
                }
                composited_list[next_idx]->constraints = TDM_CONSTRAINT_NONE;
                composited_list[next_idx]->validated_type = TDM_COMPOSITION_CLIENT;
-               composited_list[next_idx]->zpos = -1;
+               composited_list[next_idx]->lzpos = -1;
                next_idx++;
        }
 }
@@ -614,7 +614,7 @@ tdm_sprd_hwc_initailize_target_window(tdm_hwc *hwc, int width, int height)
                sprd_hwc_window_destroy(hwc_data->target_hwc_window);
 
        hwc_data->target_hwc_window = target_hwc_window;
-       hwc_data->target_hwc_window->zpos = ZPOS_OSD;
+       hwc_data->target_hwc_window->lzpos = ZPOS_OSD;
 
        return TDM_ERROR_NONE;
 }