• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoapythonrubywindowsphpgameguibathyscaphec翻訳omegatframework計画中(planning stage)twitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

external/gbm_gralloc


Commit MetaInfo

Revision2f728292e676b48584c75cc1f46f4c5a35b5eb99 (tree)
Time2018-04-02 18:21:23
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

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

Conflicts:
gralloc_drm_handle.h

Change Summary

Incremental Difference

--- a/gralloc.cpp
+++ b/gralloc.cpp
@@ -27,6 +27,7 @@
2727 #include <cutils/log.h>
2828 #include <stdlib.h>
2929 #include <stdarg.h>
30+#include <string.h>
3031 #include <pthread.h>
3132 #include <errno.h>
3233
--- a/gralloc_gbm.cpp
+++ b/gralloc_gbm.cpp
@@ -28,6 +28,7 @@
2828 #include <cutils/atomic.h>
2929 #include <cutils/properties.h>
3030 #include <stdlib.h>
31+#include <string.h>
3132 #include <errno.h>
3233 #include <sys/types.h>
3334 #include <sys/stat.h>
@@ -341,14 +342,10 @@ static struct gralloc_gbm_handle_t *create_bo_handle(int width,
341342 {
342343 struct gralloc_gbm_handle_t *handle;
343344
344- handle = new gralloc_gbm_handle_t();
345+ handle = (gralloc_gbm_handle_t *)native_handle_create(GRALLOC_GBM_HANDLE_NUM_FDS, GRALLOC_GBM_HANDLE_NUM_INTS);
345346 if (!handle)
346347 return NULL;
347348
348- handle->base.version = sizeof(handle->base);
349- handle->base.numInts = GRALLOC_GBM_HANDLE_NUM_INTS;
350- handle->base.numFds = GRALLOC_GBM_HANDLE_NUM_FDS;
351-
352349 handle->magic = GRALLOC_GBM_HANDLE_MAGIC;
353350 handle->width = width;
354351 handle->height = height;
@@ -374,7 +371,7 @@ struct gralloc_gbm_handle_t *gralloc_gbm_bo_create(struct gbm_device *gbm,
374371
375372 bo = gbm_alloc(gbm, handle);
376373 if (!bo) {
377- delete handle;
374+ native_handle_delete(&handle->base);
378375 return NULL;
379376 }
380377