diff options
| author | Christopher R. Palmer <crpalmer@gmail.com> | 2016-01-13 06:20:38 -0500 |
|---|---|---|
| committer | Christopher R. Palmer <crpalmer@gmail.com> | 2016-01-13 06:41:54 -0500 |
| commit | a2bc976dadb08887348c1e7558e874ebd794c4aa (patch) | |
| tree | 475bf89a7574753ff149573713bd56cc4e9052b2 | |
| parent | 59855cd3b73d1119d8bd7b4ff3f1a3b386a77218 (diff) | |
| download | android_hardware_intel_img_hwcomposer-a2bc976dadb08887348c1e7558e874ebd794c4aa.tar.gz android_hardware_intel_img_hwcomposer-a2bc976dadb08887348c1e7558e874ebd794c4aa.tar.bz2 android_hardware_intel_img_hwcomposer-a2bc976dadb08887348c1e7558e874ebd794c4aa.zip | |
intel: hwcomposer: Use ASUS_ZENFONE2_LP_BLOBS instead
Change-Id: I3b8776cc2b697902581de92071368d313870feb0
4 files changed, 4 insertions, 8 deletions
diff --git a/merrifield/include/pvr/hal/hal_public.h b/merrifield/include/pvr/hal/hal_public.h index 1fa89af..8d7cd0a 100644 --- a/merrifield/include/pvr/hal/hal_public.h +++ b/merrifield/include/pvr/hal/hal_public.h @@ -30,7 +30,7 @@ #undef HAL_PIXEL_FORMAT_NV12 -#ifdef LP_BLOBS +#ifdef ASUS_ZENFONE2_LP_BLOBS typedef struct IMG_gralloc_module_t { diff --git a/merrifield/include/pvr/hal/img_gralloc_public.h b/merrifield/include/pvr/hal/img_gralloc_public.h index 88e6222..44e808c 100644 --- a/merrifield/include/pvr/hal/img_gralloc_public.h +++ b/merrifield/include/pvr/hal/img_gralloc_public.h @@ -90,7 +90,7 @@ */ #define MAX_SUB_ALLOCS (3) -#ifdef LP_BLOBS +#ifdef ASUS_ZENFONE2_LP_BLOBS #if defined(PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC) #define MAX_SRV_SYNC_OBJS 2 @@ -296,7 +296,7 @@ typedef struct IMG_buffer_format_public_t IMG_buffer_format_public_t; /* NOTE: This interface is deprecated. Use module->perform() instead. */ -#ifdef LP_BLOBS +#ifdef ASUS_ZENFONE2_LP_BLOBS typedef struct IMG_gralloc_module_public_t { diff --git a/merrifield/platforms/merrifield_plus/Android.mk b/merrifield/platforms/merrifield_plus/Android.mk index d9dbddf..5d90414 100644 --- a/merrifield/platforms/merrifield_plus/Android.mk +++ b/merrifield/platforms/merrifield_plus/Android.mk @@ -132,10 +132,6 @@ ifeq ($(TARGET_HAS_MULTIPLE_DISPLAY),true) LOCAL_CFLAGS += -DTARGET_HAS_MULTIPLE_DISPLAY endif -ifeq ($(INTEL_HWC_MOOREFIELD_HAS_LP_BLOBS),true) - LOCAL_CFLAGS += -DLP_BLOBS -endif - LOCAL_COPY_HEADERS := \ ../../include/pvr/hal/hal_public.h \ ../../include/pvr/hal/img_gralloc_public.h diff --git a/merrifield/platforms/merrifield_plus/PlatfBufferManager.cpp b/merrifield/platforms/merrifield_plus/PlatfBufferManager.cpp index cc1d040..714addf 100755 --- a/merrifield/platforms/merrifield_plus/PlatfBufferManager.cpp +++ b/merrifield/platforms/merrifield_plus/PlatfBufferManager.cpp @@ -66,7 +66,7 @@ bool PlatfBufferManager::blit(buffer_handle_t srcHandle, buffer_handle_t destHan IMG_gralloc_module_public_t *imgGrallocModule = (IMG_gralloc_module_public_t *) mGrallocModule; int fenceFd; -#ifdef LP_BLOBS +#ifdef ASUS_ZENFONE2_LP_BLOBS if (imgGrallocModule->Blit(imgGrallocModule, srcHandle, destHandle, destRect.w, destRect.h, destRect.x, |