3915e25d41ce40f24fd41d8bcd6a058403d0bbc5 |
|
19-May-2017 |
John Reck <jreck@google.com> |
Convert Shader to NativeAllocationRegistry Bug: 38258699 Test: manual Change-Id: I1537dee3187ea0366f2c236f3e6825196d738a37
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
576b6a8a7994f649c0dbacfc34611d1580e16bd6 |
|
17-May-2017 |
John Reck <jreck@google.com> |
Revert "Fix recent apps in system UI for Skia pipeline" This reverts commit 625dd56a45bfe95c5f1baa1891529503ff3374a9. Reason for revert: Caused a memory leak, b/38330767 Bug: 38136140 Bug: 38330767 Test: manual, verified memory isn't leaking doing the steps in b/38330767 Change-Id: I998bea04788d58ba6bad71c1691d5a3b33190c1b Merged-In: I98b2dfd750be57a15785808e2d5723616e2ce20a
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
625dd56a45bfe95c5f1baa1891529503ff3374a9 |
|
06-May-2017 |
Stan Iliev <stani@google.com> |
Fix recent apps in system UI for Skia pipeline Enable HW Bitmaps for Skia pipeline just enough to make recent apps list working by adding support for BitmapShader. Drawing HW bitmaps in a canvas is also supported. Test: recent apps work, HWUI unit tests pass, CTS tests pass. bug: 38136140 Change-Id: Ibd06c859c86dc213310d5ce5272497e1882d0cc6 Merged-In: Ibd06c859c86dc213310d5ce5272497e1882d0cc6
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
b244fb528bd19e60b7c3d671df07d2d64c41fdda |
|
05-Apr-2017 |
ztenghui <ztenghui@google.com> |
Make sure we handle the matrix separately for non-invertable matrix b/36895991 Test: added CTS tests and Run spotify Change-Id: I2786e612494530405dad5c3edb2bc53915a1c2dc
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
669b15a93548b82135c73196665bcb7f03d87795 |
|
31-Mar-2017 |
Derek Sollenberger <djsollen@google.com> |
Fix HWUI/Skia Gradients to premultiply the colors prior to interpolation This is fixed in Skia by passing the appropriate flag when the shader is generated. The fix in HWUI is to reverse the premultiplication and interpolation steps. Test: bit CtsUiRenderingTestCases:.testclasses.ShaderTests Bug: 34323783 Change-Id: I3417141949f62fcc696b6d8213a4b446d7d0cbf8
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
b581e6704fc1478bc1dda517502abd3eab2558d6 |
|
08-Mar-2017 |
Chris Craik <ccraik@google.com> |
Support for shader mutation Bug: 36025103 Test: cts-tradefed run singleCommand cts-dev --module CtsGraphicsTestCases Test: cts-tradefed run singleCommand cts-dev --module CtsUiRenderingTestCases Test: manually inspected for leaks via SK_TRACK_SHADER_LIFETIME and forcing a GC after ComposeShaderTest Change-Id: Ib5d33a80d2f9f468705806b05832e753508143cc
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
554ffeb8b7c836da43a637c59eedfc617895b19d |
|
16-Nov-2016 |
sergeyv <sergeyv@google.com> |
Support hardware bitmaps in bitmap shaders Test: hwuimacro bitmapShaderEglImage --onscreen. bug:30999911 Change-Id: I9d16a1c217a4474841794cf27ce49e3f7823678e
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
450756ab69a77b9f198f133c275b11d5f1731be6 |
|
07-Nov-2016 |
Derek Sollenberger <djsollen@google.com> |
Update bitmap shaders to the special no-copy image shaders. Test: hwui unit tests and CTS graphics tests pass Change-Id: Ifd031076d0eac95a30bce9ecaa6f43e9c70f3c54
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
52d5a55614d4e86b4d25e43c445baafd9251ab75 |
|
02-Nov-2016 |
Ben Wagner <bungeman@google.com> |
Merge "Replace SkAutoTUnref with sk_sp."
|
18bd88534a5783e581ccdd25b1b0f81c237a14b4 |
|
24-Oct-2016 |
Ben Wagner <bungeman@google.com> |
Replace SkAutoTUnref with sk_sp. Skia would like to remove SkAutoTUnref and replace it with sk_sp. This also removes the last SkAutoTDelete straggler. Change-Id: Idd46fcbbffe7fc1edb243b82b1c2f5425ccd60b6
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
c2f31df8b3b9a237e9abffc59c61804ad8495073 |
|
28-Oct-2016 |
Mike Reed <reed@google.com> |
use SkBlendMode skbug.com/5814 Test: compile only Change-Id: Ibbaff43df1117b2ca77fd8f917f03d88cc476330 (cherry picked from commit 26edbcba8a2ed4cb300e7f87e679e3b73cec2772)
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
260ab726486317496bc12a57d599ea96dcde3284 |
|
07-Oct-2016 |
Mike Reed <reed@google.com> |
use SkBlendMode instead of SkXfermode use sk_sp versions of paint setters/getters Change-Id: I86591a0a8ec92e6039776cbf00424ea24f585b28
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
d4babda3aa0af4d9a060b588f082e2f29192fd60 |
|
20-Sep-2016 |
Matt Sarett <msarett@google.com> |
Merge "Use SkMakeBitmapShader, avoid bitmap copy"
|
62feb3a0b4690144a067080ab17beae160ea6320 |
|
20-Sep-2016 |
Matt Sarett <msarett@google.com> |
Use SkMakeBitmapShader, avoid bitmap copy CreateBitmapShader now forces a copy. This updates the call sites to use SkMakeBitmapShader (in SkImagePriv.h) with kNever_SkCopyPixelsMode. This maintains the behavior where apps can modify the bitmap in the shader after creating the shader. This also ensures that the texture cache will work (since it's based off of SkPixelRefs). BUG:31594626 Change-Id: Ic75cb6cdc05c750b7946208e48a8127838d9c2f8
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
5d31a293ad0a832c7b8b445c1a67fb1800e5da32 |
|
15-Sep-2016 |
John Reck <jreck@google.com> |
Cleanup Xfermode We only support PorterDuff Xfermodes Removes some unneeded JNI and finalizers() Change-Id: I4988d6b05c6fd113a8ed8f7dcbf95abe0de95060
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
c3703a258d67f14c84194ab443b9a34d9107e792 |
|
12-Feb-2016 |
Mike Reed <reed@google.com> |
use std factory for compose-shader Change-Id: I4562d66cb8b9b8237e6aae7c205228731732cf17
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
c95d2d1bd6047cc8e246f80994c34dddd93801c0 |
|
14-Jan-2016 |
Leon Scroggins III <scroggo@google.com> |
Restore old behavior of setLocalMatrix We updated the API of SkShader (changed in https://codereview.chromium.org/1553743002) but the function still does the same thing. As such, undo the changes in f4eca05cdc19c095cdc0a9140d512737533a87c5 which call the method differently. BUG:26549769 This partially reverts commit f4eca05cdc19c095cdc0a9140d512737533a87c5. Change-Id: I52f2fab7da748cfe351e2fa27ade24aa572176a7
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
e1721099b5bbb6a1dbd50c1d6cd0cacb10159a59 |
|
05-Jan-2016 |
Derek Sollenberger <djsollen@google.com> |
Fix build breakage due to API update in SkShader. bug: 25344771 Change-Id: I64198a77c75d6768091dafd5c045b02ef66dfdad (cherry picked from commit f4eca05cdc19c095cdc0a9140d512737533a87c5)
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
434a481b2191562582c79be29f24c2e0b5ca60d0 |
|
24-Sep-2015 |
Elliott Hughes <enh@google.com> |
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master * commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5': constify JNINativeMethod function pointer tables
|
b57dd722f1dc0663417da37d3a82f8283ad3c982 |
|
24-Sep-2015 |
Elliott Hughes <enh@google.com> |
resolved conflicts for a884d81e to stage-aosp-master Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
|
76f6a86de25e1bf74717e047e55fd44b089673f3 |
|
19-Sep-2015 |
Daniel Micay <danielmicay@gmail.com> |
constify JNINativeMethod function pointer tables Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
60126efd7d905ca24822765c6dafac17fef278ab |
|
07-Aug-2015 |
Ben Wagner <bungeman@google.com> |
Use unique_ptr instead of SkAutoTDelete. Skia would like to make SkAutoTDelete private, given that unique_ptr now exists and is a better standard alternative. Change-Id: Ie21bc4546c93e2096c1e43b26eb3ef80b8f11de4
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
b786bbdd1164cf3ca7fcfb8448c7c619a82118a0 |
|
11-Jun-2015 |
Chris Craik <ccraik@google.com> |
Workaround shader crash bug:21706035 Change-Id: Ia1cd4824c742b2d6fc0feb2861ccfde0b6ac2189
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
3731dc220ed457e0f1e99d7ec2589e0a43872b59 |
|
14-Apr-2015 |
John Reck <jreck@google.com> |
A bunch more cleanups Switch a few places to using android::canvas instead of SkCanvas as well which eliminated some JNI Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
9d4efdf2802f06ccf7031610891f75af70ea5538 |
|
17-Apr-2015 |
John Reck <jreck@google.com> |
Revert "A bunch more cleanups" This reverts commit c294d128d03bc9a9982b273a82516c04583438cc. Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
c294d128d03bc9a9982b273a82516c04583438cc |
|
14-Apr-2015 |
John Reck <jreck@google.com> |
A bunch more cleanups Switch a few places to using android::canvas instead of SkCanvas as well which eliminated some JNI Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
1526a458a30184609f19b05e7334da3cbde81dd1 |
|
06-Mar-2015 |
Chris Craik <ccraik@google.com> |
Revert "Revert "Remove references to SkPorterDuff as it is deprecated."" Fix build breakage. This reverts commit 26b4f598c8b1e99b43261614a6861785638c8c00. Change-Id: If39ce2a41d26a8520091f330234c3d35e413ee92
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
26b4f598c8b1e99b43261614a6861785638c8c00 |
|
06-Mar-2015 |
Chris Craik <ccraik@google.com> |
Revert "Remove references to SkPorterDuff as it is deprecated." bug:19627342 This reverts commit a9aded1f6253afbea7906509992a8a3721f731ab. Change-Id: Ic865edfbd31c9e24d18a1397a1d346633376e20a
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
a9aded1f6253afbea7906509992a8a3721f731ab |
|
04-Mar-2015 |
Derek Sollenberger <djsollen@google.com> |
Remove references to SkPorterDuff as it is deprecated. Change-Id: Ic0722cfef4ed61aa546c495924397097a45cfe77
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
158b6c98508f111de041853cab1d7a87b771b651 |
|
21-Nov-2014 |
Andreas Gampe <agampe@google.com> |
resolve merge conflicts of 7d13d9d to master. Change-Id: I4d8a7ec4a25471565859050939ec05b0c1261627
|
ed6b9dff563c5e22f040ff37e12c0d771e0478ae |
|
21-Nov-2014 |
Andreas Gampe <agampe@google.com> |
Frameworks/base: Consistency in core/jni Make consistent use of core_jni_helpers for registration. Translate some #ifdefs into const bools. Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
ed5d5fb434eb2169f14d06649336f211117e2bee |
|
14-Nov-2014 |
Andreas Gampe <agampe@google.com> |
am 035a7b02: am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni" * commit '035a7b0235835e856f39623fc571668e2d6048da': Frameworks/base: Wall Werror in core/jni
|
0f0b4919667f418b249c497f5ad3e83fdf4437e5 |
|
12-Nov-2014 |
Andreas Gampe <agampe@google.com> |
Frameworks/base: Wall Werror in core/jni Turn on -Wall -Werror in core/jni. Fix warnings. Clang TODO: For GCC we need to turn off Wunused-but-set-variable in the GL bindings. However, Clang doesn't have that warning and thus complains about an unknown pragma. It is necessary to make the pragma #ifdef-ed on the compiler being GCC. Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
73edbfeed0536dd4c55fc97b7dfc6ce105483c77 |
|
16-Oct-2014 |
Tom Hudson <tomhudson@google.com> |
Fix build breakage in HWUI JNI R=djsollen@google.com Change-Id: Iaa4e7f22bec8e15748beab1b25d307c48d277c59
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
dfba4d3d11bbf47dff45f94d61d4d97510b3034a |
|
02-Sep-2014 |
Derek Sollenberger <djsollen@google.com> |
Mutable Java Shaders with Immutable Native Shaders bug: 17641888 Change-Id: I0f05387423cde185dab1a1453f89d5251ca1a4f9
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
c1469f39b571f5660346fc837ac30b19d7651a43 |
|
25-Aug-2014 |
John Reck <jreck@google.com> |
DO NOT MERGE Copy shaders Bug: 16733996 Change-Id: I84afc1b24a23dd6ddf5ab48fb2bfcbe779f8d3e3
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
01edef10b9724fa5607d7918addc31a3b0c991dc |
|
22-Aug-2014 |
John Reck <jreck@google.com> |
Revert immutable Shader change Bug: 16733996 Change-Id: I51686aaf8f6ae8d0e390e298ad70f98f81c5f555
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
866cf65cc3c53f67836c9157d5c661adfdbd25e1 |
|
22-Jul-2014 |
Leon Scroggins III <scroggo@google.com> |
Make updateLocalMatrix replace the current Matrix. Fixes a bug introduced in I3c3316377874e89fccc85afb864bc038b0ef3890. CreateLocalMatrixShader combines the existing matrix with the new matrix, which is not what we want. Keep track of the original SkShader at all times, and always create the local matrix shader with the original. Store the SkShader with a local matrix as Shader.native_with_local_matrix. Make Shader.native_instance private. Instead of allowing direct access, add an init() method which sets it, and getNativeInstance(), which returns either native_instance or native_with_local_matrix, as appropriate. Make Shader subclasses call init(), instead of setting native_instance directly. Pass native_with_local_matrix pointer to nativeSetLocalMatrix and nativeDestructor, which unrefs it (if not null). Since nativeSetLocalMatrix no longer replaces the original, do not unref it. Add a comment to Shader.updateLocalMatrix that it does not affect ComposeShaders created with this Shader. (This should have been a part of I3c3316377874e89fccc85afb864bc038b0ef3890.) BUG:16293121 Change-Id: Ieb31c7e1fe99081f6b81493178f4a18d3c5df643
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
ab87983a11e0bd2e08d752d86d5e945ea7d39a04 |
|
09-Jul-2014 |
Leon Scroggins III <scroggo@google.com> |
Simplify Shader.setLocalMatrix. Previously, calling setLocalMatrix updated any Paint that had the Shader attached. This depended on deprecated behavior in Skia. Use new Skia APIs, and do not modify any Paints that use the Shader. In addition, update callers to call setShader (again) after modifying the Shader. Sample app at ag/499573 for testing. Depends on I673801444f0a8fd4f192b5b7effdde1aa83e702b in external/skia. BUG:14315916 Change-Id: I3c3316377874e89fccc85afb864bc038b0ef3890
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
d1ad5e62fda248c6d185cde3cb6d9f01a223066c |
|
05-May-2014 |
Leon Scroggins III <scroggo@google.com> |
Inspect SkShader to determine hw shader. 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
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
5932b0d8fc313f9e4f2c8e5c431ac0e270f9f259 |
|
17-Apr-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Call SkShader::isOpaque() to determine opaqueness. It is invalid to call SkShader::getFlags() before calling SkShader::setContext() - it will always return 0. Instead, call SkShader::isOpaque(). Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
2e0103eb340822f9d580c1aa8492bae8394b8243 |
|
04-Apr-2014 |
Leon Scroggins III <scroggo@google.com> |
Remove SkFloatToScalar. Now that SkScalar is always float (it may someday be double, but float to double is trivial), remove callers of SkFloatToScalar, which is deprecated in Skia. BUG:13694396 Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
67862524056ee2e73a94395139bb8bd0ec1ef38a |
|
28-Feb-2014 |
Chris Craik <ccraik@google.com> |
Fix use of Skia deprecated methods Change-Id: Ib89c20fc94bcce29b7490d6f55c73492735befda
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
36bef0bf30d6bae48cf3837df351075ca4fce654 |
|
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
7023df08f14ec5dee76ac54c03e870f84e297636 |
|
27-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Revert "AArch64: Make graphics classes 64-bit compatible" This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976. Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
18b4cbeedef21c1fa666a110a157bab66edff976 |
|
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
42e1e0d482d774cf18a55773e434f02edb9e4462 |
|
30-Jul-2012 |
Romain Guy <romainguy@google.com> |
Improve gradients Avoid using textures for common gradients (two stops from 0.0 to 1.0) Change-Id: Iff55d21b126c8cfc4cfb701669f2339c8f6b131a
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
4cb1753ec6e90d7e747880c599dc1c164a568cf3 |
|
13-Apr-2011 |
Elliott Hughes <enh@google.com> |
Remove useless forward declarations. Change-Id: I8f191367acb18ea9a3f807e791099e0485b1b249
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
7b5b6abf852c039983eded25ebe43a70fef5a4ab |
|
15-Mar-2011 |
Romain Guy <romainguy@google.com> |
Fix rendering artifact in edge fades. Bug #4092053 The problem always existed but was made visible by partial invalidation. When saving a layer, the renderer would try to postpone glClear() operations until the next drawing command. This however does not work since the clip might have changed. The fix is rather simple and simply gets rid of this "optimization" (that turned out to be usless anyway given how View issues saveLayer() calls.) This change also fixes an issue with gradients (color stops where not properly computed when using a null stops array) and optimizes display lists rendering (quickly rejects larger portions of the tree to avoid executing unnecessary code.) Change-Id: I0f5b5f6e1220d41a09cc2fa84c212b0b4afd9c46
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
6062c5912dc79704b489fc8c289b78a400ed05ee |
|
22-Feb-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 808) This is a companion CL to the one found in /external/skia Change-Id: If81748545435cab20a5d8479329ab333cb973e16
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
a9ebfa6bcce62d7fee69693fe3dee6027afd3f0e |
|
05-Jan-2011 |
Romain Guy <romainguy@google.com> |
Keep a reference to the local matrix. Bug #3299324 This is needed for ADT, which does not rely on Skia's reference counting to correctly keep track of the native objects. Change-Id: Ia2fc5c1ec2b80bad226bc549fefc6bb064784609
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
ad93c2bb63dfc813b2eefa1043aa63afbddce655 |
|
23-Oct-2010 |
Chet Haase <chet@google.com> |
Optimizing ColorFilter in display lists Change-Id: Ie4d5e5b0bc45e0ce47bba144049303c270762e54
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
5c13d89c1332fcc499379b9064b891187b75ca32 |
|
08-Oct-2010 |
Chet Haase <chet@google.com> |
Optimizing display lists by referencing pointers to resources instead of copying them Change-Id: I81ad3551d74aa1e5bb64d69e33d2eb29a6c1eb6a
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
ddb80bebb0776e6d852aab6e8bba5d5591847a55 |
|
21-Sep-2010 |
Romain Guy <romainguy@google.com> |
Add support for circular gradients to the GL renderer. This change also adds full support for local transformation matrices on sweep and radial gradients. Change-Id: Id8773bc0766575190e3f3d51984fc5e57b266c3f
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
ee916f14cbd1fe1422c063ce2ef7b185e2bc5c6f |
|
21-Sep-2010 |
Romain Guy <romainguy@google.com> |
Add support for SweepGradient in the GL renderer. Change-Id: I7aa397ed4e34655ead9ba1f5b4ce087665e0f022
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
a2341a9f6addcd79723965ec5b1a1c5ae0f8bd65 |
|
09-Sep-2010 |
Romain Guy <romainguy@google.com> |
Purge Skia objects from GL caches as needed. Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
48daa54d31fc59ec969dcff65eb3cbb0ce879a8d |
|
11-Aug-2010 |
Romain Guy <romainguy@google.com> |
Add extra blending modes. This change adds the following blending modes for shaders and color filters: Add Multiply Screen Overlay Darken Lighten Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
61c8c9c5b2006d18e9310b6521c65b36ffe75ce4 |
|
10-Aug-2010 |
Romain Guy <romainguy@google.com> |
Fix tons of bugs and add new text rendering support. Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
163935113919a184122b8b3bd672ef08c8df65dc |
|
08-Aug-2010 |
Romain Guy <romainguy@android.com> |
Make libhwui entirely optional. The makefile variable USE_OPENGL_RENDERER must be set to true to compile libhwui and the related code in the JNI layer. This change also removes obsolete APIs from Canvas that must not be used and would be confusing if left in. These APIs were remnants of our first attempt at an OpenGL renderer for the view hierarchy and had not been taken out before Android 1.0 was released. Change-Id: I2475ff1307212bab26c926724f3c508681c7dae1
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
06f96e2652e4855b6520ad9dd70583677605b79a |
|
31-Jul-2010 |
Romain Guy <romainguy@google.com> |
Refactor Skia shaders handling. With this change, Skia shaders can easily be applied to any mesh. This change also supports ComposeShader. For instance, this can be used to blend a gradient and a bitmap togehter and paint a string of text with the result. Change-Id: I701c2f9cf7f89b2ff58005e8a1d0d80ccf4a4aea
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
7fac2e18339f765320d759e8d4c090f92431959e |
|
17-Jul-2010 |
Romain Guy <romainguy@android.com> |
Add plumbing to support gradients in OpenGL renderer. The LinearGradient class keeps a copy of the various parameters that define the gradient. The copies are native arrays to avoid copying Java arrays on every draw call. The gradient code path is implemented until OpenGLRenderer::drawRect() (see TODO.) The actual gradient implementation will be added in a latter change. Change-Id: I9300d250ef5e2e9c2e097c3116ee71dfc9d752d8
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
6af2552d244ff933dfd54570121db455cc7c3cda |
|
30-Jul-2009 |
Mike Reed <reed@google.com> |
use safeUnref() since the other macro is not defined in donut
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
a04e555dc91b11ad833cb5db4a24e38082d1dc45 |
|
30-Jul-2009 |
Mike Reed <reed@google.com> |
check for null native objects, which never happens on a real subclass (we throw in that case) but can happen because we allow the callers to create the base class from java.
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
b798689749c64baba81f02e10cf2157c747d6b46 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/core/jni/android/graphics/Shader.cpp
|
54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/core/jni/android/graphics/Shader.cpp
|