drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,345 Commits 1 Branch 0 Tags
Commit Graph

6098 Commits

Author SHA1 Message Date
John Reck
088c514cb1 resolved conflicts for merge of be70c771 to master 
Change-Id: I469905bef7361c18aab725778694567d1987c06d
 2014-11-06 13:04:49 -08:00
John Reck
be70c7713d am 327cb318: Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev automerge: 9c13b8c 
* commit '327cb3184d5f5d9f22db9ab18a07bb71081bb446':
  Yank ResourceCache out of Caches
 2014-11-06 19:22:28 +00:00
John Reck
a35778c799 Yank ResourceCache out of Caches 
Bug: 17947547

Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context

Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
 2014-11-06 09:45:10 -08:00
Rob Tsuk
dfd0099ce5 am fce461ea: am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'fce461eada9f0f03cd30e3a5fcb60072d589049a':
  Log shader source when it fails to compile
 2014-11-05 22:35:46 +00:00
Rob Tsuk
fce461eada am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'db6a1358d45430a952aa746f8dfd452d12d7e4be':
  Log shader source when it fails to compile
 2014-11-05 22:31:05 +00:00
Rob Tsuk
6c96cbf581 Merge "Log shader source when it fails to compile" into lmp-mr1-dev 2014-11-05 22:22:52 +00:00
Dan Albert
7192db8bb5 Merge "Add a missing visibility modifier to fix build." 2014-11-05 21:42:37 +00:00
Rob Tsuk
fd15f47554 Log shader source when it fails to compile 
So that there will be something to diagnose when such failures occur during
stability tests.

Bug: 18092655
Change-Id: I9a9d8d33b34273a477f2a9dbcf092887dcbc91c0
 2014-11-05 13:26:19 -08:00
Adam Lesinski
1adf320606 am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-dev-plus-aosp 
* commit '8491c4ead7dba5cfd406cf99a511fc1dce07cc4d':
  Add error checking to aapt for split generation
 2014-11-05 20:35:27 +00:00
Adam Lesinski
685d363d7a Merge commit 'fb96e54' into manualmerge 
Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
 2014-11-05 12:30:25 -08:00
Adam Lesinski
69ecfa9034 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 2014-11-05 19:15:57 +00:00
Dan Albert
f59b8f0d7c Add a missing visibility modifier to fix build. 
This class is used by the tests, but is built with -fvisibility=hidden
and not declared as ANDROID_API.

Change-Id: If93af7bfdf0752de1f5bbb10fdd46b2eb9c0ccdd
 2014-11-05 09:41:31 -08:00
Tom Hudson
984162fb7e Replace StatefulBaseRenderer inheritance with CanvasState member 
Incrementally disentangles DisplayListRenderer and OpenGLRenderer.
Introduces abstract CanvasStateClient class to share three functions
between the two.

Design doc at https://docs.google.com/a/google.com/document/d/1PY1JF7AfPEF2UOUAnETS5j_4_tnJShTAMExvpCJfP8o/edit?usp=sharing.

BUG:15672762
R=djsollen@google.com,ccraik@google.com,jreck@google.com

Change-Id: Ic9fdffe18808e7d921ad06d01ea1ca25b2ad6f23
 2014-11-04 17:16:36 -05:00
Tom Hudson
107843de45 Remove status return from all uirenderer::Renderer functions 
This moves the interface closer to android::Canvas. The only use of
return values was in the OpenGLRenderer subclass; that is replaced
with an internal dirty flag: returned from finish(), checked by
CanvasContext.

This is part of a series of CLs to refactor the Graphics JNI bindings.

BUG:15672762
R=djsollen@google.com,ccraik@google.com

Change-Id: Ifd533eb8839a254b0d3a5d04fc5a2905afdfc89e
 2014-11-04 15:49:44 -05:00
Rob Tsuk
0d00b27ecf am 6bd8d825: am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit '6bd8d825b29fa4db3046644f36c2256a5d0600e0':
  Make points drawn with default paint visible
 2014-11-04 15:32:41 +00:00
