QCOM: tile renderer: ifdef with QCOM_HARDWARE (415c41c6) · Commits · e / os / android_frameworks_base

core/jni/Android.mk

+7 −2

Original line number	Diff line number	Diff line
		@@ -162,7 +162,6 @@ LOCAL_C_INCLUDES += \
		$(LOCAL_PATH)/android/graphics \
		$(LOCAL_PATH)/../../libs/hwui \
		$(LOCAL_PATH)/../../opengl/libs \
		hardware/qcom/display/libtilerenderer \
		$(call include-path-for, bluedroid) \
		$(call include-path-for, libhardware)/hardware \
		$(call include-path-for, libhardware_legacy)/hardware_legacy \
		@@ -220,7 +219,13 @@ LOCAL_SHARED_LIBRARIES := \
		libz \

		ifeq ($(USE_OPENGL_RENDERER),true)
		LOCAL_SHARED_LIBRARIES += libhwui libtilerenderer
		LOCAL_SHARED_LIBRARIES += libhwui
		endif

		ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
		LOCAL_C_INCLUDES += hardware/qcom/display/libtilerenderer
		LOCAL_SHARED_LIBRARIES += libtilerenderer
		LOCAL_CFLAGS += -DQCOM_HARDWARE
		endif

		ifeq ($(BOARD_HAVE_BLUETOOTH),true)

core/jni/android_view_GLES20Canvas.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -43,7 +43,10 @@
		#include <SkiaShader.h>
		#include <SkiaColorFilter.h>
		#include <Rect.h>

		#ifdef QCOM_HARDWARE
		#include <tilerenderer.h>
		#endif

		#include <TextLayout.h>

		@@ -177,6 +180,7 @@ static void android_view_GLES20Canvas_prepare(JNIEnv* env, jobject clazz,
		renderer->prepare(opaque);
		}

		#ifdef QCOM_HARDWARE
		static void android_view_GLES20Canvas_startTileRendering(JNIEnv* env, jobject clazz,
		OpenGLRenderer* renderer, jint left, jint top, jint right, jint bottom) {
		TileRenderer::getInstance().startTileRendering(renderer, left, top, right, bottom);
		@@ -186,6 +190,7 @@ static void android_view_GLES20Canvas_endTileRendering(JNIEnv* env, jobject claz
		OpenGLRenderer* renderer) {
		TileRenderer::getInstance().endTileRendering(renderer);
		}
		#endif

		static void android_view_GLES20Canvas_prepareDirty(JNIEnv* env, jobject clazz,
		OpenGLRenderer* renderer, jint left, jint top, jint right, jint bottom,
		@@ -796,8 +801,10 @@ static JNINativeMethod gMethods[] = {
		{ "nSetViewport", "(III)V", (void*) android_view_GLES20Canvas_setViewport },
		{ "nPrepare", "(IZ)V", (void*) android_view_GLES20Canvas_prepare },
		{ "nPrepareDirty", "(IIIIIZ)V", (void*) android_view_GLES20Canvas_prepareDirty },
		#ifdef QCOM_HARDWARE
		{ "nStartTileRendering","(IIIII)V", (void*) android_view_GLES20Canvas_startTileRendering},
		{ "nEndTileRendering", "(I)V", (void*) android_view_GLES20Canvas_endTileRendering},
		#endif
		{ "nFinish", "(I)V", (void*) android_view_GLES20Canvas_finish },

		{ "nCallDrawGLFunction", "(II)Z",

libs/hwui/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,10 @@ ifeq ($(USE_OPENGL_RENDERER),true)
		LOCAL_CFLAGS += -fvisibility=hidden
		LOCAL_MODULE_CLASS := SHARED_LIBRARIES
		LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui

		ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
		LOCAL_CFLAGS += -DQCOM_HARDWARE
		endif
		LOCAL_MODULE := libhwui
		LOCAL_MODULE_TAGS := optional

libs/hwui/OpenGLRenderer.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -144,10 +144,12 @@ void OpenGLRenderer::setViewport(int width, int height) {
		mDirtyClip = false;
		}

		#ifdef QCOM_HARDWARE
		void OpenGLRenderer::getViewport(int &width, int &height) {
		width = mWidth;
		height = mHeight;
		}
		#endif

		void OpenGLRenderer::prepare(bool opaque) {
		prepareDirty(0.0f, 0.0f, mWidth, mHeight, opaque);

libs/hwui/OpenGLRenderer.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -63,8 +63,9 @@ public:
		virtual ~OpenGLRenderer();

		virtual void setViewport(int width, int height);
		#ifdef QCOM_HARDWARE
		ANDROID_API void getViewport(int &width, int &height);

		#endif
		ANDROID_API void prepare(bool opaque);
		virtual void prepareDirty(float left, float top, float right, float bottom, bool opaque);
		virtual void finish();