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

Commit 8e56eea4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Icd65d906,I109cb9db 

* changes:
  Don't apply the OECF twice to multi-stop gradients
  JNI does not use hwui_flags but LOCAL_CFLAGS
parents 9cd00cbf f9037dab

core/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ endif 
# TODO: The final test should be:

# TODO: ifneq ($(TARGET_ENABLE_LINEAR_BLENDING),false)

ifeq ($(TARGET_ENABLE_LINEAR_BLENDING),true)

    hwui_cflags += -DANDROID_ENABLE_LINEAR_BLENDING

    LOCAL_CFLAGS += -DANDROID_ENABLE_LINEAR_BLENDING

endif



LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

libs/hwui/GradientCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ void GradientCache::mixFloats(const FloatColor& start, const FloatColor& end, 
        float amount, uint8_t*& dst) const {

    float oppAmount = 1.0f - amount;

    float* d = (float*) dst;

#if ANDROID_LINEAR_BLENDING_ENABLED

#ifdef ANDROID_ENABLE_LINEAR_BLENDING

    *d++ = start.r * oppAmount + end.r * amount;

    *d++ = start.g * oppAmount + end.g * amount;

    *d++ = start.b * oppAmount + end.b * amount;