Rob Tsuk
6bd8d825b2 am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit 'c4aea977cd35c423132382cf0ae1f3238e2c7d10':
  Make points drawn with default paint visible
 2014-11-04 15:29:10 +00:00
Rob Tsuk
e6c0bda5dd Merge "Make points drawn with default paint visible" into lmp-mr1-dev 2014-11-04 15:20:00 +00:00
Adam Lesinski
24655f37ed am 3fd34002: Merge commit \'78be0498\' into manualmerge 
* commit '3fd340028fc24198edb23ddf5eb5a0a100bab745':
  Fix issues that will be present in C++11
 2014-11-04 02:14:37 +00:00
Adam Lesinski
3fd340028f Merge commit '78be0498' into manualmerge 
Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
 2014-11-03 18:06:22 -08:00
Rob Tsuk
b7c26562d0 Make points drawn with default paint visible 
When no stroke width is set, use 0.5 instead of 0.25 to make
sure the resulting rectangle spans at least one pixel.

Bug: 15455111
Change-Id: Id0a4b6d014c542ffc98b13a032f88ae0ce69b3a1
 2014-11-04 00:31:45 +00:00
Adam Lesinski
de7de47fef Add error checking to aapt for split generation 
Change-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce
 2014-11-03 15:55:44 -08:00
Adam Lesinski
668f0a356c Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 2014-11-03 23:38:43 +00:00
Adam Lesinski
4bf58108d4 Fix issues that will be present in C++11 
- char16_t is a distinct type, so stay consistent
  with it throughout the code base.
- char16_t is defined as minimum size of 16 bits.
  Since we mmap and cast data structures onto raw memory,
  we need a precise definition (uint16_t), so we cast between
  that (and static_assert that they are the same size).

Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
 2014-11-03 11:49:47 -08:00
John Reck
6398d2d42e am 8a8a4055: am 541641d0: Merge "Fix counting" into lmp-mr1-dev automerge: 5c8d135 
* commit '8a8a40556ea3b0fb4cc8cd1ec063fb9988db497f':
  Fix counting
 2014-11-03 18:50:10 +00:00
John Reck
8a8a40556e am 541641d0: Merge "Fix counting" into lmp-mr1-dev 
automerge: 5c8d135

* commit '5c8d135920896af42de8d8b91975abe3fa871cd9':
  Fix counting
 2014-11-03 18:42:30 +00:00
John Reck
88f5fc7c5a Fix counting 
Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
 2014-11-03 10:32:24 -08:00
