diff options
| author | Romain Guy <romainguy@google.com> | 2016-09-28 17:34:42 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2016-10-11 17:47:58 -0700 |
| commit | 253f2c213f6ecda63b6872aee77bd30d5ec07c82 (patch) | |
| tree | 45fcfd8633a122fc4509e58732743123daf8af79 /core/java | |
| parent | 9cf75061b143196c97c31726655c7e5c4ada8814 (diff) | |
Linear blending, step 1
NOTE: Linear blending is currently disabled in this CL as the
feature is still a work in progress
Android currently performs all blending (any kind of linear math
on colors really) on gamma-encoded colors. Since Android assumes
that the default color space is sRGB, all bitmaps and colors
are encoded with the sRGB Opto-Electronic Conversion Function
(OECF, which can be approximated with a power function). Since
the power curve is not linear, our linear math is incorrect.
The result is that we generate colors that tend to be too dark;
this affects blending but also anti-aliasing, gradients, blurs,
etc.
The solution is to convert gamma-encoded colors back to linear
space before doing any math on them, using the sRGB Electo-Optical
Conversion Function (EOCF). This is achieved in different
ways in different parts of the pipeline:
- Using hardware conversions when sampling from OpenGL textures
or writing into OpenGL frame buffers
- Using software conversion functions, to translate app-supplied
colors to and from sRGB
- Using Skia's color spaces
Any type of processing on colors must roughly ollow these steps:
[sRGB input]->EOCF->[linear data]->[processing]->OECF->[sRGB output]
For the sRGB color space, the conversion functions are defined as
follows:
OECF(linear) :=
linear <= 0.0031308 ? linear * 12.92 : (pow(linear, 1/2.4) * 1.055) - 0.055
EOCF(srgb) :=
srgb <= 0.04045 ? srgb / 12.92 : pow((srgb + 0.055) / 1.055, 2.4)
The EOCF is simply the reciprocal of the OECF.
While it is highly recommended to use the exact sRGB conversion
functions everywhere possible, it is sometimes useful or beneficial
to rely on approximations:
- pow(x,2.2) and pow(x,1/2.2)
- x^2 and sqrt(x)
The latter is particularly useful in fragment shaders (for instance
to apply dithering in sRGB space), especially if the sqrt() can be
replaced with an inversesqrt().
Here is a fairly exhaustive list of modifications implemented
in this CL:
- Set TARGET_ENABLE_LINEAR_BLENDING := false in BoardConfig.mk
to disable linear blending. This is only for GLES 2.0 GPUs
with no hardware sRGB support. This flag is currently assumed
to be false (see note above)
- sRGB writes are disabled when entering a functor (WebView).
This will need to be fixed at some point
- Skia bitmaps are created with the sRGB color space
- Bitmaps using a 565 config are expanded to 888
- Linear blending is disabled when entering a functor
- External textures are not properly sampled (see below)
- Gradients are interpolated in linear space
- Texture-based dithering was replaced with analytical dithering
- Dithering is done in the quantization color space, which is
why we must do EOCF(OECF(color)+dither)
- Text is now gamma corrected differently depending on the luminance
of the source pixel. The asumption is that a bright pixel will be
blended on a dark background and the other way around. The source
alpha is gamma corrected to thicken dark on bright and thin
bright on dark to match the intended design of fonts. This also
matches the behavior of popular design/drawing applications
- Removed the asset atlas. It did not contain anything useful and
could not be sampled in sRGB without a yet-to-be-defined GL
extension
- The last column of color matrices is converted to linear space
because its value are added to linear colors
Missing features:
- Resource qualifier?
- Regeneration of goldeng images for automated tests
- Handle alpha8/grey8 properly
- Disable sRGB write for layers with external textures
Test: Manual testing while work in progress
Bug: 29940137
Change-Id: I6a07b15ab49b554377cd33a36b6d9971a15e9a0b
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/IAssetAtlas.aidl | 54 | ||||
| -rw-r--r-- | core/java/android/view/ThreadedRenderer.java | 28 |
2 files changed, 0 insertions, 82 deletions
diff --git a/core/java/android/view/IAssetAtlas.aidl b/core/java/android/view/IAssetAtlas.aidl deleted file mode 100644 index edce05970b9a..000000000000 --- a/core/java/android/view/IAssetAtlas.aidl +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Copyright (c) 2013, 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. - */ - -package android.view; - -import android.view.GraphicBuffer; - -/** - * Programming interface to the system assets atlas. This atlas, when - * present, holds preloaded drawable in a single, shareable graphics - * buffer. This allows multiple processes to share the same data to - * save up on memory. - * - * @hide - */ -interface IAssetAtlas { - /** - * Indicates whether the atlas is compatible with the specified - * parent process id. If the atlas' ppid does not match, this - * method will return false. - */ - boolean isCompatible(int ppid); - - /** - * Returns the atlas buffer (texture) or null if the atlas is - * not available yet. - */ - GraphicBuffer getBuffer(); - - /** - * Returns the map of the bitmaps stored in the atlas or null - * if the atlas is not available yet. - * - * Each bitmap is represented by several entries in the array: - * long0: SkBitmap*, the native bitmap object - * long1: x position - * long2: y position - * long3: rotated, 1 if the bitmap must be rotated, 0 otherwise - */ - long[] getMap(); -} diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index ce390a239d2c..f71459e426dc 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -916,7 +916,6 @@ public final class ThreadedRenderer { mInitialized = true; initSched(context, renderProxy); initGraphicsStats(context, renderProxy); - initAssetAtlas(context, renderProxy); } private static void initSched(Context context, long renderProxy) { @@ -944,32 +943,6 @@ public final class ThreadedRenderer { Log.w(LOG_TAG, "Could not acquire gfx stats buffer", t); } } - - private static void initAssetAtlas(Context context, long renderProxy) { - IBinder binder = ServiceManager.getService("assetatlas"); - if (binder == null) return; - - IAssetAtlas atlas = IAssetAtlas.Stub.asInterface(binder); - try { - if (atlas.isCompatible(android.os.Process.myPpid())) { - GraphicBuffer buffer = atlas.getBuffer(); - if (buffer != null) { - long[] map = atlas.getMap(); - if (map != null) { - nSetAtlas(renderProxy, buffer, map); - } - // If IAssetAtlas is not the same class as the IBinder - // we are using a remote service and we can safely - // destroy the graphic buffer - if (atlas.getClass() != binder.getClass()) { - buffer.destroy(); - } - } - } - } catch (RemoteException e) { - Log.w(LOG_TAG, "Could not acquire atlas", e); - } - } } void addFrameMetricsObserver(FrameMetricsObserver observer) { @@ -984,7 +957,6 @@ public final class ThreadedRenderer { static native void setupShadersDiskCache(String cacheFile); - private static native void nSetAtlas(long nativeProxy, GraphicBuffer buffer, long[] map); private static native void nSetProcessStatsBuffer(long nativeProxy, int fd); private static native int nGetRenderThreadTid(long nativeProxy); |
