aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge E. Moreira <jemoreira@google.com>2018-09-19 17:31:43 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-09-19 17:31:43 -0700
commitab1cf9de376dc1e919bf7605ee005eca57f033c5 (patch)
tree75371a0bda4511b9387abd10a9c9844cd146cecf
parent785793afe0125372fb07edac5d6f5ccd551b3e33 (diff)
parentcd93ef19219efa2b8cdd1868c33148956ac4080b (diff)
downloaddrm_hwcomposer-ab1cf9de376dc1e919bf7605ee005eca57f033c5.tar.gz
Complete rename of DrmResources to DrmDevice am: 99b8103864
am: cd93ef1921 Change-Id: I0f7ac608ce52f2ba23118fcf50997ac672cf51ee
-rw-r--r--platformminigbm.cpp8
-rw-r--r--platformminigbm.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/platformminigbm.cpp b/platformminigbm.cpp
index 2040768..dce1d11 100644
--- a/platformminigbm.cpp
+++ b/platformminigbm.cpp
@@ -17,7 +17,7 @@
#define LOG_TAG "hwc-platform-drm-minigbm"
#include "platformminigbm.h"
-#include "drmresources.h"
+#include "drmdevice.h"
#include "platform.h"
#include <drm/drm_fourcc.h>
@@ -31,7 +31,7 @@
namespace android {
-Importer *Importer::CreateInstance(DrmResources *drm) {
+Importer *Importer::CreateInstance(DrmDevice *drm) {
DrmMinigbmImporter *importer = new DrmMinigbmImporter(drm);
if (!importer)
return NULL;
@@ -45,7 +45,7 @@ Importer *Importer::CreateInstance(DrmResources *drm) {
return importer;
}
-DrmMinigbmImporter::DrmMinigbmImporter(DrmResources *drm)
+DrmMinigbmImporter::DrmMinigbmImporter(DrmDevice *drm)
: DrmGenericImporter(drm), drm_(drm) {
}
@@ -100,7 +100,7 @@ int DrmMinigbmImporter::ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) {
return ret;
}
-std::unique_ptr<Planner> Planner::CreateInstance(DrmResources *) {
+std::unique_ptr<Planner> Planner::CreateInstance(DrmDevice *) {
std::unique_ptr<Planner> planner(new Planner);
planner->AddStage<PlanStageGreedy>();
return planner;
diff --git a/platformminigbm.h b/platformminigbm.h
index f5807b9..25f8404 100644
--- a/platformminigbm.h
+++ b/platformminigbm.h
@@ -17,7 +17,7 @@
#ifndef ANDROID_PLATFORM_DRM_MINIGBM_H_
#define ANDROID_PLATFORM_DRM_MINIGBM_H_
-#include "drmresources.h"
+#include "drmdevice.h"
#include "platform.h"
#include "platformdrmgeneric.h"
@@ -27,7 +27,7 @@ namespace android {
class DrmMinigbmImporter : public DrmGenericImporter {
public:
- DrmMinigbmImporter(DrmResources *drm);
+ DrmMinigbmImporter(DrmDevice *drm);
~DrmMinigbmImporter() override;
int Init();
@@ -35,7 +35,7 @@ class DrmMinigbmImporter : public DrmGenericImporter {
int ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) override;
private:
- DrmResources *drm_;
+ DrmDevice *drm_;
const gralloc_module_t *gralloc_;
};