Skip to content
Permalink
Browse files

Legacify and update for 4.3

  • Loading branch information
Dazzozo committed Oct 19, 2013
1 parent bc15701 commit 5db15b85672330950b0db0ff14f9ff097a5c9659
@@ -1,16 +1,16 @@
#Enables the listed display HAL modules
#libs to be built for QCOM targets only

ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
ifeq ($(TARGET_QCOM_DISPLAY_VARIANT),legacy)

display-hals := libgralloc libgenlock libcopybit
display-hals += libhwcomposer liboverlay libqdutils
display-hals += libtilerenderer

ifneq ($(TARGET_PROVIDES_LIBLIGHTS),true)
display-hals += liblight
endif

endif

display-hals += libtilerenderer

include $(call all-named-subdir-makefiles,$(display-hals))

endif
@@ -1,9 +1,9 @@
#Common headers
common_includes := hardware/qcom/display/libgralloc
common_includes += hardware/qcom/display/libgenlock
common_includes += hardware/qcom/display/liboverlay
common_includes += hardware/qcom/display/libcopybit
common_includes += hardware/qcom/display/libqdutils
common_includes := hardware/qcom/display-legacy/libgralloc
common_includes += hardware/qcom/display-legacy/libgenlock
common_includes += hardware/qcom/display-legacy/liboverlay
common_includes += hardware/qcom/display-legacy/libcopybit
common_includes += hardware/qcom/display-legacy/libqdutils

ifeq ($(TARGET_USES_POST_PROCESSING),true)
common_flags += -DUSES_POST_PROCESSING
@@ -39,6 +39,8 @@
#include "gr.h"
#include "comptype.h"

ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::QCCompositionType);

using namespace gralloc;
using namespace qdutils;
using android::sp;
@@ -316,7 +316,12 @@ int mapFrameBufferLocked(struct private_module_t* module)
float xdpi = (info.xres * 25.4f) / info.width;
float ydpi = (info.yres * 25.4f) / info.height;
//The reserved[4] field is used to store FPS by the driver.
#ifndef REFRESH_RATE
float fps = info.reserved[4];
#else
float fps = REFRESH_RATE;
#warning "refresh rate set via makefile to REFRESH_RATE"
#endif

ALOGI("using (fd=%d)\n"
"id = %s\n"
@@ -82,7 +82,6 @@ base: {
lock: gralloc_lock,
unlock: gralloc_unlock,
perform: gralloc_perform,
reserved_proc: {0},
},
framebuffer: 0,
fbFormat: 0,
@@ -72,6 +72,9 @@ enum {
*/
GRALLOC_USAGE_PRIVATE_UNSYNCHRONIZED = 0X04000000,

/* Buffer content should be displayed on an primary display only */
GRALLOC_USAGE_PRIVATE_INTERNAL_ONLY = 0x04000000,

/* Buffer content should be displayed on an external display only */
GRALLOC_USAGE_PRIVATE_EXTERNAL_ONLY = 0x08000000,

@@ -5,8 +5,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libqdutils
LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libui libcutils
LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display/libhwcomposer
LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display/libgralloc
LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display-legacy/libhwcomposer
LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display-legacy/libgralloc

LOCAL_CFLAGS := $(common_flags)
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
@@ -90,5 +90,4 @@ inline QCCompositionType::QCCompositionType()

}
}; //namespace qdutils
ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::QCCompositionType);
#endif //INCLUDE_LIBQCOM_COMPTYPES

0 comments on commit 5db15b8

Please sign in to comment.
You can’t perform that action at this time.