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

897 Commits

Author SHA1 Message Date
Robert Ly
fda817416c am b41c96a3: am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 
* commit 'b41c96a374134c84558291fbb532fe490386a4ba':
  update overview page for rs api docs to open iframe links in parent
 2012-01-18 13:24:42 -08:00
Robert Ly
b41c96a374 am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 
* commit '43fda84e91b1fe356af35386d2f304d3ab71529e':
  update overview page for rs api docs to open iframe links in parent
 2012-01-18 13:21:51 -08:00
Stephen Hines
b97c8dd6eb am d36f7d24: Merge "Add support for new root.expand() calls." 
* commit 'd36f7d249591559e713a8ca45c6d452c14c94895':
  Add support for new root.expand() calls.
 2012-01-13 14:16:39 -08:00
Jason Sams
615e7cee03 Start implementing SurfaceTexture streaming into RS allocations. 
Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b
 2012-01-13 14:01:20 -08:00
Robert Ly
2eeb53c155 update overview page for rs api docs to open iframe links in parent 
Change-Id: Ic0aa77192fa19b045a7fd9df5926255511fdc3be
 2012-01-13 10:18:43 -08:00
Robert Ly
0272f1dfd7 cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62 
Change-Id: Iff4b4bd171818208bb3be46dd3ef7e91b6cbd80f
 2012-01-13 10:07:20 -08:00
Stephen Hines
6b4cf07cab Add support for new root.expand() calls. 
BUG=5444144

Change-Id: I9ab942561a03e9f837a3199457259bb3e07ac76f
 2012-01-12 18:56:43 -08:00
Jason Sams
17801f1eaa Plumbing for RS priority. 
Change-Id: Ibddfd40407fd6d24ac829a76a9a1e2047c48c5fd
 2012-01-12 14:22:21 -08:00
Jason Sams
aa9565b1b2 Fix LOGE. 
Change-Id: I533bedf0827edb27e0aead78e2bb3389be85acd8
 2012-01-10 15:45:04 -08:00
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
Alex Sakhartchouk
61cd943514 Cleanup based on comments. 
Change-Id: I2d261b3cd240b890001dcc7d2a849cfdc34328bf
 2012-01-05 14:55:11 -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
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
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
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
11a2e341c5 Adding comments to RS headers. 
Change-Id: Ib345fe9f651dd3e74fb384799d381034391de8a2
 2011-12-16 14:15:21 -08:00
Alex Sakhartchouk
f5d8ac7cc3 Element getters. 
Change-Id: Ibe570464557eeecad108b4d3cb8f02fad13943de
 2011-12-16 09:44:26 -08:00
Alex Sakhartchouk
d24b1bb040 Element HAL sturct, script side getters 
Change-Id: If98dd4c22bce58dca2c9739c8aee935a2dd0b493
 2011-12-15 09:56:28 -08:00
Alex Sakhartchouk
c08a1cc38f Merge "Revert "Removing changes not meant for MR1"" into graphics-dev 2011-12-07 11:06:39 -08:00
Stephen Hines
5912157f97 am f7f93048: Merge "NULL should not be const for RS." 
* commit 'f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d':
  NULL should not be const for RS.
 2011-12-06 18:34:54 -08:00
Stephen Hines
4d322043ab NULL should not be const for RS. 
Change-Id: I24d96843c40f822bf064a0fa1fc0440b6bf0518d
 2011-12-06 16:47:32 -08:00
Stephen Hines
976ae27270 Add support for handling a bitcode wrapper to librs. 
BUG=5425905

Change-Id: I75676060703df6d9043b287fea900c4379455ee2
 2011-12-01 16:37:00 -08:00
Logan Chien
0e05b11803 am 12be3fff: Remove dead code. 
* commit '12be3fff12e5c55193867f49e13169b9400b2997':
  Remove dead code.
 2011-11-27 00:52:49 -08:00
Logan Chien
12be3fff12 Remove dead code. 
Change-Id: I2838a40026291e7345b07911af3ba17278b63ffe
 2011-11-27 08:42:11 +08:00
Jason Sams
67b36f13e2 Merge "Private API to support MFF transition." into graphics-dev 2011-11-23 15:04:36 -08:00
Jason Sams
857d0c7017 Private API to support MFF transition. 
Change-Id: I17cc9dc46eb37e4397428ba64305b0fd8ed3ae81
 2011-11-23 15:02:15 -08:00
Stephen Hines
eb3d611acf am e7d17220: Merge "Add support for handling a bitcode wrapper to librs." 
* commit 'e7d17220be8e20523ffd1c9855f3d389d9ef22ee':
  Add support for handling a bitcode wrapper to librs.
 2011-11-23 14:00:14 -08:00
Stephen Hines
e7d17220be Merge "Add support for handling a bitcode wrapper to librs." 2011-11-23 13:58:13 -08:00
Stephen Hines
09ee7c80ea Add support for handling a bitcode wrapper to librs. 
BUG=5425905

Change-Id: I75676060703df6d9043b287fea900c4379455ee2
 2011-11-22 20:10:45 -08:00
Robert Ly
78af992929 am b1e72b68: Merge "add overview description for RS API reference" 
* commit 'b1e72b6826455a19a80dab14612da7f22e0e1a75':
  add overview description for RS API reference
 2011-11-22 16:23:25 -08:00
Robert Ly
b1e72b6826 Merge "add overview description for RS API reference" 2011-11-22 16:21:45 -08:00
Jason Sams
60d9fa279f am 7e254a37: Merge "Fix script init error handling." 
* commit '7e254a37d0beb1fe307ca45617fbe7cc394d275f':
  Fix script init error handling.
 2011-11-22 16:07:10 -08:00
Jason Sams
dd39fdfe99 Fix script init error handling. 
Change-Id: I7ceb0af4dfd12db0274985ff658f678d7af829ff
 2011-11-22 13:17:18 -08:00
Robert Ly
77228be417 add overview description for RS API reference 
Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
 2011-11-22 09:45:16 -08:00
Alex Sakhartchouk
7b78d1a57a Revert "Removing changes not meant for MR1" 
This reverts commit d97fd1d7c37e45c7f4c7ee89c3f70b961fa05428.
 2011-11-17 15:59:13 -08:00
Alex Sakhartchouk
6b1a981c4b am 50445568: Merge "Fixing FBO font rendering bug that resulted from using old surface size." 
* commit '5044556861af496d6451aef3f69a4df0d1b591c9':
  Fixing FBO font rendering bug that resulted from using old surface size.
 2011-11-17 09:15:42 -08:00
Alex Sakhartchouk
5044556861 Merge "Fixing FBO font rendering bug that resulted from using old surface size." 2011-11-17 09:13:24 -08:00