qcomui: ifdef decideTextureTarget

caf removed the decideTextureTarget function, however it is still useful for
old devices (8x50)

Change-Id: I8d5c7a821b1f2f75819cbcd6d7c65e17f1c1b0b1
This commit is contained in:
Andrew Sutherland 2012-06-02 00:18:41 -05:00
parent d0ec96adaa
commit 3c6ccbef6d
3 changed files with 12 additions and 4 deletions

View File

@ -6,10 +6,16 @@ LOCAL_SRC_FILES := \
utils/profiler.cpp \
utils/IdleTimer.cpp
LOCAL_CFLAGS := -DLOG_TAG=\"libQcomUI\"
ifeq ($(TARGET_BOARD_PLATFORM),qsd8k) # these are originally for 7x27a
LOCAL_CFLAGS += -DCHECK_FOR_EXTERNAL_FORMAT
endif
ifeq ($(BOARD_ADRENO_DECIDE_TEXTURE_TARGET),true)
LOCAL_CFLAGS += -DDECIDE_TEXTURE_TARGET
endif
LOCAL_SHARED_LIBRARIES := \
libutils \
libcutils \
@ -23,8 +29,6 @@ LOCAL_C_INCLUDES := $(TOP)/hardware/qcom/display/libgralloc \
$(TOP)/external/skia/include/core \
$(TOP)/external/skia/include/images
LOCAL_CFLAGS := -DLOG_TAG=\"libQcomUI\"
LOCAL_CFLAGS += -DQCOM_HARDWARE
LOCAL_CFLAGS += -DDEBUG_CALC_FPS
LOCAL_MODULE := libQcomUI
LOCAL_MODULE_TAGS := optional

View File

@ -40,9 +40,11 @@
#include <SkImageEncoder.h>
#include <Transform.h>
#ifdef DECIDE_TEXTURE_TARGET
#include <EGL/egl.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#endif
using gralloc::IMemAlloc;
using gralloc::IonController;
@ -152,7 +154,7 @@ bool isGPUSupportedFormat(int format) {
}
/* decide the texture target dynamically, based on the pixel format*/
#ifdef DECIDE_TEXTURE_TARGET
int decideTextureTarget(int pixel_format)
{
@ -177,6 +179,7 @@ int decideTextureTarget(int pixel_format)
}
return retVal;
}
#endif
/*
* Checks if the format is natively supported by the GPU.

View File

@ -226,8 +226,9 @@ bool isGPUSupportedFormatInHW(int format);
* GL_TEXTURE_EXTERNAL_OES for YUV formats.
*
*/
#ifdef DECIDE_TEXTURE_TARGET
int decideTextureTarget (const int pixel_format);
#endif
/*
* Gets the number of arguments required for this operation.