Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d81ec456 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Changes needed to roll Skia to r7527. 

Change-Id: I84aef3f8a733c869fade06021816646001532758
parent d0351a67

core/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ LOCAL_C_INCLUDES += \ 
	external/skia/include/images \

	external/skia/include/ports \

	external/skia/src/core \

	external/skia/src/ports \

	external/skia/src/images \

	external/skia/include/utils \

	external/sqlite/dist \

	external/sqlite/android \

libs/hwui/OpenGLRenderer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static const Blender gBlends[] = { 
    { SkXfermode::kDstATop_Mode,  GL_ONE_MINUS_DST_ALPHA, GL_SRC_ALPHA },

    { SkXfermode::kXor_Mode,      GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA },

    { SkXfermode::kPlus_Mode,     GL_ONE,                 GL_ONE },

    { SkXfermode::kMultiply_Mode, GL_ZERO,                GL_SRC_COLOR },

    { SkXfermode::kModulate_Mode, GL_ZERO,                GL_SRC_COLOR },

    { SkXfermode::kScreen_Mode,   GL_ONE,                 GL_ONE_MINUS_SRC_COLOR }

};
@@ -101,7 +101,7 @@ static const Blender gBlendsSwap[] = { 
    { SkXfermode::kDstATop_Mode,  GL_DST_ALPHA,           GL_ONE_MINUS_SRC_ALPHA },

    { SkXfermode::kXor_Mode,      GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA },

    { SkXfermode::kPlus_Mode,     GL_ONE,                 GL_ONE },

    { SkXfermode::kMultiply_Mode, GL_DST_COLOR,           GL_ZERO },

    { SkXfermode::kModulate_Mode, GL_DST_COLOR,           GL_ZERO },

    { SkXfermode::kScreen_Mode,   GL_ONE_MINUS_DST_COLOR, GL_ONE }

};