drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_frameworks_base/libs/hwui
History
John Reck 9fb42f0778 resolved conflicts for merge of a75b0ad3 to master 
Change-Id: I32a2d129c556407727ada909daa6470309d42499
2014-12-04 13:51:41 -08:00
..
font
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
renderthread
resolved conflicts for merge of a75b0ad3 to master
2014-12-04 13:51:41 -08:00
tests
am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev
2014-11-26 12:09:28 +00:00
thread
…
utils
Improve logging around performance critical events
2014-11-19 17:24:30 -08:00
AmbientShadow.cpp
am cb82b7f1: am a58336f6: Merge "Use fabsf() rather than abs()"
2014-11-17 23:07:29 +00:00
AmbientShadow.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
Android.mk
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
AnimationContext.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
AnimationContext.h
…
Animator.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
Animator.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
AnimatorManager.cpp
Clean up physical coupling
2014-10-15 15:51:39 -04:00
AnimatorManager.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
AssetAtlas.cpp
am 842697a3: am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
2014-11-18 21:37:59 +00:00
AssetAtlas.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
Caches.cpp
am 842697a3: am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
2014-11-18 21:37:59 +00:00
Caches.h
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
CanvasProperty.h
…
CanvasState.cpp
Replace StatefulBaseRenderer inheritance with CanvasState member
2014-11-04 17:16:36 -05:00
CanvasState.h
Add a missing visibility modifier to fix build.
2014-11-05 09:41:31 -08:00
DamageAccumulator.cpp
…
DamageAccumulator.h
…
Debug.h
…
DeferredDisplayList.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
DeferredDisplayList.h
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
2014-11-10 21:29:52 -08:00
DeferredLayerUpdater.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
DeferredLayerUpdater.h
Change GraphicBuffer fields from uint to int
2014-11-12 12:35:42 -08:00
DisplayList.cpp
Yank ResourceCache out of Caches
2014-11-06 09:45:10 -08:00
DisplayList.h
am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
2014-11-12 21:31:33 +00:00
DisplayListLogBuffer.cpp
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
2014-11-10 21:29:52 -08:00
DisplayListLogBuffer.h
…
DisplayListOp.h
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
DisplayListRenderer.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
DisplayListRenderer.h
Revert "Add a way to override Xfermode"
2014-11-21 22:05:46 +00:00
Dither.cpp
…
Dither.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
DrawProfiler.cpp
Cleanup debug options
2014-10-27 12:43:25 -07:00
DrawProfiler.h
Cleanup debug options
2014-10-27 12:43:25 -07:00
Extensions.cpp
…
Extensions.h
…
FboCache.cpp
…
FboCache.h
…
Fence.h
…
FontRenderer.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
FontRenderer.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
GammaFontRenderer.cpp
…
GammaFontRenderer.h
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
GradientCache.cpp
…
GradientCache.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
IContextFactory.h
…
Image.cpp
…
Image.h
…
Interpolator.cpp
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
2014-11-10 21:29:52 -08:00
Interpolator.h
…
Layer.cpp
Improve logging around performance critical events
2014-11-19 17:24:30 -08:00
Layer.h
partially fix build.
2014-11-01 18:37:39 -07:00
LayerCache.cpp
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
2014-11-10 21:29:52 -08:00
LayerCache.h
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
2014-11-10 21:29:52 -08:00
LayerRenderer.cpp
resolve merge conflicts of f2235b6 to master.
2014-11-20 17:27:36 -08:00
LayerRenderer.h
Replace StatefulBaseRenderer inheritance with CanvasState member
2014-11-04 17:16:36 -05:00
Matrix.cpp
…
Matrix.h
…
MODULE_LICENSE_APACHE2
…
NOTICE
…
OpenGLRenderer.cpp
Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
2014-12-01 20:08:29 +00:00
OpenGLRenderer.h
Replace StatefulBaseRenderer inheritance with CanvasState member
2014-11-04 17:16:36 -05:00
Outline.h
…
Patch.cpp
…
Patch.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
PatchCache.cpp
Clean up physical coupling
2014-10-15 15:51:39 -04:00
PatchCache.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
PathCache.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
PathCache.h
Suppress Clang compilation warnings.
2014-10-24 15:42:14 -07:00
PathTessellator.cpp
resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
2014-11-12 13:24:42 -08:00
PathTessellator.h
…
PixelBuffer.cpp
…
PixelBuffer.h
…
Program.cpp
Improve logging around performance critical events
2014-11-19 17:24:30 -08:00
Program.h
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
ProgramCache.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
ProgramCache.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
Properties.h
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
2014-11-10 21:29:52 -08:00
Query.h
…
Rect.h
…
RenderBuffer.h
…
RenderBufferCache.cpp
…
RenderBufferCache.h
…
Renderer.h
resolve merge conflicts of cabf8a7 to master.
2014-11-07 11:29:08 -08:00
RenderNode.cpp
am a22ab0da: am 9a04480e: am ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev
2014-12-02 01:45:54 +00:00
RenderNode.h
am e05575e9: am a8d83d63: Merge "Layer changes" into lmp-mr1-dev automerge: a51fba0
2014-10-31 23:30:57 +00:00
RenderProperties.cpp
…
RenderProperties.h
am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev
2014-11-26 12:09:28 +00:00
RenderState.cpp
Layer changes
2014-10-31 15:30:10 -07:00
RenderState.h
Revert "Frameworks/base: Unused parameters in hwui"
2014-11-22 00:10:02 +00:00
ResourceCache.cpp
Switch TextureCache to SkPixelRef::fStableId
2014-11-24 15:24:02 -08:00
ResourceCache.h
am 5ab86ba0: am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev
2014-11-25 18:51:29 +00:00
RevealClip.h
…
ShadowTessellator.cpp
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
2014-11-10 21:29:52 -08:00
ShadowTessellator.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
SkiaShader.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
SkiaShader.h
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
Snapshot.cpp
…
Snapshot.h
…
SpotShadow.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
SpotShadow.h
am 86f289fb: am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev
2014-11-07 04:09:18 +00:00
Stencil.cpp
…
Stencil.h
…
TessellationCache.cpp
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
TessellationCache.h
Revert "resolved conflicts for merge of 220c3f4f to master"
2014-11-22 00:35:09 +00:00
TextDropShadowCache.cpp
am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
2014-11-20 23:19:06 +00:00
TextDropShadowCache.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
Texture.cpp
…
Texture.h
…
TextureCache.cpp
am 5ab86ba0: am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev
2014-11-25 18:51:29 +00:00
TextureCache.h
am 5ab86ba0: am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev
2014-11-25 18:51:29 +00:00
TreeInfo.h
Clean up physical coupling
2014-10-15 15:51:39 -04:00
UvMapper.h
…
Vector.h
A better looking and faster spot shadow.
2014-11-06 15:09:46 -08:00
Vertex.h
…
VertexBuffer.h
Re-triangulate the spot shadow.
2014-09-10 17:05:59 -07:00