diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-02 08:44:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-02 08:44:44 -0800 |
| commit | c08c7fdb03eb8984e70a68d30f7bfbd2d58ea68b (patch) | |
| tree | 92ff46e0349c7c5e139d3d17a2c89be13f198c43 /gpu_tonemapper | |
| parent | d7cdb35b9bfa1a818b3639d1d0b36daef26c83f9 (diff) | |
| parent | feaed06078bb51eabb3f6860aef9279e6c30d7b3 (diff) | |
| download | display-c08c7fdb03eb8984e70a68d30f7bfbd2d58ea68b.tar.gz | |
Merge "gpu_tonemapper: Fix compilation issue with GraphicBuffer"
Diffstat (limited to 'gpu_tonemapper')
| -rw-r--r-- | gpu_tonemapper/Android.mk | 2 | ||||
| -rw-r--r-- | gpu_tonemapper/EGLImageWrapper.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk index 9ae3840a..4f716d24 100644 --- a/gpu_tonemapper/Android.mk +++ b/gpu_tonemapper/Android.mk @@ -11,7 +11,7 @@ LOCAL_MODULE := libgpu_tonemapper LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/qcom/display/ -LOCAL_CFLAGS := -Wno-missing-field-initializers -Wall \ +LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \ -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\" LOCAL_SRC_FILES := TonemapFactory.cpp \ diff --git a/gpu_tonemapper/EGLImageWrapper.cpp b/gpu_tonemapper/EGLImageWrapper.cpp index 298475fe..1d5d57ee 100644 --- a/gpu_tonemapper/EGLImageWrapper.cpp +++ b/gpu_tonemapper/EGLImageWrapper.cpp @@ -41,8 +41,12 @@ EGLImageBuffer *EGLImageWrapper::wrap(const void *pvt_handle) } android::sp<android::GraphicBuffer> graphicBuffer = - new android::GraphicBuffer(src->width, src->height, src->format, flags, - src->width /*src->stride*/, native_handle, false); + new android::GraphicBuffer(src->width, src->height, src->format, +#ifndef __NOUGAT__ + 1, // Layer count +#endif + flags, src->width /*src->stride*/, + native_handle, false); result = new EGLImageBuffer(graphicBuffer); |