Nick Kralevich
bfed827028 partially fix build. 
Addresses the following compile time errors:

  In file included from frameworks/base/libs/hwui/LayerRenderer.cpp:24:0:
  frameworks/base/libs/hwui/RenderState.h:77:24: error: 'VirtualLightRefBase' has not been declared
       void postDecStrong(VirtualLightRefBase* object);
                        ^
  In file included from frameworks/base/libs/hwui/LayerCache.h:21:0,
                   from frameworks/base/libs/hwui/LayerRenderer.cpp:25:
  frameworks/base/libs/hwui/Layer.h:55:42: error: expected class-name before '{' token
   class Layer : public VirtualLightRefBase {
                                          ^
  In file included from frameworks/base/libs/hwui/RenderState.cpp:16:0:
  frameworks/base/libs/hwui/RenderState.h:77:24: error: 'VirtualLightRefBase' has not been declared
       void postDecStrong(VirtualLightRefBase* object);
                        ^

Change-Id: I2be439b373ea356b861f413ff6ce323e8d9baf2d
 2014-11-01 18:37:39 -07:00
John Reck
9481684560 am e05575e9: am a8d83d63: Merge "Layer changes" into lmp-mr1-dev automerge: a51fba0 
* commit 'e05575e9c36850d8cfe49396ac9a1372511b12bf':
  Layer changes
 2014-10-31 23:30:57 +00:00
John Reck
e05575e9c3 am a8d83d63: Merge "Layer changes" into lmp-mr1-dev 
automerge: a51fba0

* commit 'a51fba0bf037844bcb911e69e8af733e6d2cccf6':
  Layer changes
 2014-10-31 23:25:44 +00:00
John Reck
a8d83d639a Merge "Layer changes" into lmp-mr1-dev 2014-10-31 22:55:47 +00:00
John Reck
0e89e2b7bc Layer changes 
Bug: 17208461

* Switch Layer to be VirtualLightRefBase instead of
  Caches' side-channel ref-counting
* Include active layers in gfxinfo dump
* Run gfxinfo dump on the correct thread
* Dump gfxinfo on Layer creation failure

Change-Id: I28d195699e2334518e215ab28c7a17355aee9678
 2014-10-31 15:30:10 -07:00
Alan Viverette
f2ae40739a am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:25:37 +00:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:15:01 +00:00
John Reck
eaab65f49d am 97054254: am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev automerge: a27e1a3 
* commit '97054254d4c8eef66538814e1d5def776ceba97a':
  Be more conservative about current buffer
 2014-10-30 19:20:17 +00:00
John Reck
97054254d4 am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev 
automerge: a27e1a3

* commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08':
  Be more conservative about current buffer
 2014-10-30 19:16:14 +00:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources 
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
 2014-10-29 17:09:36 -07:00
Narayan Kamath
fd79e9f3c3 am 3cad510e: am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master 
* commit '3cad510e271d4e9510d0f15560c4979071c8436c':
  Suppress Clang compilation warnings.
 2014-10-29 19:42:18 +00:00
Narayan Kamath
3cad510e27 am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master 
* commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5':
  Suppress Clang compilation warnings.
 2014-10-29 19:34:32 +00:00
John Reck
141823ec63 Merge "Be more conservative about current buffer" into lmp-mr1-dev 2014-10-29 14:40:02 +00:00
Narayan Kamath
4ed472ab33 resolved conflicts for merge of 3028394c to stage-aosp-master 
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
 2014-10-29 12:12:37 +00:00
Adam Lesinski
6d2268420d am d75d3eb5: am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev automerge: 06caf1b 
* commit 'd75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 19:06:00 +00:00
Adam Lesinski
d75d3eb5e4 am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 
automerge: 06caf1b

* commit '06caf1b1112a6a3e364a46d02b883451e9180a07':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 18:09:20 +00:00
Adam Lesinski
31b76b66b1 Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 2014-10-28 17:41:12 +00:00
John Reck
a8f1bce008 am c7c8b069: Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad automerge: 49a01fc 
* commit 'c7c8b069407236bcc04c086912c73002d48419ef':
  Cleanup debug options
 2014-10-28 07:17:03 +00:00
John Reck
c7c8b06940 Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad 
automerge: 49a01fc

* commit '49a01fc7dc8d2b9cc7591a94d19f3c209e470aea':
  Cleanup debug options
 2014-10-28 00:35:14 +00:00
John Reck
950ff1b88c Be more conservative about current buffer 
Bug: 18065565
Change-Id: I0b9c85ecf384ebe525e3a38803ab77d7ee37f33a
 2014-10-27 13:23:20 -07:00
John Reck
23d307c8d8 Cleanup debug options 
Bug: 18138852
Bug: 18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
 2014-10-27 12:43:25 -07:00
Chih-Hung Hsieh
d3448e437a Suppress Clang compilation warnings. 
Ignore warnings about unused parameters and initialization of static
constant float data members.

Change one potential error of allocating variable length
array of non-POD element type on stack.

Fix mismatch of class and struct declaration tags.

BUG: 17512760
Change-Id: I3a09c945fb1c17f27aff74a7e439dd4c35d1fb32
 2014-10-24 15:42:14 -07:00
Adam Lesinski
f001e37b31 libandroidfw: Do not build device library when building SDK 
Building the windows SDK causes a build failure if the device
libandroidfw target is not omitted.

Change-Id: I587b166342d0d047820911d279f192d2b39b6263
 2014-10-24 18:39:56 +00:00
Adam Lesinski
63f5e0f7b1 am 705f2ac4: am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev automerge: 93b43445 
* commit '705f2ac42412c8a5a436f0044b84ebbcd1e9c729':
  Added some more Split density tests
 2014-10-24 02:13:51 +00:00