drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev

Browse Source
This commit is contained in:
Chris Craik
2014-11-21 22:11:11 +00:00
committed by Android (Google) Code Review
parent c0491a2e2d 69e65019b0
commit 29dc496a42
5 changed files with 12 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/GLES20Canvas.java
View File

@ -997,15 +997,4 @@ class GLES20Canvas extends HardwareCanvas {
int indexOffset, int indexCount, Paint paint) {
// TODO: Implement
}
@Override
public void setOverrideXfermode(PorterDuff.Mode xfermode) {
int xfermodeValue = -1;
if (xfermode != null) {
xfermodeValue = xfermode.nativeInt;
}
nSetOverrideXfermode(mRenderer, xfermodeValue);
}
private static native void nSetOverrideXfermode(long renderer, int xfermode);
}

8
core/jni/android_view_GLES20Canvas.cpp
View File

@ -172,12 +172,6 @@ static jint android_view_GLES20Canvas_getMaxTextureHeight(JNIEnv* env, jobject c
return Caches::getInstance().maxTextureSize;
}
static void android_view_GLES20Canvas_setOverrideXfermode(JNIEnv* env, jobject clazz,
jlong rendererPtr, int xfermode) {
DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr);
renderer->setOverrideXfermode(xfermode);
}
// ----------------------------------------------------------------------------
// State
// ----------------------------------------------------------------------------
@ -970,8 +964,6 @@ static JNINativeMethod gMethods[] = {
{ "nGetMaximumTextureWidth", "()I", (void*) android_view_GLES20Canvas_getMaxTextureWidth },
{ "nGetMaximumTextureHeight", "()I", (void*) android_view_GLES20Canvas_getMaxTextureHeight },
{ "nSetOverrideXfermode", "(JI)V", (void*) android_view_GLES20Canvas_setOverrideXfermode },
#endif
};

9
graphics/java/android/graphics/Canvas.java
View File

@ -249,15 +249,6 @@ public class Canvas {
/** @hide */
public void insertInorderBarrier() {}
/**
* Set a transfer mode that overrides any transfer modes
* in paints used for drawing. Pass null to disable this
* override. Only implemented in GLES20Canvas.
*
* @hide
*/
public void setOverrideXfermode(@Nullable PorterDuff.Mode xfermode) {}
/**
* Return true if the device that the current layer draws into is opaque
* (i.e. does not support per-pixel alpha).

1
libs/hwui/DisplayListRenderer.cpp
View File

@ -39,7 +39,6 @@ DisplayListRenderer::DisplayListRenderer()
, mTranslateY(0.0f)
, mDeferredBarrierType(kBarrier_None)
, mHighContrastText(false)
, mOverrideXfermode(-1)
, mRestoreSaveCount(-1) {
}

45
libs/hwui/DisplayListRenderer.h
View File

@ -20,7 +20,6 @@
#include <SkMatrix.h>
#include <SkPaint.h>
#include <SkPath.h>
#include <SkPorterDuff.h>
#include <cutils/compiler.h>
#include "DisplayListLogBuffer.h"
@ -162,15 +161,6 @@ public:
void setHighContrastText(bool highContrastText) {
mHighContrastText = highContrastText;
}
void setOverrideXfermode(int xfermode) {
if (xfermode != -1) {
SkPorterDuff::Mode porterDuffMode = static_cast<SkPorterDuff::Mode>(xfermode);
xfermode = SkPorterDuff::ToXfermodeMode(porterDuffMode);
}
mOverrideXfermode = xfermode;
};
private:
enum DeferredBarrierType {
kBarrier_None,
@ -230,26 +220,18 @@ private:
inline const SkPaint* refPaint(const SkPaint* paint) {
if (!paint) return NULL;
const SkPaint* paintCopy;
if (mOverrideXfermode != -1) {
SkPaint* overriddenPaint = copyPaint(paint);
overriddenPaint->setXfermodeMode(static_cast<SkXfermode::Mode>(mOverrideXfermode));
paintCopy = overriddenPaint;
} else {
paintCopy = mPaintMap.valueFor(paint);
if (paintCopy == NULL
|| paintCopy->getGenerationID() != paint->getGenerationID()
// We can't compare shader pointers because that will always
// change as we do partial copying via wrapping. However, if the
// shader changes the paint generationID will have changed and
// so we don't hit this comparison anyway
|| !(paint->getShader() && paintCopy->getShader()
&& paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) {
paintCopy = copyPaint(paint);
// replaceValueFor() performs an add if the entry doesn't exist
mPaintMap.replaceValueFor(paint, paintCopy);
}
const SkPaint* paintCopy = mPaintMap.valueFor(paint);
if (paintCopy == NULL
|| paintCopy->getGenerationID() != paint->getGenerationID()
// We can't compare shader pointers because that will always
// change as we do partial copying via wrapping. However, if the
// shader changes the paint generationID will have changed and
// so we don't hit this comparison anyway
|| !(paint->getShader() && paintCopy->getShader()
&& paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) {
paintCopy = copyPaint(paint);
// replaceValueFor() performs an add if the entry doesn't exist
mPaintMap.replaceValueFor(paint, paintCopy);
}
return paintCopy;
@ -322,9 +304,6 @@ private:
DeferredBarrierType mDeferredBarrierType;
bool mHighContrastText;
// -1 if unset, or SkXfermode::Mode value if set
int mOverrideXfermode;
int mRestoreSaveCount;
friend class RenderNode;