diff options
-rw-r--r-- | libhwcomposer/display.cpp | 6 | ||||
-rw-r--r-- | libhwcomposer/display.h | 4 | ||||
-rw-r--r-- | libhwcomposer/hwc.cpp | 10 |
3 files changed, 2 insertions, 18 deletions
diff --git a/libhwcomposer/display.cpp b/libhwcomposer/display.cpp index 8a7fef8..270d665 100644 --- a/libhwcomposer/display.cpp +++ b/libhwcomposer/display.cpp @@ -149,12 +149,6 @@ static void set_plane_properties(kms::AtomicReq& req, drm_plane_props_t* plane_p { "CRTC_W", plane_props->crtc_w }, { "CRTC_H", plane_props->crtc_h }, }); - - /* optional props */ - req.add(plane, { - { "zorder", plane_props->zorder }, - { "pre_mult_alpha", plane_props->pre_mult_alpha }, - }); } int HWCDisplay::update_display(drm_plane_props_t* planeProp) diff --git a/libhwcomposer/display.h b/libhwcomposer/display.h index 5df923f..e1e4ef3 100644 --- a/libhwcomposer/display.h +++ b/libhwcomposer/display.h @@ -61,10 +61,6 @@ typedef struct drm_plane_props { uint64_t src_w; uint64_t src_h; - uint64_t rotation; - uint64_t zorder; - uint64_t pre_mult_alpha; - DRMFramebuffer* fb_info; } drm_plane_props_t; diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp index 94cc324..c2d5206 100644 --- a/libhwcomposer/hwc.cpp +++ b/libhwcomposer/hwc.cpp @@ -395,7 +395,7 @@ static void hwc_drm_event_thread(void* data) ALOGE("DRM event polling thread exiting\n"); } -static void adjust_drm_plane_to_layer(hwc_layer_1_t* layer, int zorder, drm_plane_props_t* plane) +static void adjust_drm_plane_to_layer(hwc_layer_1_t* layer, drm_plane_props_t* plane) { if (!layer || !plane) { ALOGE("Bad layer or plane"); @@ -414,13 +414,7 @@ static void adjust_drm_plane_to_layer(hwc_layer_1_t* layer, int zorder, drm_plan plane->src_w = WIDTH(layer->sourceCrop); plane->src_h = HEIGHT(layer->sourceCrop); - plane->zorder = zorder; plane->layer = layer; - - if (layer->blending == HWC_BLENDING_PREMULT) - plane->pre_mult_alpha = 1; - else - plane->pre_mult_alpha = 0; } static int hwc_prepare_for_display(omap_hwc_device_t* hwc_dev, int disp, hwc_display_contents_1_t* content) @@ -439,7 +433,7 @@ static int hwc_prepare_for_display(omap_hwc_device_t* hwc_dev, int disp, hwc_dis } /* Set the FB_TARGET layer */ - adjust_drm_plane_to_layer(&content->hwLayers[content->numHwLayers - 1], 0, &display->planeProps[disp]); + adjust_drm_plane_to_layer(&content->hwLayers[content->numHwLayers - 1], &display->planeProps[disp]); return 0; } |