summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* Add setStartValue to RNAJohn Reck2014-06-022-4/+3
| | | | | | | | Bug: 15198607 Should be good-enough for Ripples to use for pseudo-chaining support. Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
* Re-jigger layersJohn Reck2014-05-308-69/+74
| | | | | | | | | | | | | | | | Bug: 15185239 Bug: 15238382 Make DeferredLayerUpdater ref counted so that HardwareLayer:finalizer() works non-crashily on leaked layers Give DeferredLayerUpdater the ability to have a layer destroyer set so that leaked layers can still be recycled on the RenderThread Order layer updates based off of pushLayerUpdate() calls to fix issue with nested layers Change-Id: I4449cee607f7e5126e02fed7464cf48038e3dfdf
* Merge "Enable debug stuffs" into lmp-preview-devJohn Reck2014-05-2912-10/+453
|\
| * Enable debug stuffsJohn Reck2014-05-2912-10/+453
| | | | | | | | | | | | | | | | Bug: 14596762 * dumpsys gfxinfo implemented * profile GPU visual_bars implemented Change-Id: Icb948a9d5af5989b5615504d0d76ade64b93ef5b
* | Re-enable atlasJohn Reck2014-05-291-2/+1
|/ | | | | | Bug: 14590563 Change-Id: I04ed5bf1b2654dab4a65c1e43faaeba32459870f
* Merge "Implement FlushCaches TODO" into lmp-preview-devJohn Reck2014-05-284-0/+24
|\
| * Implement FlushCaches TODOJohn Reck2014-05-234-0/+24
| | | | | | | | Change-Id: Id05429e98ffe0858275b32c41fb215c1d8d930b2
* | Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into ↵Chris Craik2014-05-2317-709/+488
|\ \ | |/ |/| | | lmp-preview-dev
| * DO NOT MERGE Inspect SkShader to determine hw shader.Leon Scroggins III2014-05-2317-709/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick of Iaa7189178bda1c55f96da044d2a9fa602ba36034 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: I2e7182b3fc28268e7ca82fac6780540b6b45365c
* | Bag of scheduling tweaksJohn Reck2014-05-239-32/+130
|/ | | | | | | | | | | | | Bug: 15118640 * Prevent over-stuffing the queue by dropping frames * Prevent double-drawing in one pulse by RT by deferring vsync registration until post-draw so that it catches the next vsync pulse instead of the current one * Bias vsync race condition towards the UI thread * Fix queueDelay to actually work Change-Id: Ibf584258bd93ebcbba058bd976dc8b307f1c6155
* Merge "Define light position (using new lighting spec) in Java"Chris Craik2014-05-2217-54/+58
|\
| * Define light position (using new lighting spec) in JavaChris Craik2014-05-2117-54/+58
| | | | | | | | | | | | Also updates the relative shadow strengths. Change-Id: I6cac7275d38df98aea9f0dda463cd7207102986a
* | Disable shadow drawing for empty/null outlinesChris Craik2014-05-213-26/+17
|/ | | | Change-Id: I60d0f326cfab97d88c49d17cf32e619b5e60b94a
* Merge "Correct viewport initialization, bounds comparison"Chris Craik2014-05-192-2/+4
|\
| * Correct viewport initialization, bounds comparisonChris Craik2014-05-152-2/+4
| | | | | | | | Change-Id: Ibd751856e3712991e149800ed179464397dad7c3
* | am 3c769ec0: am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of ↵Chris Craik2014-05-192-1/+21
|\ \ | | | | | | | | | | | | | | | | | | red in drawCachedGlyphBitmap" * commit '3c769ec02b8b82bec4dec2169bf76af58be94a9a': Use alpha channel instead of red in drawCachedGlyphBitmap
| * \ am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in ↵Chris Craik2014-05-192-1/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | drawCachedGlyphBitmap" * commit '00fabcbeb035fb513293ea01d245002f40b3234f': Use alpha channel instead of red in drawCachedGlyphBitmap
| | * \ am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"Chris Craik2014-05-192-1/+21
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'b1708e9b764268a06d91219a5c39ee9efd32ab00': Use alpha channel instead of red in drawCachedGlyphBitmap
| | | * | Use alpha channel instead of red in drawCachedGlyphBitmapDigish Pandya2014-05-152-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the correct value to copy in bitmap is alpha component from the cachebuffer. currently it is offset to red channel if format is RGBA which is wrong. this is followup fix for https://android-review.googlesource.com/#/c/93943/ Change-Id: I96b5ba35df5ccaef44caf2542d35d6585ba1df80 Signed-off-by: Digish Pandya <digishp@codeaurora.org>
| * | | | am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a ↵Narayan Kamath2014-05-161-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | uint32_t." * commit '2c125876208c6b7173ef561316843d64ae1599e2': Change InputMessage.motion.pointerSize to a uint32_t.
* | | | | Use default visibility for Snapshot::getLocalClip (attempt #2).Ben Cheng2014-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change appeared to be dropped. See commit 65ba94f79d6e737c3e66c09032221999b2eb50d7 for details. Change-Id: Ib60968d6327ef04d21e4adca2c394f66343f204b
* | | | | Update ripple behavior, use render thread animationAlan Viverette2014-05-162-8/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib6bc1e08b05d29606f452961963d58b8fc866746
* | | | | Merge "Round rect outline clipping"Chris Craik2014-05-1614-34/+250
|\ \ \ \ \
| * | | | | Round rect outline clippingChris Craik2014-05-1514-34/+250
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
* | | | | Animator start value...John Reck2014-05-155-158/+155
|/ / / / | | | | | | | | | | | | Change-Id: Ifd35ed95a28c625086d7fa97764fe63ab4a997f1
* | | | Merge "Combine projection matrix, and viewport management"Chris Craik2014-05-159-82/+75
|\ \ \ \
| * | | | Combine projection matrix, and viewport managementChris Craik2014-05-149-82/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge management of ortho projection matrix with the viewport size, since they should always be changed together. Change-Id: Iccb8f30828f4fb7848999ac54852e7ed2d6f2eb1
* | | | | Merge "Remove Path based outline clipping"Chris Craik2014-05-153-52/+7
|\ \ \ \ \
| * | | | | Remove Path based outline clippingChris Craik2014-05-143-52/+7
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ic5ccd98a7517b46e768e53d6b0c8fdcda305fb2c
* | | | | Merge "Disable texture atlas"John Reck2014-05-141-3/+4
|\ \ \ \ \
| * | | | | Disable texture atlasJohn Reck2014-05-141-3/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14952384 Change-Id: If38b3e4c08c2c3dd9c00ae9e6e8c10e208e737d1
* | | | | Merge "Check the array before accessing it"ztenghui2014-05-141-0/+4
|\ \ \ \ \
| * | | | | Check the array before accessing itztenghui2014-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: Figure out why the path is generating empty polygon. bug: 14615368 Change-Id: If116e34388b7c6a71bf5ddd36e0c9716d7450732
* | | | | | Merge "Fix potential crash in libandroidfw"Adam Lesinski2014-05-141-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix potential crash in libandroidfwAdam Lesinski2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A malformed APK may cause a crash if it encodes its chunk size as a signed number (MSB set to 1). Bug:14898892 Change-Id: I342853c2b0859e5be15d712d451323afc367d329
* | | | | | Merge "Clamp to uint8 for alpha"John Reck2014-05-131-1/+6
|\ \ \ \ \ \
| * | | | | | Clamp to uint8 for alphaJohn Reck2014-05-131-1/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: Id3e51671297bfb879969ad2fe7a5741dd4cf4c29
* | | | | | Wire up texture atlasJohn Reck2014-05-132-3/+38
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14590563 Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
* | | | | Merge "More native interpolators"John Reck2014-05-132-3/+115
|\ \ \ \ \
| * | | | | More native interpolatorsJohn Reck2014-05-122-3/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gotta collect 'em all Change-Id: I3ccc2b5c842b27b906c8a0470fbedc2bf285bc38
* | | | | | Merge "Add TimeInterpolator support to RNA"John Reck2014-05-124-1/+61
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Add TimeInterpolator support to RNAJohn Reck2014-05-124-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14678626 Change-Id: I6554e7fcd42c49fac3618ca792083bb68e358f55
* | | | | Merge "Add support for building split APKs"Adam Lesinski2014-05-121-42/+49
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add support for building split APKsAdam Lesinski2014-05-111-42/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build multiple APKs, each containing a disjoint subset of configurations. These can then be loaded into the device AssetManager and should operate as if they were never split. Use the idea of building multiple sets of files, where each set represents an APK. An ApkBuilder can place files in a set based on its configuration, but you can actually add directly to a set, in the case of the resources.arsc and generated AndroidManifest.xml for splits. Change-Id: Ic65d3f0ac1bbd290185695b9971d425c85ab1de3
* | | | | Revert "Simplify projection matrix management."Jorim Jaggi2014-05-115-19/+27
| | | | | | | | | | | | | | | | | | | | This reverts commit 0efaa71d5414287ed4beac0a88cf76f7e33a1e74.
* | | | | Merge "Simplify projection matrix management."Chris Craik2014-05-095-27/+19
|\ \ \ \ \
| * | | | | Simplify projection matrix management.Chris Craik2014-05-095-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store in and use from snapshot, and remove the kFlagOrthoDirty flag, as it's redundant with kFlagIsFboLayer. Change-Id: I2bd380192d50117f4ce1fd2058213669a886f406
* | | | | | Merge "Refactor VirtualLightRefBase & JNI"John Reck2014-05-095-38/+3
|\ \ \ \ \ \
| * | | | | | Refactor VirtualLightRefBase & JNIJohn Reck2014-05-095-38/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e244e7109e59d5be96871b23bb9b1201c7f9eaa
* | | | | | | am 90eaf92e: am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to ↵Chris Craik2014-05-091-5/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | cached glyph bitmap" * commit '90eaf92e325457ccb30286879a2f92b7ba517c7d': Correct stride for drawing to cached glyph bitmap