Commit: 2f728292e676b48584c75cc1f46f4c5a35b5eb99 - external-gbm_gralloc (git)

external/gbm_gralloc

Commit MetaInfo

• Revision: 2f728292e676b48584c75cc1f46f4c5a35b5eb99 (tree)
• Time: 2018-04-02 18:21:23
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge remote-tracking branch 'origin/master' into nougat-x86

Conflicts:
gralloc_drm_handle.h

Change Summary

• modified: gralloc.cpp
• modified: gralloc_gbm.cpp

Incremental Difference

--- a/gralloc.cpp
+++ b/gralloc.cpp
@@ -27,6 +27,7 @@
 #include <cutils/log.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include <pthread.h>
 #include <errno.h>
 

--- a/gralloc_gbm.cpp
+++ b/gralloc_gbm.cpp
@@ -28,6 +28,7 @@
 #include <cutils/atomic.h>
 #include <cutils/properties.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -341,14 +342,10 @@ static struct gralloc_gbm_handle_t *create_bo_handle(int width,
 {
 	struct gralloc_gbm_handle_t *handle;
 
-	handle = new gralloc_gbm_handle_t();
+	handle = (gralloc_gbm_handle_t *)native_handle_create(GRALLOC_GBM_HANDLE_NUM_FDS, GRALLOC_GBM_HANDLE_NUM_INTS);
 	if (!handle)
 		return NULL;
 
-	handle->base.version = sizeof(handle->base);
-	handle->base.numInts = GRALLOC_GBM_HANDLE_NUM_INTS;
-	handle->base.numFds = GRALLOC_GBM_HANDLE_NUM_FDS;
-
 	handle->magic = GRALLOC_GBM_HANDLE_MAGIC;
 	handle->width = width;
 	handle->height = height;
@@ -374,7 +371,7 @@ struct gralloc_gbm_handle_t *gralloc_gbm_bo_create(struct gbm_device *gbm,
 
 	bo = gbm_alloc(gbm, handle);
 	if (!bo) {
-		delete handle;
+		native_handle_delete(&handle->base);
 		return NULL;
 	}