summaryrefslogtreecommitdiff
path: root/drmdisplaycomposition.cpp
diff options
context:
space:
mode:
authorPuneet Kumar <puneetster@google.com>2015-07-30 03:38:11 +0000
committerSean Paul <seanpaul@google.com>2015-07-30 13:18:46 +0000
commitcbe9c01336e23a63259db65d22d63d6a697b8813 (patch)
treef22cab210b23db18978c509eb50e8c012e17aca5 /drmdisplaycomposition.cpp
parente5b3336e85e91b494c88bedca319451ca0ac3e52 (diff)
downloaddrm_hwcomposer-cbe9c01336e23a63259db65d22d63d6a697b8813.tar.gz
drm_hwcomposer-cbe9c01336e23a63259db65d22d63d6a697b8813.tar.xz
Revert "drm_hwcomposer: have DrmDisplayCompositor do its own OpenGL composition"
This reverts commit 2317bb19d8663efc31e6fcd8cf7fd2a73577253d. For now until we figure out a more stable SF/hwc Change-Id: Ia5ca089610a487bf036a1ddd5fb62e504e02ad98
Diffstat (limited to 'drmdisplaycomposition.cpp')
-rw-r--r--drmdisplaycomposition.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 21a9c2a..cce1d56 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -112,28 +112,6 @@ int DrmDisplayComposition::AddLayer(hwc_layer_1_t *layer, hwc_drm_bo_t *bo,
return 0;
}
-int DrmDisplayComposition::AddLayer(hwc_layer_1_t *layer, DrmCrtc *crtc,
- DrmPlane *plane) {
- if (layer->transform != 0)
- return -EINVAL;
-
- if (!validate_composition_type(DRM_COMPOSITION_TYPE_FRAME))
- return -EINVAL;
-
- hwc_drm_bo_t bo;
- int ret = importer_->ImportBuffer(layer->handle, &bo);
- if (ret) {
- ALOGE("Failed to import handle of layer %d", ret);
- return ret;
- }
-
- ret = AddLayer(layer, &bo, crtc, plane);
- if (ret)
- importer_->ReleaseBuffer(&bo);
-
- return ret;
-}
-
int DrmDisplayComposition::AddDpmsMode(uint32_t dpms_mode) {
if (!validate_composition_type(DRM_COMPOSITION_TYPE_DPMS))
return -EINVAL;