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

4014 Commits

Author SHA1 Message Date
Alex Sakhartchouk
10f2a3c5b3 Merge "Now utilizing ability to bind constants. Fixing small copy/paste typo." into graphics-dev 2012-01-10 14:40:48 -08:00
Alex Sakhartchouk
b64ef770db Merge "Adding ability to bind constants to shaders." into graphics-dev 2012-01-10 14:39:59 -08:00
Alex Sakhartchouk
fdccec9c21 Now utilizing ability to bind constants. 
Fixing small copy/paste typo.

Change-Id: I8ca993f3e894214b710bea019dfd65822a4cd88f
 2012-01-10 14:30:34 -08:00
Alex Sakhartchouk
33680ff630 Adding ability to bind constants to shaders. 
Change-Id: I63b664fd2fec7e0c8157b7185782192132222f1a
 2012-01-10 10:16:52 -08:00
Steve Block
2e681c1b09 resolved conflicts for merge of 08289f55 to graphics-dev 
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
 2012-01-09 23:24:46 +00:00
Steve Block
3762c31172 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
 2012-01-08 13:19:13 +00:00
Steve Block
262a37f71b am f4c2294b: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 
* commit 'f4c2294b0156ca5a6919479142aa319963fdb727':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE
 2012-01-06 10:33:23 -08:00
Alex Sakhartchouk
95853e4e2b Merge "Cleanup based on comments." into graphics-dev 2012-01-06 09:41:52 -08:00
Steve Block
8564c8da81 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
 2012-01-06 10:07:54 +00:00
Fabrice Di Meglio
03b17a2df5 am d4a69b4a: Merge "Fix bug #5753006 Garbled Labels in Maps" 
* commit 'd4a69b4a1cb5b52035345abd8cb9595ae4cf9fa5':
  Fix bug #5753006 Garbled Labels in Maps
 2012-01-05 15:21:28 -08:00
Fabrice Di Meglio
d4a69b4a1c Merge "Fix bug #5753006 Garbled Labels in Maps" 2012-01-05 15:18:52 -08:00
Alex Sakhartchouk
61cd943514 Cleanup based on comments. 
Change-Id: I2d261b3cd240b890001dcc7d2a849cfdc34328bf
 2012-01-05 14:55:11 -08:00
Steve Block
2893338442 am bd47cac4: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 
* commit 'bd47cac4dfc8440a848b33107cba1d6773f3e124':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE
 2012-01-05 14:09:25 -08:00
Steve Block
bd47cac4df Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:07:02 -08:00
Fabrice Di Meglio
c511bee87c Fix bug #5753006 Garbled Labels in Maps 
- it was a regression introduced into this CL: https://android-git.corp.google.com/g/#/c/154240/5
- basically needed to set the GlyphID encoding to the Skia Paint as we are now using glyphID resulting
from the Harfbuzz shaping
- also define GlyphID encoding as the default on the Paint class

Change-Id: Idb7c2c57ac67595425ce3be9421258962690fcdd
 2012-01-05 13:30:54 -08:00
Glenn Kasten
6b6e640323 am a8719ad9: Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 
* commit 'a8719ad9d53d3fe51e8031b2471e9558b8ef727f':
  Use the standard CC_LIKELY and CC_UNLIKELY macros
 2012-01-05 07:40:36 -08:00
Glenn Kasten
a8719ad9d5 Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 2012-01-05 07:38:29 -08:00
Glenn Kasten
e80a4ccd2b Use the standard CC_LIKELY and CC_UNLIKELY macros 
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose.  So rename the private
uses to use the standard names.

In addition, AudioFlinger was relying on the macro expanding to extra ( ).

Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
 2012-01-05 07:33:45 -08:00
Alex Sakhartchouk
6b908df7d9 Merge "Adding better error behavior to RS" into graphics-dev 2012-01-04 16:59:41 -08:00
Alex Sakhartchouk
afdf7be7ce Merge "Adding RS comments, cleaning up the gl implementation with new Element hal." into graphics-dev 2012-01-04 16:59:16 -08:00
Steve Block
6215d3ff4b Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
 2012-01-04 20:05:49 +00:00
Steve Block
c2daafc18d am 41891aea: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE" 
* commit '41891aeaf4e6e4006ae3087fa537786e9ec8caa4':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE
 2012-01-04 10:16:14 -08:00
Romain Guy
0c16df2b20 am 173ab4d6: Merge "Properly restore the GL scissor after a GL draw functor Bug #5781254" 
* commit '173ab4d61077c49f115b82eff34f97fda5a7273a':
  Properly restore the GL scissor after a GL draw functor Bug #5781254
 2012-01-03 16:34:23 -08:00
Steve Block
5baa3a62a9 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
 2012-01-03 22:38:27 +00:00
Romain Guy
82bc7a7727 Properly restore the GL scissor after a GL draw functor 
Bug #5781254

Change-Id: I1dc4809563a793b6b579814951d4d73b4c34bf32
 2012-01-03 14:14:55 -08:00
Alex Sakhartchouk
5b5664af2d Adding better error behavior to RS 
Change-Id: Iea1cc76793f8978d60575404d7b1c5145e268d6e
 2011-12-29 11:17:38 -08:00
Alex Sakhartchouk
36a7d6003d Adding RS comments, cleaning up the gl implementation with new Element hal. 
Change-Id: I74de1e8248a73a45a39976e6027dac2626d580e9
 2011-12-28 13:47:05 -08:00
Alex Sakhartchouk
fd79e02e0f Missing getter and additional tests. 
Change-Id: I057dd0a29d2cad40d0a0627b4355faeb82bbc229
 2011-12-22 14:30:55 -08:00
