d1ad5e62fd
Instead of duplicating internal info about SkShader, inspect the SkShader installed on the SkPaint. core/java/android/view/GLES20Canvas.java: Remove setupModifiers, nResetModifiers, and nSetupShader. core/jni/android/graphics/Shader.cpp: Remove calls to create/destroy the (previously) attached SkiaShader. core/jni/android_view_GLES20Canvas.cpp: Remove native code for setupShader and resetModifiers. graphics/java/android/graphics/BitmapShader.java: graphics/java/android/graphics/ComposeShader.java: graphics/java/android/graphics/LinearGradient.java: graphics/java/android/graphics/RadialGradient.java: graphics/java/android/graphics/Shader.java: graphics/java/android/graphics/SweepGradient.java: Remove code keeping track of native SkiaShader. libs/hwui/Caches.h: Include Extensions.h. libs/hwui/DeferredDisplayList.cpp: Compare shaders on the paint, instead of on DrawModifiers. libs/hwui/DisplayList.cpp: libs/hwui/DisplayList.h: Remove vector of SkiaShaders. libs/hwui/DisplayListOp.h: Access the SkShader on mPaint. Remove SetupShaderOp and ResetShaderOp. libs/hwui/DisplayListRenderer.cpp: libs/hwui/DisplayListRenderer.h: Remove resetShader, setupShader, refShader, and mShaderMap. libs/hwui/FontRenderer.cpp: Pass SkShader to setupDrawShader and setupDrawShaderUniforms. libs/hwui/OpenGLRenderer.cpp: libs/hwui/OpenGLRenderer.h: Add LayerShader, a class inheriting from SkShader, to mimic the behavior of SkiaLayerShader. Unlike SkiaLayerShader, it can be set on the SkPaint so it can be inspected later. Set a LayerShader instead of a SkiaLayerShader. setupDrawShader and setupDrawShaderUniforms now inspect an SkShader passed in. Inspect SkShader instead of mDrawModifiers.mShader. Remove resetShader and setupShader. setupDrawColorUniforms now takes a boolean indicating whether there is a shader. Add an inline function for accessing the SkShader on an SkPaint. In setupDrawBlending(Layer*, bool), do not check the shader (which will never be set), but do check whether the color filter may change the alpha (newly fixed behavior). In setupDrawBlending(SkPaint, ...), check the SkShader and whether the color filter affects alpha (the latter is new behavior). libs/hwui/Renderer.h: Remove pure virtual functions setupShader and resetShader. libs/hwui/ResourceCache.cpp: libs/hwui/ResourceCache.h: Remove functions for refing/unrefing shaders. libs/hwui/SkiaShader.cpp: libs/hwui/SkiaShader.h: Much of this code was redundant and has been removed. Convert structs into class with nothing but static functions for calling describe/setupProgram. libs/hwui/TextureCache.cpp: libs/hwui/TextureCache.h: Use the SkPixelRef as the key to the bitmap Lru cache, since shader inspection will provide a different SkBitmap pointer (though it will hold the correct SkPixelRef with the correct generation ID). tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java: tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java: Update manual test to have more shaders: radial, sweep, compose, invalid compose. BUG:10650594 Change-Id: Iaa7189178bda1c55f96da044d2a9fa602ba36034
125 lines
3.6 KiB
C++
125 lines
3.6 KiB
C++
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_HWUI_RESOURCE_CACHE_H
|
|
#define ANDROID_HWUI_RESOURCE_CACHE_H
|
|
|
|
#include <cutils/compiler.h>
|
|
|
|
#include <SkBitmap.h>
|
|
|
|
#include <utils/KeyedVector.h>
|
|
|
|
#include <androidfw/ResourceTypes.h>
|
|
|
|
#include "Layer.h"
|
|
|
|
namespace android {
|
|
namespace uirenderer {
|
|
|
|
/**
|
|
* Type of Resource being cached
|
|
*/
|
|
enum ResourceType {
|
|
kBitmap,
|
|
kNinePatch,
|
|
kPath,
|
|
kLayer
|
|
};
|
|
|
|
class ResourceReference {
|
|
public:
|
|
|
|
ResourceReference() { refCount = 0; recycled = false; destroyed = false;}
|
|
ResourceReference(ResourceType type) {
|
|
refCount = 0; recycled = false; destroyed = false; resourceType = type;
|
|
}
|
|
|
|
int refCount;
|
|
bool recycled;
|
|
bool destroyed;
|
|
ResourceType resourceType;
|
|
};
|
|
|
|
class ANDROID_API ResourceCache {
|
|
public:
|
|
ResourceCache();
|
|
~ResourceCache();
|
|
|
|
/**
|
|
* When using these two methods, make sure to only invoke the *Locked()
|
|
* variants of increment/decrementRefcount(), recyle() and destructor()
|
|
*/
|
|
void lock();
|
|
void unlock();
|
|
|
|
void incrementRefcount(const SkPath* resource);
|
|
void incrementRefcount(const SkBitmap* resource);
|
|
void incrementRefcount(const Res_png_9patch* resource);
|
|
void incrementRefcount(Layer* resource);
|
|
|
|
void incrementRefcountLocked(const SkPath* resource);
|
|
void incrementRefcountLocked(const SkBitmap* resource);
|
|
void incrementRefcountLocked(const Res_png_9patch* resource);
|
|
void incrementRefcountLocked(Layer* resource);
|
|
|
|
void decrementRefcount(const SkBitmap* resource);
|
|
void decrementRefcount(const SkPath* resource);
|
|
void decrementRefcount(const Res_png_9patch* resource);
|
|
void decrementRefcount(Layer* resource);
|
|
|
|
void decrementRefcountLocked(const SkBitmap* resource);
|
|
void decrementRefcountLocked(const SkPath* resource);
|
|
void decrementRefcountLocked(const Res_png_9patch* resource);
|
|
void decrementRefcountLocked(Layer* resource);
|
|
|
|
void destructor(SkPath* resource);
|
|
void destructor(const SkBitmap* resource);
|
|
void destructor(Res_png_9patch* resource);
|
|
|
|
void destructorLocked(SkPath* resource);
|
|
void destructorLocked(const SkBitmap* resource);
|
|
void destructorLocked(Res_png_9patch* resource);
|
|
|
|
bool recycle(SkBitmap* resource);
|
|
bool recycleLocked(SkBitmap* resource);
|
|
|
|
private:
|
|
void deleteResourceReferenceLocked(const void* resource, ResourceReference* ref);
|
|
|
|
void incrementRefcount(void* resource, ResourceType resourceType);
|
|
void incrementRefcountLocked(void* resource, ResourceType resourceType);
|
|
|
|
void decrementRefcount(void* resource);
|
|
void decrementRefcountLocked(void* resource);
|
|
|
|
void logCache();
|
|
|
|
/**
|
|
* Used to increment, decrement, and destroy. Incrementing is generally accessed on the UI
|
|
* thread, but destroying resources may be called from the GC thread, the finalizer thread,
|
|
* or a reference queue finalization thread.
|
|
*/
|
|
mutable Mutex mLock;
|
|
|
|
KeyedVector<const void*, ResourceReference*>* mCache;
|
|
};
|
|
|
|
}; // namespace uirenderer
|
|
}; // namespace android
|
|
|
|
#endif // ANDROID_HWUI_RESOURCE_CACHE_H
|