Alex Sakhartchouk
3aac0abe79 Adding tests for element/mesh getters. 
Fixing bugs found by tests.

Change-Id: I6592a3b65f16b21255e7788fe8ee8aaafe268638
 2011-12-22 13:11:48 -08:00
Alex Sakhartchouk
c9e7da6130 Adding simple hal struct to type. 
Fixing off by 1 error in the element.

Change-Id: I0b142942c760cb861007af7099d35d0363f4e13b
 2011-12-20 12:37:59 -08:00
Alex Sakhartchouk
8c998cf344 Merge "Adding comments to RS headers." into graphics-dev 2011-12-19 10:12:27 -08:00
Chet Haase
b6f3a279a8 am 0faa0556: Merge "De-allocate caches for large glyphs when trimming memory" 
* commit '0faa05563992fd4b3632df50921a9c612378a049':
  De-allocate caches for large glyphs when trimming memory
 2011-12-17 10:22:13 -08:00
Chet Haase
0faa055639 Merge "De-allocate caches for large glyphs when trimming memory" 2011-12-17 10:20:14 -08:00
Chet Haase
9a8245629d De-allocate caches for large glyphs when trimming memory 
Currently, font renderers eliminate some texture caches when
memory is trimmed. This change makes it go further by eliminating the
large-glyph caches for all font renderers. These caches are
only allocated as needed, but continue to consume large amounts of
memory (CPU and GPU) after that allocation. De-allocating this memory
on a trim operation should prevent background apps from holding onto
this memory in the possible case that they have allocated it by drawing
large glyphs.

Change-Id: Id7a3ab49b244e036b442d87252fb40aeca8fdb26
 2011-12-16 15:44:59 -08:00
Jeff Brown
f024eb2ebd am 1b678528: Merge "Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer" 
* commit '1b678528237d4eea623840ce3ba5520c59ca4b2c':
  Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer
 2011-12-16 14:37:07 -08:00
Jeff Brown
1b67852823 Merge "Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer" 2011-12-16 14:35:16 -08:00
Alex Sakhartchouk
11a2e341c5 Adding comments to RS headers. 
Change-Id: Ib345fe9f651dd3e74fb384799d381034391de8a2
 2011-12-16 14:15:21 -08:00
Alex Sakhartchouk
8d57f404fa Merge "Element getters." into graphics-dev 2011-12-16 09:51:53 -08:00
Alex Sakhartchouk
f5d8ac7cc3 Element getters. 
Change-Id: Ibe570464557eeecad108b4d3cb8f02fad13943de
 2011-12-16 09:44:26 -08:00
Chet Haase
ada81693a1 am 0904c203: Merge "Fix issues from recent glyph caching change" 
* commit '0904c203c4c56e43f723522351b7a3bc304196ef':
  Fix issues from recent glyph caching change
 2011-12-16 06:51:34 -08:00
Chet Haase
0904c203c4 Merge "Fix issues from recent glyph caching change" 2011-12-16 06:49:59 -08:00
Chet Haase
2a47c14e2a Fix issues from recent glyph caching change 
There were 2 issues remaining after a recent change to support
glyph caching from multiple textures:
- memory in the GPU for all textures was being allocated automatically.
This is now lazy, being allocated only when those textures are first
needed.
- filtering (applied when a rendered object is transformed) was ignoring
the new multiple-texture structure. Filtering should be applied correctly
whenever we change textures.

Change-Id: I5c8eb8d46c73cd01782a353fc79b11cacc2146ab
 2011-12-15 15:43:02 -08:00
Jason Sams
7d6bfab4bd Merge "Element HAL sturct, script side getters" into graphics-dev 2011-12-15 13:13:08 -08:00
Romain Guy
b4fb81773c am 18ca25be: Merge "Generate even fewer GL commands" 
* commit '18ca25be58be75be78cdce7541b6b082a4b3864f':
  Generate even fewer GL commands
 2011-12-15 10:10:48 -08:00
Romain Guy
374c12275a am 926d55eb: Merge "Reduce the number of active texture changes" 
* commit '926d55eb40b9042c200f154fdf0c7c7969e0e359':
  Reduce the number of active texture changes
 2011-12-15 10:08:20 -08:00
Romain Guy
58d0579eec am 9c986b7f: Merge "<Insert something improper about OpenGL>" 
* commit '9c986b7f387adb8b65d9094ba931645141bc5253':
  <Insert something improper about OpenGL>
 2011-12-15 10:07:52 -08:00
Romain Guy
27ecb1ab5f am 8a5f8ba4: Merge "Further reduce the number of GL commands sent to the driver" 
* commit '8a5f8ba4f3e8352155c711adb649e6f536d194b5':
  Further reduce the number of GL commands sent to the driver
 2011-12-15 10:07:33 -08:00
Alex Sakhartchouk
d24b1bb040 Element HAL sturct, script side getters 
Change-Id: If98dd4c22bce58dca2c9739c8aee935a2dd0b493
 2011-12-15 09:56:28 -08:00
Romain Guy
8f85e80b64 Generate even fewer GL commands 
Change-Id: I0f4dcacb03ef5ee7f6ebd501df98bfead5f0a7f8
 2011-12-14 19:23:32 -08:00
Ji-Hwan Lee
c17d9b75b6 Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer 
Currently, madvise(MADV_REMOVE) is called after deallocation.
Another thread might allocate (and even write) the same region between
deallocation and madvise(), in which case the new thread will fail to read
what it have written.  So, call deallocate() after madvise(MADV_REMOVE).

Bug: 5654596
Change-Id: I26f36cd6013de499090768a0ddc68206a4a68219
 2011-12-15 04:37:22 +09:00